From 815043b8e9bc680c1ff6c0eaa3d90bf08d769651 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 31 Mar 2021 10:15:07 +0800
Subject: [PATCH]  * Finish task #37128,#37127.

---
 module/common/model.php            |  1 -
 module/common/view/header.html.php |  9 ++++++++-
 module/index/css/index.css         | 21 ++++++++++-----------
 module/index/view/index.html.php   | 10 +++++++---
 www/theme/default/style.css        | 13 ++++++++++---
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 142ed53a0f..69b99e5b76 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -314,7 +314,6 @@ class commonModel extends model
                 echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), "<i class='icon icon-account'></i> " . $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
                 echo '<li>' . html::a(helper::createLink('my', 'preference', '', '', true), "<i class='icon icon-controls'></i> " . $lang->preference, '', "class='iframe' data-width='650'") . '</li>';
                 echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), "<i class='icon icon-cog-outline'></i> " . $lang->changePassword, '', "class='iframe' data-width='600'") . '</li>';
-                echo "<li id='menuToggleItem'><a type='button' class='menu-toggle'><i class='icon icon-sm icon-menu-collapse'></i> <span class='is-unfold'>$lang->unfoldMenu</span><span class='is-collapse'>$lang->collapseMenu</span></a></li>";
 
                 echo "<li class='divider'></li>";
             }
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 8d9a165e03..8084267eeb 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -11,10 +11,17 @@ include 'chosen.html.php';
   <div id='mainHeader'>
     <div class='container'>
       <div id='heading'>
-        <?php common::printHomeButton($app->openApp);?> 
+        <?php common::printHomeButton($app->openApp);?>
         <?php echo isset($lang->switcherMenu) ? $lang->switcherMenu : '';?>
       </div>
       <nav id='navbar'><?php $activeMenu = commonModel::printMainMenu();?></nav>
+      <div id='toolbar'>
+        <div id='userMenu'>
+          <ul id="userNav" class="nav nav-default">
+            <li class='dropdown dropdown-hover has-avatar'><?php common::printUserBar();?></li>
+          </ul>
+        </div>
+      </div>
     </div>
   </div>
   <?php if(isset($lang->{$app->openApp}->menu->$activeMenu) and isset($lang->{$app->openApp}->menu->{$activeMenu}['subMenu'])):?>
diff --git a/module/index/css/index.css b/module/index/css/index.css
index 3a4e82a8d8..9cd5a94f11 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -17,7 +17,6 @@ body.menu-hide {padding-left: 0;}
 .menu-toggle .is-unfold, .menu-hide .menu-toggle .is-collapse {display: none;}
 .menu-hide .menu-toggle .is-unfold {display: inline;}
 #menuToggleItem,
-.menu-hide #menuToggleMenu {display: none;}
 .menu-hide #menuToggleItem {display: list-item;}
 .menu-hide #menu .nav > li {padding: 4px;}
 .menu-hide #menu .nav > li > a {padding: 6px 4px; text-align: center;}
@@ -59,16 +58,16 @@ body.menu-hide {padding-left: 0;}
 #bars > li.active:after {content: ' '; display: block; position: absolute; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;}
 #bars > li.divider{margin-right: 5px; margin-top: 10px; height: 20px; border-right: 1px solid #d9d9d9;}
 
-#userNav {float: none; margin: 0;}
-#userNav>li {text-align: center;}
-#userNav>li>.dropdown-menu {left: 100%; bottom: 0; top: auto; width: 140px; text-align: left; background: #3c495c;}
-#userNav>li>.dropdown-menu a {color: #fff;}
-#userNav>li>.dropdown-menu .dropdown-menu {left: 100%; text-align: left; background: #3c495c;}
-#userNav>li .top .dropdown-menu {top: -60px;}
-#userNav .dropdown-menu>li>a>.icon {position: relative; top: 0; display: inline;}
-#userNav li.open>a {background: #0c64eb;}
-#userNav li.divider {opacity: .24; border-top: 1px solid; height: 2px;}
-#userNav .dropdown-submenu:focus > a, #userNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
+#flodNav {float: none; margin: 0;}
+#flodNav>li {text-align: center;}
+#flodNav>li>.dropdown-menu {left: 100%; bottom: 0; top: auto; width: 140px; text-align: left; background: #3c495c;}
+#flodNav>li>.dropdown-menu a {color: #fff;}
+#flodNav>li>.dropdown-menu .dropdown-menu {left: 100%; text-align: left; background: #3c495c;}
+#flodNav>li .top .dropdown-menu {top: -60px;}
+#flodNav .dropdown-menu>li>a>.icon {position: relative; top: 0; display: inline;}
+#flodNav li.open>a {background: #0c64eb;}
+#flodNav li.divider {opacity: .24; border-top: 1px solid; height: 2px;}
+#flodNav .dropdown-submenu:focus > a, #flodNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
 #poweredBy {width: 40%; position: absolute; top: 4px; right: 0; padding: 0;}
 
 #globalSearchDiv {width: 52%; float: right; margin-right: 4px;}
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index fe375a650b..fb8d80a613 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -55,9 +55,13 @@ js::set('defaultOpen', $open);
     </div>
   </div>
   <div id='menuFooter'>
-    <ul id="userNav" class="nav">
-      <li id='menuToggleMenu'><a type='button' class='menu-toggle'><i class='icon icon-sm icon-menu-collapse'></i></a></li>
-      <li class='dropdown dropdown-hover has-avatar'><?php common::printUserBar();?></li>
+    <ul id="flodNav" class="nav">
+      <li id='menuToggleMenu'>
+        <a type='button' class='menu-toggle'>
+          <i class='icon icon-sm icon-menu-collapse'></i>
+          <i class='icon icon-sm icon-menu-unfold'></i>
+        </a>
+      </li>
     </ul>
   </div>
 </div>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index e53813a9f3..5df6299626 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -44,8 +44,15 @@ a.showMoreImage:hover {opacity: 1;}
 .table-actions .btn {background: #78bdf5; color: #fff; border-color: #78bdf5}
 .table-footer .checked+div .btn, .table-actions .btn:hover {background: #16a8f8; border-color: #16a8f8}
 
-#header #toolbar a{color: #fff; font-size: 13px; line-height: 15px; border: #84a2e2 1px solid}
+#header #toolbar a{color: #3c4353; font-size: 13px; line-height: 15px;}
 #header #toolbar i{font-size: 16px;}
 
-#navbar .nav>li.divider {margin: 15px 8px 15px 8px;}
-#navbar .nav>li>a { padding: 10px 10px;}
+#toolbar {top: 6px;}
+#userNav {float: none; margin: 0;}
+#userNav>li {text-align: center}
+#userNav>li>a {padding: 6px 6px;color: #000; opacity: .9;margin-left: 0px}
+#userNav>li>a:hover {background: #0c64eb;}
+#userNav>li>.dropdown-menu {text-align: left;}
+#userNav>li>.dropdown-menu a {color: #fff}
+#userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu {top: -60px}
+#userNav .dropdown-menu>li>a>.icon { position: initial;  display: inline;}