From 8720e886e8d6984fa83d0110dbe24461779836b4 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 1 Dec 2016 11:23:04 +0800
Subject: [PATCH]  * adjust task #2696.

---
 module/bug/css/browse.css                |  2 +
 module/bug/view/browse.html.php          | 19 ++++-----
 module/product/css/browse.css            |  2 +
 module/product/view/browse.html.php      | 49 ++++++++++++------------
 module/project/css/task.css              |  2 +
 module/project/view/taskheader.html.php  | 18 ++++-----
 module/testcase/css/browse.css           |  2 +
 module/testcase/view/caseheader.html.php | 17 ++++----
 8 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css
index ad9760e3e5..828be685ff 100644
--- a/module/bug/css/browse.css
+++ b/module/bug/css/browse.css
@@ -16,3 +16,5 @@
 
 #treebox{position:fixed;margin-left:20px;}
 .outer.hide-side #treebox{margin-left:0px;}
+
+#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;}
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 13ac5d7571..c914b0e0fc 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -62,24 +62,25 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
       </div>
     </div>
     <div class='btn-group'>
-      <div class='btn-group btn-bug-create'>
-        <button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
-          <i class='icon icon-plus'></i> <?php echo $lang->bug->common;?>
-          <span class='caret'></span>
-        </button>
-        <ul class='dropdown-menu' id='createBugActionMenu'>
+      <div class='btn-group' id='createActionMenu'>
         <?php 
         if(commonModel::isTutorialMode())
         {
             $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
-            echo '<li>' . html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), $lang->bug->create) . '</li>';
+            echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), "<i class='icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-bug-create'");
         }
         else
         {
-            $misc = common::hasPriv('bug', 'create') ? '' : "class=disabled";
+            $misc = common::hasPriv('bug', 'create') ? "class='btn'" : "class='btn disabled'";
             $link = common::hasPriv('bug', 'create') ?  $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID") : '#';
-            echo "<li>" . html::a($link, $lang->bug->create, '', $misc) . "</li>";
+            echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->bug->create, '', $misc);
         }
+        ?>
+        <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'>
+          <span class='caret'></span>
+        </button>
+        <ul class='dropdown-menu'>
+        <?php
         $misc = common::hasPriv('bug', 'batchCreate') ? '' : "class=disabled";
         $link = common::hasPriv('bug', 'batchCreate') ?  $this->createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID") : '#';
         echo "<li>" . html::a($link, $lang->bug->batchCreate, '', $misc) . "</li>";
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index 24cf2f530a..ab1d0e4c09 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -13,4 +13,6 @@
 a.removeModule{color:#ddd}
 a.removeModule:hover{color:red}
 
+#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;}
+
 tbody > tr > td > .btn-icon {margin-right: 3px;}
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 1622cf20e2..c59d29fa73 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -55,31 +55,30 @@
       </div>
         <?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'button', 'bar-chart'); ?>
     </div>
-    <div class='btn-group'>
-      <div class='btn-group create-story-btn'>
-        <button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
-          <i class='icon icon-plus'></i> <?php echo $lang->story->common;?>
-          <span class='caret'></span>
-        </button>
-        <ul class='dropdown-menu' id='createStoryActionMenu'>
-        <?php 
-        if(commonModel::isTutorialMode())
-        {
-            $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID");
-            echo "<li>" . html::a($this->createLink('tutorial', 'wizard', "module=story&method=create&params=$wizardParams"), $lang->story->create) . "</li>";
-        }
-        else
-        {
-            $misc = common::hasPriv('story', 'create') ? '' : "class=disabled";
-            $link = common::hasPriv('story', 'create') ?  $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#';
-            echo "<li>" . html::a($link, $lang->story->create, '', $misc) . "</li>";
-        }
-        $misc = common::hasPriv('story', 'batchCreate') ? '' : "class=disabled";
-        $link = common::hasPriv('story', 'batchCreate') ?  $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#';
-        echo "<li>" . html::a($link, $lang->story->batchCreate, '', $misc) . "</li>";
-        ?>
-        </ul>
-      </div>
+    <div class="btn-group" id='createActionMenu'>
+      <?php
+      if(commonModel::isTutorialMode())
+      {
+          $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID");
+          echo html::a($this->createLink('tutorial', 'wizard', "module=story&method=create&params=$wizardParams"), "<i class='con-plus'></i>" . $lang->story->create, '', 'create-story-btn');
+      }
+      else
+      {
+          $misc = common::hasPriv('story', 'create') ? "class='btn'" : "class='btn disabled'";
+          $link = common::hasPriv('story', 'create') ?  $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#';
+          echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->story->create, '', $misc);
+      }
+      ?>
+      <button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
+        <span class="caret"></span>
+      </button>
+      <ul class='dropdown-menu'>
+      <?php
+      $misc = common::hasPriv('story', 'batchCreate') ? '' : "class=disabled";
+      $link = common::hasPriv('story', 'batchCreate') ?  $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID") : '#';
+      echo "<li>" . html::a($link, $lang->story->batchCreate, '', $misc) . "</li>";
+      ?>
+      </ul>
     </div>
   </div>
   <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
diff --git a/module/project/css/task.css b/module/project/css/task.css
index 720ed1ad17..3e60ee765d 100644
--- a/module/project/css/task.css
+++ b/module/project/css/task.css
@@ -24,4 +24,6 @@
 #taskTree{position:fixed;margin-left:20px;}
 .outer.hide-side #taskTree{margin-left:0px;}
 
+#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;}
+
 tbody > tr > td > .btn-icon {margin-right: 2px}
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 22964e4fac..33b780d9df 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -121,17 +121,17 @@
       </div>
     </div>
     <div class='btn-group'>
-      <div class='btn-group'>
-        <button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
-            <i class='icon icon-plus'></i> <?php echo $lang->task->common;?>
-            <span class='caret'></span>
-        </button>
-        <ul class='dropdown-menu' id='createTaskActionMenu'>
+      <div class='btn-group' id='createActionMenu'>
         <?php 
-        $misc = common::hasPriv('task', 'create') ? '' : "class=disabled";
+        $misc = common::hasPriv('task', 'create') ? "class='btn'" : "class='btn disabled'";
         $link = common::hasPriv('task', 'create') ?  $this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#';
-        echo "<li>" . html::a($link, $lang->task->create, '', $misc) . "</li>";
-
+        echo html::a($link, "<i class='icon icon-plus'></i>" . $lang->task->create, '', $misc);
+        ?>
+        <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'>
+          <span class='caret'></span>
+        </button>
+        <ul class='dropdown-menu'>
+        <?php
         $misc = common::hasPriv('task', 'batchCreate') ? '' : "class=disabled";
         $link = common::hasPriv('task', 'batchCreate') ?  $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')) : '#';
         echo "<li>" . html::a($link, $lang->task->batchCreate, '', $misc) . "</li>";
diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css
index ab3f5b3a06..d52f755fbe 100644
--- a/module/testcase/css/browse.css
+++ b/module/testcase/css/browse.css
@@ -12,3 +12,5 @@
 .pl-5px{padding-left:5px;}
 #treebox{position:fixed;margin-left:20px;}
 .outer.hide-side #treebox{margin-left:0px;}
+
+#createActionMenu .btn{color: #fff!important; text-shadow: 0 -1px 0 rgba(0,0,0,.2)!important; background-color: #d2322d!important; border-color: #bd2d29!important;}
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 8b4fa7d0c9..be7d814c9f 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -79,17 +79,18 @@
       <?php common::printIcon('testcase', 'import', "productID=$productID&branch=$branch", '', 'button', '', '', 'export cboxElement iframe');?>
     </div>
     <div class='btn-group'>
-      <div class='btn-group'>
-        <button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
-          <i class='icon icon-plus'></i> <?php echo $lang->testcase->common;?>
+      <div class='btn-group' id='createActionMenu'>
+        <?php
+        $initModule = isset($moduleID) ? (int)$moduleID : 0;
+        $misc = common::hasPriv('testcase', 'create') ? "class='btn'" : "class='btn disabled'";
+        $link = common::hasPriv('testcase', 'create') ?  $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '#';
+        echo html::a($link, "<i class='icon-plus'></i>" . $lang->testcase->create, '', $misc);
+        ?>
+        <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'>
           <span class='caret'></span>
         </button>
-        <ul class='dropdown-menu' id='createCaseActionMenu'>
+        <ul class='dropdown-menu'>
         <?php 
-        $initModule = isset($moduleID) ? (int)$moduleID : 0;
-        $misc = common::hasPriv('testcase', 'create') ? '' : "class=disabled";
-        $link = common::hasPriv('testcase', 'create') ?  $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '#';
-        echo "<li>" . html::a($link, $lang->testcase->create, '', $misc) . "</li>";
         $misc = common::hasPriv('testcase', 'batchCreate') ? '' : "class=disabled";
         $link = common::hasPriv('testcase', 'batchCreate') ?  $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule") : '#';
         echo "<li>" . html::a($link, $lang->testcase->batchCreate, '', $misc) . "</li>";