From f0dc216994770f628e120d062fefdb5f03baee09 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Mon, 25 Jul 2022 15:44:36 +0300
Subject: [PATCH] navbar fixes

---
 client/res/templates/site/navbar.tpl | 36 +++++++++++++++++++++-------
 client/src/views/site/navbar.js      |  7 +++---
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/client/res/templates/site/navbar.tpl b/client/res/templates/site/navbar.tpl
index 9f98d81fbf..c4c75c2975 100644
--- a/client/res/templates/site/navbar.tpl
+++ b/client/res/templates/site/navbar.tpl
@@ -160,26 +160,46 @@
             <li class="nav navbar-nav navbar-form global-search-container">
                 {{{globalSearch}}}
             </li>
-            <li class="dropdown notifications-badge-container">
-                {{{notificationsBadge}}}
-            </li>
             {{#if enableQuickCreate}}
             <li class="dropdown hidden-xs quick-create-container">
-                <a id="nav-quick-create-dropdown" class="dropdown-toggle" data-toggle="dropdown" href="#" title="{{translate 'Create'}}"><i class="fas fa-plus"></i></a>
+                <a
+                    id="nav-quick-create-dropdown"
+                    class="dropdown-toggle"
+                    data-toggle="dropdown"
+                    href="#"
+                    title="{{translate 'Create'}}"
+                ><i class="fas fa-plus"></i></a>
                 <ul class="dropdown-menu" role="menu" aria-labelledby="nav-quick-create-dropdown">
                     <li class="dropdown-header">{{translate 'Create'}}</li>
                     {{#each quickCreateList}}
-                    <li><a href="#{{./this}}/create" data-name="{{./this}}" data-action="quick-create">{{translate this category='scopeNames'}}</a></li>
+                    <li><a
+                            href="#{{./this}}/create"
+                            data-name="{{./this}}"
+                            data-action="quick-create"
+                        >{{translate this category='scopeNames'}}</a></li>
                     {{/each}}
                 </ul>
             </li>
             {{/if}}
+            <li class="dropdown notifications-badge-container">
+                {{{notificationsBadge}}}
+            </li>
             <li class="dropdown menu-container">
-                <a id="nav-menu-dropdown" class="dropdown-toggle" data-toggle="dropdown" href="#" title="{{translate 'Menu'}}"><span class="fas fa-ellipsis-v"></span></a>
+                <a
+                    id="nav-menu-dropdown"
+                    class="dropdown-toggle"
+                    data-toggle="dropdown"
+                    href="#"
+                    title="{{translate 'Menu'}}"
+                ><span class="fas fa-ellipsis-v"></span></a>
                 <ul class="dropdown-menu" role="menu" aria-labelledby="nav-menu-dropdown">
                     {{#each menuDataList}}
                         {{#unless divider}}
-                            <li><a href="{{#if link}}{{link}}{{else}}javascript:{{/if}}" class="nav-link{{#if action}} action{{/if}}"{{#if action}} data-action="{{action}}"{{/if}}>{{#if html}}{{{html}}}{{else}}{{label}}{{/if}}</a></li>
+                            <li><a
+                                    href="{{#if link}}{{link}}{{else}}javascript:{{/if}}"
+                                    class="nav-link{{#if action}} action{{/if}}"{{#if action}}
+                                    data-action="{{action}}"{{/if}}
+                                >{{#if html}}{{{html}}}{{else}}{{label}}{{/if}}</a></li>
                         {{else}}
                             <li class="divider"></li>
                         {{/unless}}
@@ -188,7 +208,7 @@
             </li>
         </ul>
         </div>
-        <a class="minimizer" href="javascript:">
+        <a class="minimizer hidden" href="javascript:">
             <span class="fas fa-chevron-right right"></span>
             <span class="fas fa-chevron-left left"></span>
         </a>
diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.js
index d46c1bb2dd..9df524fc69 100644
--- a/client/src/views/site/navbar.js
+++ b/client/src/views/site/navbar.js
@@ -663,6 +663,8 @@ define('views/site/navbar', ['view'], function (Dep) {
                 var windowHeight = window.innerHeight;
                 var windowWidth = window.innerWidth;
 
+                this.$minimizer.removeClass('hidden');
+
                 if (windowWidth < smallScreenWidth) {
                     $tabs.css('height', 'auto');
                     $more.css('max-height', '');
@@ -680,10 +682,6 @@ define('views/site/navbar', ['view'], function (Dep) {
 
             updateSizeForVertical();
 
-            this.$el
-                .find('.notifications-badge-container')
-                .insertAfter(this.$el.find('.quick-create-container'));
-
             this.adjustBodyMinHeight();
         },
 
@@ -794,6 +792,7 @@ define('views/site/navbar', ['view'], function (Dep) {
             this.$body = $('body');
             this.$tabs = this.$el.find('ul.tabs');
             this.$more = this.$tabs.find('li.more > ul');
+            this.$minimizer = this.$el.find('a.minimizer');
 
             this.$body.addClass('has-navbar');