From 94f19901a18dd928ecfecf20fbf6ef8661d3ce41 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Thu, 14 Apr 2022 04:00:17 +0300
Subject: [PATCH 1/9] add header

---
 .../main/app/controller/Navigation.js         |  22 +++-
 .../main/app/view/Navigation.js               | 113 +++++++++++++++++-
 .../main/resources/less/navigation.less       |  25 +++-
 3 files changed, 150 insertions(+), 10 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Navigation.js b/apps/documenteditor/main/app/controller/Navigation.js
index bbb09fca9..1ce213486 100644
--- a/apps/documenteditor/main/app/controller/Navigation.js
+++ b/apps/documenteditor/main/app/controller/Navigation.js
@@ -114,6 +114,9 @@ define([
             panelNavigation.viewNavigationList.on('item:add', _.bind(this.onItemAdd, this));
             panelNavigation.navigationMenu.on('item:click',           _.bind(this.onMenuItemClick, this));
             panelNavigation.navigationMenu.items[11].menu.on('item:click', _.bind(this.onMenuLevelsItemClick, this));
+            panelNavigation.btnSettingsMenu.on('item:click',           _.bind(this.onMenuSettingsItemClick, this));
+            panelNavigation.btnSettingsMenu.items[2].menu.on('item:click', _.bind(this.onMenuLevelsItemClick, this));
+            panelNavigation.btnSettingsMenu.items[4].menu.on('item:click', _.bind(this.onMenuFontSizeClick, this));
 
             var viewport = this.getApplication().getController('Viewport').getView('Viewport');
             viewport.hlayout.on('layout:resizedrag',  function () {
@@ -241,8 +244,6 @@ define([
 
         onMenuItemClick: function (menu, item) {
             if (!this._navigationObject && !this._viewerNavigationObject) return;
-
-            var index = parseInt(menu.cmpEl.attr('data-value'));
             if (item.value == 'promote') {
                 this._navigationObject.promote(index);
             } else if (item.value == 'demote') {
@@ -261,11 +262,28 @@ define([
                 this.panelNavigation.viewNavigationList.collapseAll();
             }
         },
+        onMenuSettingsItemClick: function (menu, item){
+            switch (item.value){
+                case 'expand':
+                    this.panelNavigation.viewNavigationList.expandAll();
+                    break;
+                case 'collapse':
+                    this.panelNavigation.viewNavigationList.collapseAll();
+                    break;
+                case 'wrap':
+                    this.panelNavigation.changeWrapHeadings();
+                    break;
+            }
+        },
 
         onMenuLevelsItemClick: function (menu, item) {
             this.panelNavigation.viewNavigationList.expandToLevel(item.value-1);
         },
 
+        onMenuFontSizeClick: function (menu, item){
+            this.panelNavigation.changeFontSize(item.value);
+        },
+
         SetDisabled: function(state) {
             this._isDisabled = state;
         },
diff --git a/apps/documenteditor/main/app/view/Navigation.js b/apps/documenteditor/main/app/view/Navigation.js
index 6bf35e380..a9a6ce818 100644
--- a/apps/documenteditor/main/app/view/Navigation.js
+++ b/apps/documenteditor/main/app/view/Navigation.js
@@ -49,8 +49,12 @@ define([
         storeNavigation: undefined,
         template: _.template([
             '<div id="navigation-box" class="layout-ct vbox">',
-                // '<div id="navigation-header"><%= scope.strNavigate %></div>',
-                '<div id="navigation-list" class="">',
+            '<div id="navigation-header" className="">',
+                '<label><%= scope.strNavigate%></label>',
+                '<div id="navigation-btn-close" style="float:right;margin-left: 4px;"></div>',
+                '<div id="navigation-btn-settings" style="float:right;"></div>',
+            '</div>',
+                '<div id="navigation-list" class="medium">',
                 '</div>',
             '</div>'
         ].join('')),
@@ -64,6 +68,90 @@ define([
             el = el || this.el;
             $(el).html(this.template({scope: this}));
             this.$el = $(el);
+            this.fontSizeClass = 'medium';
+            this.btnClose = new Common.UI.Button({
+                parentEl: $('#navigation-btn-close', this.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-close',
+                hint: this.textClosePanel
+            });
+
+            this.btnSettings = new Common.UI.Button({
+                parentEl: $('#navigation-btn-settings', this.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-settings',
+                hint: this.textSort,
+                menu: new Common.UI.Menu({
+                    menuAlign: 'tr-br',
+                    style: 'min-width: auto;',
+                    items: [
+                        {
+                            caption: this.txtExpand,
+                            value: 'expand',
+                            iconCls     : 'menu__icon expand-all'
+                        },
+                        {
+                            caption: this.txtCollapse,
+                            value: 'collapse',
+                            iconCls     : 'menu__icon collapse-all'
+                        },
+                        {
+                            caption: this.txtExpandToLevel,
+                            value: 'expand-level',
+                            menu: new Common.UI.Menu({
+                                    menuAlign: 'tl-br',
+                                    style: 'min-width: auto;',
+                                    items: [{ caption : '1', value: 1 }, { caption : '2', value: 2 }, { caption : '3', value: 3 },
+                                        { caption : '4', value: 4 }, { caption : '5', value: 5 }, { caption : '6', value: 6 },
+                                        { caption : '7', value: 7 }, { caption : '8', value: 8 },  { caption : '9', value: 9 }]})
+
+                        },
+                        {
+                            caption: '--',
+                            visible: true
+                        },
+                        {
+                            caption: this.txtFontSize,
+                            value: 'font-size',
+                            menu: new Common.UI.Menu({
+                                menuAlign: 'tl-br',
+                                style: 'min-width: auto;',
+                                items: [
+                                    {
+                                        caption: this.txtSmall,
+                                        checkable: true,
+                                        value: 'small',
+                                        toggleGroup: 'fontsize'
+                                    },
+                                    {
+                                        caption: this.txtMedium,
+                                        checkable: true,
+                                        value: 'medium',
+                                        checked: true,
+                                        toggleGroup: 'fontsize'
+                                    },
+                                    {
+                                        caption: this.txtLarge,
+                                        checkable: true,
+                                        value: 'large',
+                                        toggleGroup: 'fontsize'
+                                    }
+                                ]})
+
+                        },
+                        {
+                            caption: '--',
+                            visible: true
+                        },
+                        {
+                            caption: this.txtWrapHeadings,
+                            checkable: true,
+                            value: 'wrap'
+                        }
+                    ]
+                })
+            });
+            this.btnSettingsMenu = this.btnSettings.menu;
 
             this.viewNavigationList = new Common.UI.TreeView({
                 el: $('#navigation-list'),
@@ -75,6 +163,7 @@ define([
                 delayRenderTips: true,
                 minScrollbarLength: 25
             });
+
             this.viewNavigationList.cmpEl.off('click');
             this.navigationMenu = new Common.UI.Menu({
                 cls: 'shifted-right',
@@ -152,6 +241,17 @@ define([
             this.fireEvent('hide', this );
         },
 
+        changeWrapHeadings: function(){
+            if(!this.btnSettingsMenu.items[6].checked)
+                this.viewNavigationList.$el.removeClass('wrap');
+            else
+                this.viewNavigationList.$el.addClass('wrap');
+        },
+        changeFontSize: function (value){
+            this.viewNavigationList.$el.removeClass();
+            this.viewNavigationList.$el.addClass( value);
+            this.changeWrapHeadings();
+        },
         ChangeSettings: function(props) {
         },
 
@@ -166,7 +266,12 @@ define([
         txtExpandToLevel: 'Expand to level...',
         txtEmpty: 'There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.',
         txtEmptyItem: 'Empty Heading',
-        txtEmptyViewer: 'There are no headings in the document.'
-
+        txtEmptyViewer: 'There are no headings in the document.',
+        strNavigate: "Outline",
+        txtWrapHeadings: "Wrap long headings",
+        txtFontSize: "Font size",
+        txtSmall: "Small",
+        txtMedium: "Medium",
+        txtLarge:"Large"
     }, DE.Views.Navigation || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less
index 475a4e7ea..62bde979e 100644
--- a/apps/documenteditor/main/resources/less/navigation.less
+++ b/apps/documenteditor/main/resources/less/navigation.less
@@ -5,17 +5,23 @@
 
     #navigation-header {
         position: absolute;
-        height: 38px;
+        height: 40px;
         left: 0;
         top: 0;
         width: 100%;
-        .font-weight-bold();
         padding: 10px 12px;
+        overflow: hidden;
         border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
         border-bottom: @scaled-one-px-value solid @border-toolbar;
+        label {
+            font-size: 12px;
+            .font-weight-bold();
+            margin-top: 2px;
+        }
     }
 
     #navigation-list {
+        padding-top: 40px;
         height: 100%;
         overflow: hidden;
         font-size: 12px;
@@ -31,13 +37,24 @@
                 }
             }
         }
-
+        &.small{
+            font-size: 10px;
+        }
+        &.medium{
+            font-size: 12px;
+        }
+        &.large{
+            font-size: 14px;
+        }
         .name.not-header {
             font-style: italic;
         }
 
-        .name {
+        &.wrap .name{
             white-space: pre-wrap;
+        }
+
+        .name {
             word-break: break-all;
             max-height: 350px;
         }

From 579066ca77e8a6a1cbe0d3e4d3fc72f8aa432d9e Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Thu, 14 Apr 2022 12:00:40 +0300
Subject: [PATCH 2/9] resize navigation header

---
 apps/documenteditor/main/resources/less/navigation.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less
index 62bde979e..b874f3456 100644
--- a/apps/documenteditor/main/resources/less/navigation.less
+++ b/apps/documenteditor/main/resources/less/navigation.less
@@ -5,7 +5,7 @@
 
     #navigation-header {
         position: absolute;
-        height: 40px;
+        height: 45px;
         left: 0;
         top: 0;
         width: 100%;
@@ -21,7 +21,7 @@
     }
 
     #navigation-list {
-        padding-top: 40px;
+        padding-top: 45px;
         height: 100%;
         overflow: hidden;
         font-size: 12px;

From 1b76671d1886b1a6456d2f07e32ecc727cd42783 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Wed, 20 Apr 2022 16:58:28 +0300
Subject: [PATCH 3/9] fix bugs

---
 .../main/app/controller/Navigation.js         |  2 ++
 .../main/app/view/Navigation.js               | 27 ++++++++++++++-----
 .../main/resources/less/navigation.less       |  1 +
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Navigation.js b/apps/documenteditor/main/app/controller/Navigation.js
index 1ce213486..0fc01e300 100644
--- a/apps/documenteditor/main/app/controller/Navigation.js
+++ b/apps/documenteditor/main/app/controller/Navigation.js
@@ -244,6 +244,7 @@ define([
 
         onMenuItemClick: function (menu, item) {
             if (!this._navigationObject && !this._viewerNavigationObject) return;
+            var index = parseInt(menu.cmpEl.attr('data-value'));
             if (item.value == 'promote') {
                 this._navigationObject.promote(index);
             } else if (item.value == 'demote') {
@@ -262,6 +263,7 @@ define([
                 this.panelNavigation.viewNavigationList.collapseAll();
             }
         },
+
         onMenuSettingsItemClick: function (menu, item){
             switch (item.value){
                 case 'expand':
diff --git a/apps/documenteditor/main/app/view/Navigation.js b/apps/documenteditor/main/app/view/Navigation.js
index a9a6ce818..fefe7978e 100644
--- a/apps/documenteditor/main/app/view/Navigation.js
+++ b/apps/documenteditor/main/app/view/Navigation.js
@@ -54,7 +54,7 @@ define([
                 '<div id="navigation-btn-close" style="float:right;margin-left: 4px;"></div>',
                 '<div id="navigation-btn-settings" style="float:right;"></div>',
             '</div>',
-                '<div id="navigation-list" class="medium">',
+                '<div id="navigation-list" class="">',
                 '</div>',
             '</div>'
         ].join('')),
@@ -67,8 +67,11 @@ define([
         render: function(el) {
             el = el || this.el;
             $(el).html(this.template({scope: this}));
+            var isWrap = Common.localStorage.getBool("de-outline-wrap",true);
+            var fontSizeClass = Common.localStorage.getItem("de-outline-fontsize");
             this.$el = $(el);
-            this.fontSizeClass = 'medium';
+
+
             this.btnClose = new Common.UI.Button({
                 parentEl: $('#navigation-btn-close', this.$el),
                 cls: 'btn-toolbar',
@@ -99,7 +102,7 @@ define([
                             caption: this.txtExpandToLevel,
                             value: 'expand-level',
                             menu: new Common.UI.Menu({
-                                    menuAlign: 'tl-br',
+                                    menuAlign: 'tl-tr',
                                     style: 'min-width: auto;',
                                     items: [{ caption : '1', value: 1 }, { caption : '2', value: 2 }, { caption : '3', value: 3 },
                                         { caption : '4', value: 4 }, { caption : '5', value: 5 }, { caption : '6', value: 6 },
@@ -114,25 +117,27 @@ define([
                             caption: this.txtFontSize,
                             value: 'font-size',
                             menu: new Common.UI.Menu({
-                                menuAlign: 'tl-br',
+                                menuAlign: 'tl-tr',
                                 style: 'min-width: auto;',
                                 items: [
                                     {
                                         caption: this.txtSmall,
                                         checkable: true,
                                         value: 'small',
+                                        checked: fontSizeClass == 'small',
                                         toggleGroup: 'fontsize'
                                     },
                                     {
                                         caption: this.txtMedium,
                                         checkable: true,
                                         value: 'medium',
-                                        checked: true,
+                                        checked: fontSizeClass == 'medium',
                                         toggleGroup: 'fontsize'
                                     },
                                     {
                                         caption: this.txtLarge,
                                         checkable: true,
+                                        checked: fontSizeClass == 'large',
                                         value: 'large',
                                         toggleGroup: 'fontsize'
                                     }
@@ -146,6 +151,7 @@ define([
                         {
                             caption: this.txtWrapHeadings,
                             checkable: true,
+                            checked: isWrap,
                             value: 'wrap'
                         }
                     ]
@@ -165,6 +171,8 @@ define([
             });
 
             this.viewNavigationList.cmpEl.off('click');
+            this.viewNavigationList.$el.addClass( fontSizeClass);
+            isWrap && this.viewNavigationList.$el.addClass( 'wrap');
             this.navigationMenu = new Common.UI.Menu({
                 cls: 'shifted-right',
                 items: [{
@@ -226,7 +234,6 @@ define([
                     }
                 ]
             });
-
             this.trigger('render:after', this);
             return this;
         },
@@ -242,17 +249,25 @@ define([
         },
 
         changeWrapHeadings: function(){
+            Common.localStorage.setBool("de-outline-wrap", this.btnSettingsMenu.items[6].checked);
             if(!this.btnSettingsMenu.items[6].checked)
                 this.viewNavigationList.$el.removeClass('wrap');
             else
                 this.viewNavigationList.$el.addClass('wrap');
         },
+
         changeFontSize: function (value){
+            Common.localStorage.setItem("de-outline-fontsize", value);
             this.viewNavigationList.$el.removeClass();
             this.viewNavigationList.$el.addClass( value);
             this.changeWrapHeadings();
         },
+
         ChangeSettings: function(props) {
+
+            this.btnSettingsMenu.items[4].menu.items.forEach(function (item){
+                item.checked = (item.value==fontsize);
+            });
         },
 
         txtPromote: 'Promote',
diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less
index b874f3456..5ac2ab41a 100644
--- a/apps/documenteditor/main/resources/less/navigation.less
+++ b/apps/documenteditor/main/resources/less/navigation.less
@@ -10,6 +10,7 @@
         top: 0;
         width: 100%;
         padding: 10px 12px;
+        marging-top: 2px;
         overflow: hidden;
         border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
         border-bottom: @scaled-one-px-value solid @border-toolbar;

From 5d09a471504c0b5e9a9368727600026d91776de3 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Thu, 21 Apr 2022 16:18:56 +0300
Subject: [PATCH 4/9] fix bugs

---
 apps/documenteditor/main/app/view/Navigation.js         | 3 +++
 apps/documenteditor/main/resources/less/navigation.less | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/documenteditor/main/app/view/Navigation.js b/apps/documenteditor/main/app/view/Navigation.js
index fefe7978e..3b11de443 100644
--- a/apps/documenteditor/main/app/view/Navigation.js
+++ b/apps/documenteditor/main/app/view/Navigation.js
@@ -69,7 +69,10 @@ define([
             $(el).html(this.template({scope: this}));
             var isWrap = Common.localStorage.getBool("de-outline-wrap",true);
             var fontSizeClass = Common.localStorage.getItem("de-outline-fontsize");
+            if(!fontSizeClass) fontSizeClass='medium';
             this.$el = $(el);
+            /*Common.localStorage.removeItem("de-outline-wrap");
+            Common.localStorage.removeItem("de-outline-fontsize");*/
 
 
             this.btnClose = new Common.UI.Button({
diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less
index 5ac2ab41a..e2c760455 100644
--- a/apps/documenteditor/main/resources/less/navigation.less
+++ b/apps/documenteditor/main/resources/less/navigation.less
@@ -9,8 +9,7 @@
         left: 0;
         top: 0;
         width: 100%;
-        padding: 10px 12px;
-        marging-top: 2px;
+        padding: 12px;
         overflow: hidden;
         border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
         border-bottom: @scaled-one-px-value solid @border-toolbar;

From 3a2ca8ba8f4ac7ef6632a0e186be76b27964bda7 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 21 Apr 2022 21:04:44 +0300
Subject: [PATCH 5/9] Fix styles for navigation

---
 .../main/resources/less/navigation.less               | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less
index e2c760455..9fd80ddb9 100644
--- a/apps/documenteditor/main/resources/less/navigation.less
+++ b/apps/documenteditor/main/resources/less/navigation.less
@@ -36,12 +36,21 @@
                     }
                 }
             }
+            .tree-item {
+                min-height: 25px;
+                .name {
+                    padding: 5px 0;
+                }
+            }
         }
         &.small{
             font-size: 10px;
         }
         &.medium{
             font-size: 12px;
+            .name {
+                padding: 4px 0;
+            }
         }
         &.large{
             font-size: 14px;
@@ -55,7 +64,7 @@
         }
 
         .name {
-            word-break: break-all;
+            word-break: break-word;
             max-height: 350px;
         }
     }

From 206e87d7dedb926706d45bea357760514179ce5b Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Fri, 22 Apr 2022 02:15:25 +0300
Subject: [PATCH 6/9] refactoring

---
 apps/documenteditor/main/app/view/Navigation.js | 6 +-----
 apps/documenteditor/main/locale/en.json         | 6 ++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/documenteditor/main/app/view/Navigation.js b/apps/documenteditor/main/app/view/Navigation.js
index 3b11de443..781a8ded4 100644
--- a/apps/documenteditor/main/app/view/Navigation.js
+++ b/apps/documenteditor/main/app/view/Navigation.js
@@ -69,11 +69,8 @@ define([
             $(el).html(this.template({scope: this}));
             var isWrap = Common.localStorage.getBool("de-outline-wrap",true);
             var fontSizeClass = Common.localStorage.getItem("de-outline-fontsize");
-            if(!fontSizeClass) fontSizeClass='medium';
+            if(!fontSizeClass) fontSizeClass = 'medium';
             this.$el = $(el);
-            /*Common.localStorage.removeItem("de-outline-wrap");
-            Common.localStorage.removeItem("de-outline-fontsize");*/
-
 
             this.btnClose = new Common.UI.Button({
                 parentEl: $('#navigation-btn-close', this.$el),
@@ -110,7 +107,6 @@ define([
                                     items: [{ caption : '1', value: 1 }, { caption : '2', value: 2 }, { caption : '3', value: 3 },
                                         { caption : '4', value: 4 }, { caption : '5', value: 5 }, { caption : '6', value: 6 },
                                         { caption : '7', value: 7 }, { caption : '8', value: 8 },  { caption : '9', value: 9 }]})
-
                         },
                         {
                             caption: '--',
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 9b771f458..534e09cf9 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -2141,6 +2141,7 @@
   "DE.Views.MailMergeSettings.txtPrev": "To previous record",
   "DE.Views.MailMergeSettings.txtUntitled": "Untitled",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
+  "DE.Views.Navigation.strNavigate": "Outline",
   "DE.Views.Navigation.txtCollapse": "Collapse all",
   "DE.Views.Navigation.txtDemote": "Demote",
   "DE.Views.Navigation.txtEmpty": "There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.",
@@ -2148,11 +2149,16 @@
   "DE.Views.Navigation.txtEmptyViewer": "There are no headings in the document.",
   "DE.Views.Navigation.txtExpand": "Expand all",
   "DE.Views.Navigation.txtExpandToLevel": "Expand to level",
+  "DE.Views.Navigation.txtFontSize": "Font size",
   "DE.Views.Navigation.txtHeadingAfter": "New heading after",
   "DE.Views.Navigation.txtHeadingBefore": "New heading before",
+  "DE.Views.Navigation.txtLarge":"Large",
+  "DE.Views.Navigation.txtMedium": "Medium",
   "DE.Views.Navigation.txtNewHeading": "New subheading",
   "DE.Views.Navigation.txtPromote": "Promote",
   "DE.Views.Navigation.txtSelect": "Select content",
+  "DE.Views.Navigation.txtSmall": "Small",
+  "DE.Views.Navigation.txtWrapHeadings": "Wrap long headings",
   "DE.Views.NoteSettingsDialog.textApply": "Apply",
   "DE.Views.NoteSettingsDialog.textApplyTo": "Apply changes to",
   "DE.Views.NoteSettingsDialog.textContinue": "Continuous",

From 40263d2201e849af3bcfc910592598f027a60d2b Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Fri, 22 Apr 2022 16:12:15 +0300
Subject: [PATCH 7/9] refactoring

---
 apps/documenteditor/main/app/view/Navigation.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/documenteditor/main/app/view/Navigation.js b/apps/documenteditor/main/app/view/Navigation.js
index 781a8ded4..be4cdc719 100644
--- a/apps/documenteditor/main/app/view/Navigation.js
+++ b/apps/documenteditor/main/app/view/Navigation.js
@@ -263,10 +263,6 @@ define([
         },
 
         ChangeSettings: function(props) {
-
-            this.btnSettingsMenu.items[4].menu.items.forEach(function (item){
-                item.checked = (item.value==fontsize);
-            });
         },
 
         txtPromote: 'Promote',

From d2696ce618348d137314a7e333fc72f978c3895d Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Fri, 22 Apr 2022 19:52:40 +0300
Subject: [PATCH 8/9] fix bugs

---
 apps/documenteditor/main/app/controller/LeftMenu.js   | 5 +++++
 apps/documenteditor/main/app/controller/Navigation.js | 4 ++++
 apps/documenteditor/main/app/view/LeftMenu.js         | 3 ++-
 apps/documenteditor/main/app/view/Navigation.js       | 9 ++++++---
 apps/documenteditor/main/app/view/ViewTab.js          | 3 ++-
 apps/documenteditor/main/locale/en.json               | 4 ++++
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 3bcb075ad..09b126555 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -816,6 +816,11 @@ define([
                         this.leftMenu.panelThumbnails.hide();
                         this.leftMenu.onBtnMenuClick(this.leftMenu.btnThumbnails);
                     }
+                    else if (this.leftMenu.btnNavigation.isActive()) {
+                        this.leftMenu.btnNavigation.toggle(false);
+                        this.leftMenu.panelNavigation.hide();
+                        this.leftMenu.onBtnMenuClick(this.leftMenu.btnNavigation);
+                    }
                 }
             }
         },
diff --git a/apps/documenteditor/main/app/controller/Navigation.js b/apps/documenteditor/main/app/controller/Navigation.js
index 0fc01e300..424457630 100644
--- a/apps/documenteditor/main/app/controller/Navigation.js
+++ b/apps/documenteditor/main/app/controller/Navigation.js
@@ -117,6 +117,7 @@ define([
             panelNavigation.btnSettingsMenu.on('item:click',           _.bind(this.onMenuSettingsItemClick, this));
             panelNavigation.btnSettingsMenu.items[2].menu.on('item:click', _.bind(this.onMenuLevelsItemClick, this));
             panelNavigation.btnSettingsMenu.items[4].menu.on('item:click', _.bind(this.onMenuFontSizeClick, this));
+            panelNavigation.btnClose.on('click', _.bind(this.onClickClosePanel, this));
 
             var viewport = this.getApplication().getController('Viewport').getView('Viewport');
             viewport.hlayout.on('layout:resizedrag',  function () {
@@ -263,6 +264,9 @@ define([
                 this.panelNavigation.viewNavigationList.collapseAll();
             }
         },
+        onClickClosePanel: function() {
+            Common.NotificationCenter.trigger('leftmenu:change', 'hide');
+        },
 
         onMenuSettingsItemClick: function (menu, item){
             switch (item.value){
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index a6ad60492..e6d9e53e4 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -154,7 +154,7 @@ define([
 
             this.btnNavigation = new Common.UI.Button({
                 el: $markup.elementById('#left-btn-navigation'),
-                hint: this.tipNavigation,
+                hint: this.tipOutline,
                 enableToggle: true,
                 disabled: true,
                 toggleGroup: 'leftMenuGroup'
@@ -501,6 +501,7 @@ define([
         txtTrial: 'TRIAL MODE',
         txtTrialDev: 'Trial Developer Mode',
         tipNavigation: 'Navigation',
+        tipOutline: 'Outline',
         txtLimit: 'Limit Access'
     }, DE.Views.LeftMenu || {}));
 });
diff --git a/apps/documenteditor/main/app/view/Navigation.js b/apps/documenteditor/main/app/view/Navigation.js
index be4cdc719..c87f3a7ab 100644
--- a/apps/documenteditor/main/app/view/Navigation.js
+++ b/apps/documenteditor/main/app/view/Navigation.js
@@ -76,14 +76,14 @@ define([
                 parentEl: $('#navigation-btn-close', this.$el),
                 cls: 'btn-toolbar',
                 iconCls: 'toolbar__icon btn-close',
-                hint: this.textClosePanel
+                hint: this.txtClosePanel,
             });
 
             this.btnSettings = new Common.UI.Button({
                 parentEl: $('#navigation-btn-settings', this.$el),
                 cls: 'btn-toolbar',
                 iconCls: 'toolbar__icon btn-settings',
-                hint: this.textSort,
+                hint: this.txtSettings,
                 menu: new Common.UI.Menu({
                     menuAlign: 'tr-br',
                     style: 'min-width: auto;',
@@ -282,6 +282,9 @@ define([
         txtFontSize: "Font size",
         txtSmall: "Small",
         txtMedium: "Medium",
-        txtLarge:"Large"
+        txtLarge:"Large",
+        txtClosePanel: "Close outline",
+        txtSettings: "Outline settings"
+
     }, DE.Views.Navigation || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js
index 76f3a51c1..b260ffa95 100644
--- a/apps/documenteditor/main/app/view/ViewTab.js
+++ b/apps/documenteditor/main/app/view/ViewTab.js
@@ -135,7 +135,7 @@ define([
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'toolbar__icon btn-menu-navigation',
                     lock: [_set.lostConnect, _set.disableOnStart],
-                    caption: this.textNavigation,
+                    caption: this.textOutline,
                     enableToggle: true,
                     dataHint: '1',
                     dataHintDirection: 'bottom',
@@ -305,6 +305,7 @@ define([
             },
 
             textNavigation: 'Navigation',
+            textOutline: 'Outline',
             textZoom: 'Zoom',
             textFitToPage: 'Fit To Page',
             textFitToWidth: 'Fit To Width',
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 534e09cf9..9400c91ac 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -2017,6 +2017,7 @@
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Comments",
   "DE.Views.LeftMenu.tipNavigation": "Navigation",
+  "DE.Views.LeftMenu.tipOutline": "Outline",
   "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Search",
   "DE.Views.LeftMenu.tipSupport": "Feedback & Support",
@@ -2142,6 +2143,7 @@
   "DE.Views.MailMergeSettings.txtUntitled": "Untitled",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
   "DE.Views.Navigation.strNavigate": "Outline",
+  "DE.Views.Navigation.txtClosePanel": "Close outline",
   "DE.Views.Navigation.txtCollapse": "Collapse all",
   "DE.Views.Navigation.txtDemote": "Demote",
   "DE.Views.Navigation.txtEmpty": "There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.",
@@ -2157,6 +2159,7 @@
   "DE.Views.Navigation.txtNewHeading": "New subheading",
   "DE.Views.Navigation.txtPromote": "Promote",
   "DE.Views.Navigation.txtSelect": "Select content",
+  "DE.Views.Navigation.txtSettings": "Outline settings",
   "DE.Views.Navigation.txtSmall": "Small",
   "DE.Views.Navigation.txtWrapHeadings": "Wrap long headings",
   "DE.Views.NoteSettingsDialog.textApply": "Apply",
@@ -2852,6 +2855,7 @@
   "DE.Views.ViewTab.textFitToWidth": "Fit To Width",
   "DE.Views.ViewTab.textInterfaceTheme": "Interface theme",
   "DE.Views.ViewTab.textNavigation": "Navigation",
+  "DE.Views.ViewTab.textOutline": "Outline",
   "DE.Views.ViewTab.textRulers": "Rulers",
   "DE.Views.ViewTab.textStatusBar": "Status Bar",
   "DE.Views.ViewTab.textZoom": "Zoom",

From afbcbcac635a00c630158aa6a10dcb86481236b6 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Fri, 29 Apr 2022 14:51:24 +0300
Subject: [PATCH 9/9] rename for navigaton

---
 apps/documenteditor/main/app/view/LeftMenu.js   |  2 +-
 apps/documenteditor/main/app/view/Navigation.js |  6 +++---
 apps/documenteditor/main/app/view/ViewTab.js    |  2 +-
 apps/documenteditor/main/locale/en.json         | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index e6d9e53e4..a51a96b0e 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -501,7 +501,7 @@ define([
         txtTrial: 'TRIAL MODE',
         txtTrialDev: 'Trial Developer Mode',
         tipNavigation: 'Navigation',
-        tipOutline: 'Outline',
+        tipOutline: 'Headings',
         txtLimit: 'Limit Access'
     }, DE.Views.LeftMenu || {}));
 });
diff --git a/apps/documenteditor/main/app/view/Navigation.js b/apps/documenteditor/main/app/view/Navigation.js
index c87f3a7ab..83b41c226 100644
--- a/apps/documenteditor/main/app/view/Navigation.js
+++ b/apps/documenteditor/main/app/view/Navigation.js
@@ -277,14 +277,14 @@ define([
         txtEmpty: 'There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.',
         txtEmptyItem: 'Empty Heading',
         txtEmptyViewer: 'There are no headings in the document.',
-        strNavigate: "Outline",
+        strNavigate: "Headings",
         txtWrapHeadings: "Wrap long headings",
         txtFontSize: "Font size",
         txtSmall: "Small",
         txtMedium: "Medium",
         txtLarge:"Large",
-        txtClosePanel: "Close outline",
-        txtSettings: "Outline settings"
+        txtClosePanel: "Close headings",
+        txtSettings: "Headings settings"
 
     }, DE.Views.Navigation || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js
index b260ffa95..b1ce0ad59 100644
--- a/apps/documenteditor/main/app/view/ViewTab.js
+++ b/apps/documenteditor/main/app/view/ViewTab.js
@@ -305,7 +305,7 @@ define([
             },
 
             textNavigation: 'Navigation',
-            textOutline: 'Outline',
+            textOutline: 'Headings',
             textZoom: 'Zoom',
             textFitToPage: 'Fit To Page',
             textFitToWidth: 'Fit To Width',
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 9400c91ac..aa49cd011 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -2017,7 +2017,7 @@
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Comments",
   "DE.Views.LeftMenu.tipNavigation": "Navigation",
-  "DE.Views.LeftMenu.tipOutline": "Outline",
+  "DE.Views.LeftMenu.tipOutline": "Headings",
   "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Search",
   "DE.Views.LeftMenu.tipSupport": "Feedback & Support",
@@ -2142,8 +2142,8 @@
   "DE.Views.MailMergeSettings.txtPrev": "To previous record",
   "DE.Views.MailMergeSettings.txtUntitled": "Untitled",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
-  "DE.Views.Navigation.strNavigate": "Outline",
-  "DE.Views.Navigation.txtClosePanel": "Close outline",
+  "DE.Views.Navigation.strNavigate": "Headings",
+  "DE.Views.Navigation.txtClosePanel": "Close headings",
   "DE.Views.Navigation.txtCollapse": "Collapse all",
   "DE.Views.Navigation.txtDemote": "Demote",
   "DE.Views.Navigation.txtEmpty": "There are no headings in the document.<br>Apply a heading style to the text so that it appears in the table of contents.",
@@ -2159,7 +2159,7 @@
   "DE.Views.Navigation.txtNewHeading": "New subheading",
   "DE.Views.Navigation.txtPromote": "Promote",
   "DE.Views.Navigation.txtSelect": "Select content",
-  "DE.Views.Navigation.txtSettings": "Outline settings",
+  "DE.Views.Navigation.txtSettings": "Headings settings",
   "DE.Views.Navigation.txtSmall": "Small",
   "DE.Views.Navigation.txtWrapHeadings": "Wrap long headings",
   "DE.Views.NoteSettingsDialog.textApply": "Apply",
@@ -2855,7 +2855,7 @@
   "DE.Views.ViewTab.textFitToWidth": "Fit To Width",
   "DE.Views.ViewTab.textInterfaceTheme": "Interface theme",
   "DE.Views.ViewTab.textNavigation": "Navigation",
-  "DE.Views.ViewTab.textOutline": "Outline",
+  "DE.Views.ViewTab.textOutline": "Headings",
   "DE.Views.ViewTab.textRulers": "Rulers",
   "DE.Views.ViewTab.textStatusBar": "Status Bar",
   "DE.Views.ViewTab.textZoom": "Zoom",