IlyaSobolev/helpcenter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 27 Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/ios7.5' into release/1.18.0

Browse Source 
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
This commit is contained in:
Svetlana Maleeva 2023-11-12 14:24:45 +03:00
commit 7104b9d89b
20 changed files with 154 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Web/App_GlobalResources/Resource.resx
View File

@ -4840,4 +4840,7 @@
<data name="ModifyObjectTag" xml:space="preserve">
<value>modify object</value>
</data>
<data name="AddHyphenation" xml:space="preserve">
<value>Add hyphenation</value>
</data>
</root>

3
Web/Controls/Help/ArticlesCompleteList/MobileApps/4137_mob_docs_add_hyphenation.ascx Normal file
View File

@ -0,0 +1,3 @@
<%@ Control Language="C#" %>
<a class="crm-task-title sm_mobile sm_document sm_mobile_document_editor" id="link_4137" title=""
href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/add-hyphenation.aspx")%>"><asp:Literal runat="server" Text="<%$ Resources:Resource, AddHyphenation %>" /></a>

2
Web/Controls/Help/MobApps/MobDocs/CommonOperations/MobCommonOperations.ascx
View File

@ -36,7 +36,7 @@
<ol>
<li>Tap the <img alt="Sort files icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/moreactions.png")%>" /> icon in the upper right corner.</li>
<li>Select the necessary sorting criterion: <b>Date</b>, <b>Title</b>, <b>Type</b>, <b>Size</b>, or <b>Author</b>.</li>
<li>Tap the selected criterion to change the sorting order. The ascending order will be marked with an upwards <img alt="Ascending order" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/ascending.png")%>" /> arrow. The ascending order will be marked with a downwards <img alt="Descending order" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/descending.png")%>" /> arrow.</li>
<li>Tap the selected criterion to change the sorting order. The ascending order will be marked with an upwards <img alt="Ascending order" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/ascending.png")%>" /> arrow. The descending order will be marked with a downwards <img alt="Descending order" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/descending.png")%>" /> arrow.</li>
</ol>
<p>Touch close to the edge of the screen to the right of the necessary document in the file list and swipe left to access the file menu. Tap one of the icons:</p>
<p class="note">Available options may differ depending on the selected app section, file type and your access rights.</p>

1
Web/Controls/Help/MobApps/MobDocs/DocumentEditor/DocumentEditorTableOfContents/DocumentEditorTableOfContents.ascx
View File

@ -21,6 +21,7 @@
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4106_mob_docs_insert_section_breaks.ascx" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4109_mob_docs_insert_page_numbers.ascx" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4135_mob_docs_insert_footnotes_endnotes.ascx" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4137_mob_docs_add_hyphenation.ascx" /></li>
</ul>
</li>
<li>

46
Web/Controls/Help/MobApps/MobDocs/DocumentEditor/PageFormatting/AddHyphenation/AddHyphenation.ascx Normal file
View File

@ -0,0 +1,46 @@
<%@ Control Language="C#" Inherits="BaseContentUserControls" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<%@ Register TagPrefix="cc" TagName="PageFormattingTag" Src="~/Controls/Help/Tags/page-formatting/page-formatting.ascx" %>
<script runat="server">
protected override void Init()
{
PageTitle = PageCaption = "Add hyphenation";
MetaKeyWords = "";
MetaDescription = "";
var guides = new GuidesModel();
(Page as BasePage).Guides = guides;
}
</script>
<div class="MainHelpCenter">
<h1 class="subHeaderFeaturesCaption">Add hyphenation</h1>
<%--<div class="keyword_block">
<ul>
<li><cc:PageFormattingTag ID="PageFormattingTag2" runat="server" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/Tags/page-breaks/page-breaks.ascx" /></li>
</ul>
</div>--%>
<div class="video_ground video_trips">
<div class="block_of_step">
<div class="screen_text">
<p>Hyphenation is used to separate words at the end of lines with a '-' sign in a linguistically correct way.</p>
<p>To add hyphenation:</p>
<ol>
<li>
Tap the
<img alt="Tools icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/settings.png")%>" />
<b>Tools</b> icon in the right corner of the top toolbar.
</li>
<li>Open the <img alt="Layout icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/layout.png")%>" /> <b>Layout</b> section.</li>
<li>Activate the <b>Hyphenation</b> switcher. The hyphenation will be applied automatically.</li>
<li>To delete hyphenation, deactivate the <b>Hyphenation</b> switcher.</li>
</ol>
</div>
</div>
</div>
</div>

41
Web/Controls/Help/MobApps/MobDocs/DocumentEditor/PageFormatting/InsertPageNumbers/InsertPageNumbers.ascx
View File

@ -31,6 +31,7 @@
<div class="video_ground video_trips">
<div class="block_of_step">
<div class="screen_text">
<h3>Insert page numbers</h3>
<ol>
<li>Tap the
<img alt="Insert object" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/insertobject.png")%>" />
@ -43,6 +44,46 @@
<b>Page Number</b> option.</li>
<li>Specify the page number position on the page: <b>Left Top</b>, <b>Center Top</b>, <b>Right Top</b>, <b>Left Bottom</b>, <b>Center Bottom</b>, <b>Right Bottom</b>, <b>Current Position</b>.</li>
</ol>
<h3>Adjust page number settings</h3>
<ol>
<li>Tap the inserted page number to select it.</li>
<li>
<p><img alt="Toolbar" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/toolbar.png")%>" /></p>
<ul>
<li>
Tap the
<img alt="Edit object" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/editobject.png")%>" />
icon at the top toolbar, or
</li>
<li>
Tap the <b>Edit</b> option in the pop-up menu.
</li>
</ul>
</li>
<li>
Tap the <b>Header</b>/<b>Footer</b> section. The name of the section depends on the positioning of the page number.
</li>
</ol>
<div>
<img style="float: left" alt="Header and footer" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/headerfooter.png")%>" />
<ul style="margin-left: 320px;">
<li><b>Position</b> - set the <b>Position</b> of page numbers on the page accordingly to the top and bottom of the page.</li>
<li><b>Different first page</b> - check this box to apply a different page number to the very first page or in case you don't want to add any number to it at all.</li>
<li><b>Different odd and even pages</b> - check this box to insert different page numbers for odd and even pages.</li>
<li><b>NUMBER POSITION: TOP OF PAGE</b> - this section is used to adjust positioning for page numbers at the top of the page. The following options are available: <em>Top Left</em>, <em>Top Center</em>, and <em>Top Right</em>.</li>
<li><b>NUMBER POSITION: BOTTOM OF PAGE</b> - this section is used to adjust positioning for page numbers at the bottom of the page. The following options are available: <em>Bottom Left</em>, <em>Bottom Center</em>, and <em>Bottom Right</em>.</li>
<li><b>Current Position</b> - this option is used to insert a page number at the current cursor position.</li>
<li>
<b>Page Numbering</b> - this option is used to set the parameters for page numbering.
<ul>
<li><b>Proceed</b> - this option is selected by default and makes it possible to keep continuous page numbering after a section break.</li>
<li><b>Start at</b> - start page numbering with a specific number in the current section of the document.</li>
</ul>
</li>
<li><b>Delete number pages</b> - tap this button to delete all page numbers.</li>
</ul>
</div>
<hr />
</div>
</div>
</div>

25
Web/Controls/Help/MobApps/MobDocs/DocumentEditor/PageFormatting/SetPageParameters/SetPageParameters.ascx
View File

@ -33,6 +33,7 @@
<div class="video_ground video_trips">
<div class="block_of_step">
<div class="screen_text">
<h3>Orientation and size</h3>
<p>To set page orientation and size:</p>
<ol>
<li>Tap the
@ -55,6 +56,30 @@
<p><img alt="Margins Adjustment" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/margins.png")%>" /></p>-->
<p class="note">All these parameters are applied to the entire document. If you need to set different<!--page margins,-->
orientation or size for the separate parts of your document, please refer to the <a class="links" href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/insert-section-breaks.aspx")%>"><b>Insert section breaks</b></a> section of this guide.</p>
<h3>Columns</h3>
<p>To apply a multi-column layout:</p>
<ol>
<li>
Tap the
<img alt="Tools icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/settings.png")%>" />
<b>Tools</b> icon in the right corner of the top toolbar.
</li>
<li>Open the <img alt="Layout icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/layout.png")%>" /> <b>Layout</b> section.</li>
<li>
Click the
<img alt="Columns icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/columns.png")%>" /> <b>Columns</b> icon and select the necessary column type from the list. The following options are available:
<ul>
<li><b>Two</b> <img alt="Two columns icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/twocolumns.png")%>" /> - to add two columns of the same width.</li>
<li><b>Three</b> <img alt="Three columns icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/threecolumns.png")%>" /> - to add three columns of the same width.</li>
<li><b>Left</b> <img alt="Left column icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/leftcolumn.png")%>" /> - to add two columns: a narrow column on the left and a wide column on the right.</li>
<li><b>Right</b> <img alt="Right column icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/rightcolumn.png")%>" /> - to add two columns: a narrow column on the right and a wide column on the left.</li>
</ul>
</li>
</ol>
<ul>
</ul>
<p>To cancel columns and return to a regular single-column layout, go to the <img alt="Columns icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/columns.png")%>" /> <b>Columns</b> section again, and select the <b>One</b> <img alt="One column icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/onecolumn.png")%>" /> option from the list.</p>
</div>
</div>
</div>

5
Web/Controls/Help/MobApps/MobDocs/DocumentEditor/TextFormatting/ApplyFontDecorationStyles/ApplyFontDecorationStyles.ascx
View File

@ -33,10 +33,11 @@
<p>Select the text you want the formatting to be applied to and use the corresponding icons at the text formatting toolbar above the keyboard. </p>
<p>It's also possible to change font properties via the text settings panel. Open the settings panel by</p>
<ul>
<li>tapping the
<li>
<p><img alt="Toolbar" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/toolbar.png")%>" /></p>
tapping the
<img alt="Edit object" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/editobject.png")%>" />
icon at the top toolbar, or
<p><img alt="Toolbar" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/toolbar.png")%>" /></p>
</li>
<li>tapping the <b>Edit</b> option in the pop-up menu.</li>
</ul>

7
Web/Controls/Help/MobApps/MobDocs/PresentationEditor/PEToolsAndSettings/ChangeAppSettings/PEChangeAppSettings.ascx
View File

@ -52,14 +52,15 @@
<b>Tools</b> icon in the right corner of the top toolbar.</li>
<li>Tap the arrow next to the
<img alt="Document Settings" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/Presentations/presentationsettings.png")%>" />
<b>Document Settings</b> menu item.</li>
<b>Presentation Settings</b> menu item.</li>
</ol>
<p>Currently, the following presentation settings are available:</p>
<ul>
<li><b>Style</b> - is used to select the necessary <b>Color Scheme</b>. It allows to change the default color palette for slide elements (font, background, autoshapes and charts).
<li><b>Slide Size</b> - choose the required slide size: <em>Standard (4:3)</em> or <em>Widescreen (16:9)</em>.</li>
<li>Turn the <b>Loop Slideshow</b> on or off either to have the presentation start again when it's ended or not.</li>
<li><b>Style</b> - is used to select the necessary <b>Color Scheme</b>. It allows to change the default color palette for slide elements (font, background, autoshapes, and charts).
<p><img alt="Color scheme" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/Presentations/colorscheme.png")%>" /></p>
</li>
<li>Turn the <b>Loop Slideshow</b> on or off either to have the presentation start again when it's ended or not.</li>
</ul>
</div>
</div>

3
Web/Controls/Help/MobApps/MobDocs/SpreadsheetEditor/OperationsOnObjects/InsertFormulas/InsertFormulas.ascx
View File

@ -41,12 +41,13 @@
<li>tapping the <img alt="Insert object" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/Spreadsheets/insertobject.png")%>" /> icon at the top toolbar and switching to the <img alt="Insert function icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/Spreadsheets/function.png")%>" /> tab.</li>
</ul>
</li>
<li>Select one of the commonly used functions (SUM, MIN, MAX, COUNT) or choose the necessary <b>Category</b> in the <b>CATEGORIES</b> section and select the function you need.
<li>Start entering the function's name and choose the required function using the tips field that will appear. You can also select one of the commonly used functions (SUM, MIN, MAX, COUNT) or choose the necessary <b>Category</b> in the <b>CATEGORIES</b> section and select the function you need.
<p class="note">To view the function description, tap the <img alt="Info icon" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/Spreadsheets/info_function.png")%>" /> icon.</p>
</li>
<li>Enter the function arguments either using the on-screen keyboard or dragging to select a range of cells to be included as an argument. If the function requires several arguments, they must be separated by commas.
<p class="note">Generally, numeric values, logical values (TRUE, FALSE), text values (must be quoted), cell references, cell range references and other functions can be used as function arguments.</p>
</li>
<li>When editing a formula in the formula field, you can accept or reject changes using the red cross button for cancelling and green check mark button for accepting the changes.</li>
</ol>
<p><img alt="Insert formulas" src="<%=VirtualPathUtility.ToAbsolute("~/images/Help/Mobile/Documents/Spreadsheets/insertformulas.png")%>" /></p>
</div>

4
Web/Controls/Help/SideMenu/MobileApps/Documents/DocumentEditor.ascx
View File

@ -16,7 +16,9 @@
<li><a class="leftmenu_mobile_document_editor_page_parameters" href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/set-page-parameters.aspx")%>">Set page parameters</a></li>
<li><a class="leftmenu_mobile_document_editor_page_breaks" href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/insert-page-breaks.aspx")%>">Insert page breaks</a></li>
<li><a class="leftmenu_mobile_document_editor_section_breaks" href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/insert-section-breaks.aspx")%>">Insert section breaks</a></li>
<li><a class="leftmenu_mobile_document_editor_page_numbers" href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/insert-page-numbers.aspx")%>">Insert page numbers</a></li>
<li><a class="leftmenu_mobile_document_editor_page_numbers" href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/insert-footnotes-endnotes.aspx")%>">Insert footnotes and endnotes</a></li>
<li><a class="leftmenu_mobile_document_editor_footnotes_endnotes" href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/insert-page-numbers.aspx")%>">Insert page numbers</a></li>
<li><a class="leftmenu_mobile_document_editor_add_hyphenation" href="<%=VirtualPathUtility.ToAbsolute("~/mobile-applications/documents/document-editor/page-formatting/add-hyphenation.aspx")%>">Add hyphenation</a></li>
</ul>
</li>
<li><a class="leftmenu_mobile_document_editor toggler"><asp:Literal runat="server" Text="<%$ Resources:Resource, ParagraphFormatting %>" /></a>

22
Web/Mobile-Applications/Documents/document-editor/page-formatting/add-hyphenation.aspx Normal file
View File

@ -0,0 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Masters/Mobile/DEMobile_Articles.master" %>
<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %>
<%@ Register Src="~/Controls/Common/VideoConteiner.ascx" TagName="VideoContainer" TagPrefix="uc" %>
<script runat="server">
protected void Page_Load(object sender, EventArgs e)
{
string title = HttpUtility.HtmlEncode(((Page as BasePage).Guides as GuidesModel).TitleVideo);
}
</script>
<asp:Content ID="Content1" ContentPlaceHolderID="content" runat="Server">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/MobApps/MobDocs/DocumentEditor/PageFormatting/AddHyphenation/AddHyphenation.ascx" />
</asp:Content>
<asp:Content ID="content2" ContentPlaceHolderID="leftmenupage" runat="server">
<div class="guidespage documents_page">
<div id="SeeAlsoBlockLinks">
<div class="caption editors one">
<cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/ONLYOFFICEEditors/1999_document-editor-documentation/1999_document-editor-documentation.ascx" />
</div>
</div>
</asp:Content>

BIN
Web/images/Help/Mobile/Documents/columns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 245 B

BIN
Web/images/Help/Mobile/Documents/headerfooter.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
Web/images/Help/Mobile/Documents/layout.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 734 B

BIN
Web/images/Help/Mobile/Documents/leftcolumn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 312 B

BIN
Web/images/Help/Mobile/Documents/onecolumn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 152 B

BIN
Web/images/Help/Mobile/Documents/rightcolumn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

BIN
Web/images/Help/Mobile/Documents/threecolumns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 443 B

BIN
Web/images/Help/Mobile/Documents/twocolumns.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B