From 30bc8d77095a16e6b15f262631911bb7fdad0017 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 31 Jan 2018 15:16:29 +0800
Subject: [PATCH]  * adjust for task #3592.

---
 module/common/lang/zh-cn.php       |   2 +-
 module/common/model.php            | 109 +++++++++++++++--------------
 module/common/view/header.html.php |  35 +--------
 www/js/my.full.js                  |   8 +--
 www/theme/default/style.css        |  14 ----
 www/theme/zui/css/min.css          |   2 +-
 6 files changed, 65 insertions(+), 105 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 0e9ef50327..3997643d7b 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -23,7 +23,7 @@ $lang->welcome        = "%s项目管理系统";
 $lang->logout         = '退出';
 $lang->login          = '登录';
 $lang->help           = '帮助';
-$lang->aboutZenTao    = '关于';
+$lang->aboutZenTao    = '关于禅道';
 $lang->profile        = '个人档案';
 $lang->changePassword = '更改密码';
 $lang->runInfo        = "<div class='row'><div class='u-1 a-center' id='debugbar'>时间: %s 毫秒, 内存: %s KB, 查询: %s.  </div></div>";
diff --git a/module/common/model.php b/module/common/model.php
index 33b97885e3..d907dce1aa 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -228,7 +228,7 @@ class commonModel extends model
      * @access public
      * @return void
      */
-    public static function printTopBar()
+    public static function printUserBar()
     {
         global $lang, $app;
 
@@ -236,11 +236,12 @@ class commonModel extends model
         {
             $isGuest = $app->user->account == 'guest';
 
-            echo "<div class='dropdown' style='display:inline-block;margin-right:5px'>";
-            echo "<a href='javascript:;' data-toggle='dropdown'><i class='icon-user'></i> " . $app->user->realname . " <span class='caret'></span></a>";
-
-            echo "<ul class='dropdown-menu'>";
-
+            echo "<a class='dropdown-toggle' data-toggle='dropdown'>";
+            echo "<div class='avatar avatar-sm bg-info avatar-circle'>" . strtoupper($app->user->account{0}) . '</div>';
+            echo "<span class='user-name'>" . (empty($app->user->realname) ? $app->user->account : $app->user->realname) . '</span>';
+            echo "<span class='caret'></span>";
+            echo '</a>';
+            echo "<ul class='dropdown-menu pull-right'>";
             if(!$isGuest)
             {
                 echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
@@ -249,24 +250,24 @@ class commonModel extends model
                 echo "<li class='divider'></li>";
             }
 
-            echo "<li class='dropdown-submenu left'>";
-            echo "<a href='javascript:;'>" . $lang->theme . "</a><ul class='dropdown-menu'>";
-            foreach ($app->lang->themes as $key => $value)
+            echo "<li class='dropdown-submenu'>";
+            echo "<a href='javascript:;'>" . $lang->theme . "</a><ul class='dropdown-menu pull-left'>";
+            foreach($app->lang->themes as $key => $value)
             {
-                echo "<li class='theme-option" . ($app->cookie->theme == $key ? " active" : '') . "'><a href='javascript:selectTheme(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
+                echo "<li><a href='javascript:selectTheme(\"$key\");' data-value='" . $key . "'>" . $value . ($app->cookie->theme == $key ? '<i class="icon icon-check-circle text-success"></i>' : '') . "</a></li>";
             }
             echo '</ul></li>';
 
-            echo "<li class='dropdown-submenu left'>";
-            echo "<a href='javascript:;'>" . $lang->lang . "</a><ul class='dropdown-menu'>";
+            echo "<li class='dropdown-submenu'>";
+            echo "<a href='javascript:;'>" . $lang->lang . "</a><ul class='dropdown-menu pull-left'>";
             foreach ($app->config->langs as $key => $value)
             {
-                echo "<li class='lang-option" . ($app->cookie->lang == $key ? " active" : '') . "'><a href='javascript:selectLang(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
+                echo "<li><a href='javascript:selectLang(\"$key\");'>" . $value . ($app->cookie->lang == $key ? ' <i class="icon icon-check-circle text-success"></i>' : '') . "</a></li>";
             }
             echo '</ul></li>';
 
-            echo '</ul></div>';
-
+            echo '<li class="divider"></li>';
+            echo '<li>';
             if($isGuest)
             {
                 echo html::a(helper::createLink('user', 'login'), $lang->login);
@@ -275,27 +276,30 @@ class commonModel extends model
             {
                 echo html::a(helper::createLink('user', 'logout'), $lang->logout);
             }
+            echo '</li></ul>';
         }
-
-        if($app->company->website)  echo html::a($app->company->website,  $lang->company->website,  '_blank');
-        if($app->company->backyard) echo html::a($app->company->backyard, $lang->company->backyard, '_blank');
-
-        echo "<div class='dropdown' style='display:inline-block;margin-right:5px'>";
-        echo "<a href='javascript:;' data-toggle='dropdown'>" . $lang->help . " <span class='caret'></span></a>";
-        echo "<ul class='dropdown-menu pull-right'>";
-        echo '<li>' . html::a('javascript:;', $lang->manual, '', "class='open-help-tab'") . '</li>';
-        if(!commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->tutorial, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . "</li>";
-        echo '<li>' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
-        echo "</ul></div>";
-        echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'");
     }
 
+    /**
+     * Print about bar.
+     * 
+     * @static
+     * @access public
+     * @return void
+     */
     public static function printAboutBar()
     {
         global $app, $lang;
-        echo html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'");
-        if(!commonModel::isTutorialMode() and $app->user->account != 'guest') echo html::a(helper::createLink('tutorial', 'start'), $lang->tutorial, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'");
-        echo html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao . $lang->zentaoPMS, '', "class='about iframe' data-width='900' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'");
+        echo "<ul id='extraNav' class='nav nav-default'>";
+        echo "<li class='dropdown'>";
+        echo "<a data-toggle='dropdown'>" . $lang->help . " <span class='caret'></span></a>";
+        echo "<ul class='dropdown-menu text-left'>";
+        if(!commonModel::isTutorialMode() and $app->user->account != 'guest') echo '<li>' . html::a(helper::createLink('tutorial', 'start'), $lang->tutorial, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . "</li>";
+        echo '<li>' . html::a('javascript:;', $lang->manual, '', "class='open-help-tab'") . '</li>';
+        echo '<li>' . html::a(helper::createLink('misc', 'changeLog'), $lang->changeLog, '', "class='iframe' data-width='800' data-headerless='true' data-backdrop='true' data-keyboard='true'") . '</li>';
+        echo "</ul></li>";
+        echo '<li>' . html::a(helper::createLink('misc', 'about'), $lang->aboutZenTao, '', "class='about iframe' data-width='900' data-headerless='true' data-backdrop='true' data-keyboard='true' data-class='modal-about'") . '</li>';
+        echo '</ul>';
     }
 
     /**
@@ -397,18 +401,19 @@ class commonModel extends model
             if($config->global->flow == 'onlyTask')  $searchObject = 'task';
         }
 
-        echo "<div class='input-group input-group-sm' id='searchbox'>";
-        echo "<div class='input-group-btn' id='typeSelector'>";
-        echo "<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span id='searchTypeName'>" . $lang->searchObjects[$searchObject] . "</span> <span class='caret'></span></button>";
+        echo "<div class='input-control search-box search-box-circle has-icon-right has-label-left' id='searchbox'>";
+        echo "<div class='input-control-label-left dropdown'>";
+        echo "<a data-toggle='dropdown'><span id='searchTypeName'>" . $lang->searchObjects[$searchObject] . "</span><span class='caret'></span></a>";
         echo html::hidden('searchType', $searchObject);
-        echo "<ul class='dropdown-menu'>";
+        echo "<ul class='dropdown-menu' id='searchTypeMenu'>";
         foreach ($lang->searchObjects as $key => $value)
         {
-            echo "<li><a href='javascript:;' data-value='{$key}'>{$value}</a></li>";
+            $class = $key == $searchObject ? "class='selected'" : '';
+            echo "<li $class><a href='javascript:;' data-value='{$key}'>{$value}</a></li>";
         }
         echo '</ul></div>';
-        echo "<input type='search' name='searchQuery' id='searchInput' onclick='this.value=\"\"' onkeydown='if(event.keyCode==13) shortcut()' class='form-control' placeholder='" . $lang->searchTips . "'/>";
-        echo "<a href='javascript:shortcut();' class='input-control-icon-right'><i class='icon icon-search'></i></a>";
+        echo "<input type='search' id='searchInput' onclick='this.value=\"\"' onkeydown='if(event.keyCode==13) shortcut()' class='form-control search-input' placeholder='" . $lang->searchTips . "'/>";
+        echo "<a href='javascript:shortcut();' class='input-control-icon-right'><i class='icon icon-up-circle icon-rotate-90'></i></a>";
         echo "</div>\n";
     }
 
@@ -1208,7 +1213,7 @@ class commonModel extends model
         // limited project
         $limitedProject = false;
         if(!empty($module) && $module == 'task' && !empty($object->project) or
-           !empty($module) && $module == 'project' && !empty($object->id))
+            !empty($module) && $module == 'project' && !empty($object->id))
         {
             $objectID = '';
             if(!empty($object->id)) $objectID = $object->id;
@@ -1228,14 +1233,14 @@ class commonModel extends model
         if(is_null($object)) return true;
 
         if(!empty($object->openedBy)     && $object->openedBy     == $app->user->account or
-           !empty($object->addedBy)      && $object->addedBy      == $app->user->account or
-           !empty($object->assignedTo)   && $object->assignedTo   == $app->user->account or
-           !empty($object->finishedBy)   && $object->finishedBy   == $app->user->account or
-           !empty($object->canceledBy)   && $object->canceledBy   == $app->user->account or
-           !empty($object->closedBy)     && $object->closedBy     == $app->user->account or
-           !empty($object->lastEditedBy) && $object->lastEditedBy == $app->user->account)
+            !empty($object->addedBy)      && $object->addedBy      == $app->user->account or
+            !empty($object->assignedTo)   && $object->assignedTo   == $app->user->account or
+            !empty($object->finishedBy)   && $object->finishedBy   == $app->user->account or
+            !empty($object->canceledBy)   && $object->canceledBy   == $app->user->account or
+            !empty($object->closedBy)     && $object->closedBy     == $app->user->account or
+            !empty($object->lastEditedBy) && $object->lastEditedBy == $app->user->account)
         {
-           return true;
+            return true;
         }
 
         return false;
@@ -1496,13 +1501,13 @@ class commonModel extends model
         if(!file_exists($logFile)) file_put_contents($logFile, '<?php die(); ?' . '>');
 
         $fh = @fopen($logFile, 'a');
-		if($fh)
-		{
-			fwrite($fh, date('Ymd H:i:s') . ": " . $app->getURI() . "\n");
-			fwrite($fh, "url:    " . $url . "\n");
-			fwrite($fh, "results:" . print_r($response, true) . "\n");
-			fclose($fh);
-		}
+        if($fh)
+        {
+            fwrite($fh, date('Ymd H:i:s') . ": " . $app->getURI() . "\n");
+            fwrite($fh, "url:    " . $url . "\n");
+            fwrite($fh, "results:" . print_r($response, true) . "\n");
+            fclose($fh);
+        }
 
         return $response;
     }
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 01049c702f..528f919e92 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -24,44 +24,13 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
       </hrgroup>
       <nav id='navbar'><?php commonModel::printMainmenu($this->moduleName);?></nav>
       <div id='toolbar'>
-        <div id="extraNav">
-          <?php //common::printTopBar();?>
-          <?php common::printAboutBar();?>
-        </div>
+        <?php common::printAboutBar();?>
         <div id="userMenu">
           <?php common::printSearchBox();?>
           <ul id="userNav" class="nav nav-default">
             <?php list($adminName, $adminModule, $adminMethod) = explode('|', $lang->adminMenu);?>
             <li><?php echo html::a($this->createLink($adminModule, $adminMethod), $adminName);?></li>
-            <li><?php echo '<a>通知</a>';?></li>
-            <li>
-              <a class="dropdown-toggle" data-toggle="dropdown">
-                <div class="avatar avatar-sm bg-info avatar-circle"><?php echo strtoupper($app->user->account{0})?></div>
-                <span class="user-name"><?php echo empty($app->user->realname) ? $app->user->account : $app->user->realname;?></span>
-                <span class="caret"></span>
-              </a>
-              <ul class="dropdown-menu">
-                <?php
-                list($taskName, $taskModule, $taskMethod) = explode('|', $lang->my->menu->task['link']);
-                echo '<li>' . html::a($this->createLink($taskModule, $taskMethod), $taskName) . '</li>';
-                list($bugName, $bugModule, $bugMethod) = explode('|', $lang->my->menu->bug['link']);
-                echo '<li>' . html::a($this->createLink($bugModule, $bugMethod), $bugName) . '</li>';
-                list($storyName, $storyModule, $storyMethod) = explode('|', $lang->my->menu->story['link']);
-                echo '<li>' . html::a($this->createLink($storyModule, $storyMethod), $storyName) . '</li>';
-                list($taskName, $taskModule, $taskMethod) = explode('|', $lang->my->menu->testtask['link']);
-                echo '<li>' . html::a($this->createLink($taskModule, $taskMethod), $taskName) . '</li>';
-                echo "<li class='divider'></li>";
-                echo '<li>' . html::a($this->createLink('user', 'logout'), $lang->logout) . '</li>';
-                echo "<li class='dropdown-submenu left'>";
-                echo "<a href='javascript:;'>" . $lang->lang . "</a><ul class='dropdown-menu'>";
-                foreach ($app->config->langs as $key => $value)
-                {
-                    echo "<li class='lang-option" . ($app->cookie->lang == $key ? " active" : '') . "'><a href='javascript:selectLang(\"$key\");' data-value='" . $key . "'>" . $value . "</a></li>";
-                }
-                echo '</ul></li>';
-                ?>
-              </ul>
-            </li>
+            <li><?php common::printUserBar();?></li>
           </ul>
         </div>
       </div>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 0250693b64..ba37f3ae16 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -57,11 +57,11 @@ function createLink(moduleName, methodName, vars, viewType, isOnlyBody)
  */
 function setSearchBox()
 {
-    $('#typeSelector a').click(function()
+    $('#searchTypeMenu a').click(function()
     {
-        $('#typeSelector li.active').removeClass('active');
+        $('#searchTypeMenu li.selected').removeClass('selected');
         var $this = $(this);
-        $this.closest('li').addClass('active');
+        $this.closest('li').addClass('selected');
         $("#searchType").val($this.data('value'));
         $("#searchTypeName").text($this.text());
     });
@@ -76,7 +76,7 @@ function setSearchBox()
 function shortcut()
 {
     objectType  = $('#searchType').attr('value');
-    objectValue = $("input[name='searchQuery']").attr('value');
+    objectValue = $("input#searchInput").attr('value');
     if(objectType && objectValue)
     {
         method = objectType == 'testsuite' ? 'library' : 'view';
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index e2b8a0fd47..d3242c5486 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -374,20 +374,6 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin
 .progressbar {display: inline-block; height: 16px; background: #229F24; position: relative; top: -1px}
 
 /* === Layout === */
-/* Background */
-
-/* Header */
-#extraNav .dropdown .dropdown-menu li {text-align:center;}
-#extraNav .dropdown .dropdown-menu li a{width:100%;color:rgb(60, 67, 83);}
-#extraNav .dropdown .dropdown-menu li a:hover{color:#fff;}
-
-#searchbox{width:160px;}
-#searchbox .form-control, #searchbox .btn {padding: 2px 5px; line-height: 20px; height: 24px;border-top: 0; border-bottom: 0; float: left; display: block;}
-#typeSelector .btn{padding-left: 10px; border-right: none}
-#objectSwitcher .btn{padding-right: 10px; margin-left: -1px\0;}
-#searchbox .dropdown-menu {margin-top: -1px; width: 212px; padding: 0;}
-#searchbox .dropdown-menu > li {float: left; width: 105px; border-bottom: 1px dotted #ddd; border-right: 1px dotted #ddd}
-
 /* Module menu. */
 #modulemenu {background-color: #e5e5e5; margin: 0 -20px; padding: 0 20px; font-size: 14px; position: relative; height: 40px;}
 #modulemenu .nav > li {line-height: 30px; padding:5px 0px 1px;display: block; float: left; color: #808080}
diff --git a/www/theme/zui/css/min.css b/www/theme/zui/css/min.css
index 0a9abf8074..edaa57fe9a 100644
--- a/www/theme/zui/css/min.css
+++ b/www/theme/zui/css/min.css
@@ -1,5 +1,5 @@
 /*!
- * ZUI: Zentao template - v1.8.1 - 2018-01-30
+ * ZUI: Zentao template - v1.8.1 - 2018-01-31
  * http://zui.sexy
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2018 cnezsoft.com; Licensed MIT