From e9f36319b7ba2b85bbd7d29c6b0a507ab73b3333 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 24 May 2018 16:54:11 +0800
Subject: [PATCH]  * finish task #4198.

---
 module/product/view/browse.html.php | 12 ++++++++++--
 module/project/view/task.html.php   | 13 +++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 4834d2d99d..ab6bd3881f 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -36,9 +36,17 @@
     <?php if($menuItem->name == 'more'):?>
     <?php
     echo '<div class="btn-group">';
-    echo html::a('javascript:;', $menuItem->text . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link'");
+    $active  = '';
+    $current = $menuItem->text;
+    $storyBrowseType = $this->session->storyBrowseType;
+    if(isset($lang->product->moreSelects[$storyBrowseType]))
+    {
+        $active = 'btn-active-text';
+        $current = "<span class='text'>{$lang->product->moreSelects[$storyBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+    }
+    echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link $active'");
     echo "<ul class='dropdown-menu'>";
-    foreach ($lang->product->moreSelects as $key => $value)
+    foreach($lang->product->moreSelects as $key => $value)
     {
         echo '<li' . ($key == $this->session->storyBrowseType ? " class='active'" : '') . '>';
         echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$key" . $queryParam), $value);
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index deb4415494..fc976623b8 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -69,11 +69,16 @@ js::set('browseType', $browseType);
         {
             echo "<div class='btn-group'>";
             $taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
-            $current        = zget($lang->project->statusSelects, $taskBrowseType, '');
-            if(empty($current)) $current = $menuItem->text;
-            echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link'");
+            $current        = $menuItem->text;
+            $active         = '';
+            if(isset($lang->project->statusSelects[$taskBrowseType]))
+            {
+                $current = "<span class='text'>{$lang->project->statusSelects[$taskBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+                $active  = 'btn-active-text';
+            }
+            echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link $active'");
             echo "<ul class='dropdown-menu'>";
-            foreach ($lang->project->statusSelects as $key => $value)
+            foreach($lang->project->statusSelects as $key => $value)
             {
                 if($key == '') continue;
                 echo '<li' . ($key == $taskBrowseType ? " class='active'" : '') . '>';