From c72a51076fd2a817dbde5159229cb4d8ec5ab3b1 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 15 Nov 2016 13:10:39 +0800
Subject: [PATCH]  * finish task #2696.

---
 module/bug/view/browse.html.php          | 36 ++++++++++++++++--------
 module/product/view/browse.html.php      | 36 ++++++++++++++++--------
 module/project/view/taskheader.html.php  | 21 +++++++++++---
 module/testcase/view/caseheader.html.php | 27 +++++++++++++-----
 4 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 0898151e53..5af222fd7c 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -62,18 +62,30 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
       </div>
     </div>
     <div class='btn-group'>
-      <?php
-      common::printIcon('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID");
-      if(commonModel::isTutorialMode())
-      {
-          $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
-          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
-      {
-          common::printIcon('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", 'btn', 'button', 'plus', '', 'btn-bug-create');
-      }
-      ?>
+      <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->bug->common;?>
+          <span class='caret'></span>
+        </button>
+        <ul class='dropdown-menu' id='createBugActionMenu'>
+        <?php 
+        if(commonModel::isTutorialMode())
+        {
+            $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
+            echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams"), $lang->bug->create);
+        }
+        else
+        {
+            $misc = common::hasPriv('bug', 'create') ? '' : "class=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>";
+        }
+        $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>";
+        ?>
+        </ul>
+      </div>
     </div>
   </div>
   <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index c96fc9a092..62e8f8b693 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -56,18 +56,30 @@
         <?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", '', 'button', 'bar-chart'); ?>
     </div>
     <div class='btn-group'>
-    <?php 
-    common::printIcon('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID", '', 'button', 'plus-sign');
-    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='icon-plus'></i> {$lang->story->create}",'', "class='btn create-story-btn'");
-    }
-    else
-    {
-        common::printIcon('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID", 'btn', 'button', 'plus', '', 'create-story-btn');
-    }
-    ?>
+      <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->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>
   </div>
   <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 119c999d62..22964e4fac 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -121,10 +121,23 @@
       </div>
     </div>
     <div class='btn-group'>
-    <?php
-    common::printIcon('task', 'batchCreate', "projectID=$projectID");
-    common::printIcon('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''), '', 'button', 'sitemap');
-    ?>
+      <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'>
+        <?php 
+        $misc = common::hasPriv('task', 'create') ? '' : "class=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>";
+
+        $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>";
+        ?>
+        </ul>
+      </div>
     </div>
   </div>
   <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 173126ebd7..8b4fa7d0c9 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -76,13 +76,26 @@
         ?>
         </ul>
       </div>
-      <?php 
-      common::printIcon('testcase', 'import', "productID=$productID&branch=$branch", '', 'button', '', '', 'export cboxElement iframe');
-
-      $initModule = isset($moduleID) ? (int)$moduleID : 0;
-      common::printIcon('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule");
-      common::printIcon('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule");
-      ?>
+      <?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;?>
+          <span class='caret'></span>
+        </button>
+        <ul class='dropdown-menu' id='createCaseActionMenu'>
+        <?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>";
+        ?>
+        </ul>
+      </div>
     </div>
   </div>
   <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>