From 39994fb21e7b55937b11bd3726dda7cf2f5b6c76 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 13:41:47 +0800
Subject: [PATCH]  * finish task#1684.

---
 module/bug/view/browse.html.php      |  4 +-
 module/testcase/lang/en.php          |  2 +-
 module/testcase/lang/zh-cn.php       |  2 +-
 module/testcase/view/browse.html.php | 59 +++++++++++++++++++++-------
 4 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index d3cc21beee..85b6143b6c 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -190,7 +190,7 @@ js::set('customed', $customed);
                   echo "</div>";
 
                   $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID");
-                  $misc       = common::hasPriv('task', 'batchEdit') ? "onclick=setFormAction('$actionLink')" : "disabled='disabled'";
+                  $misc       = common::hasPriv('bug', 'batchEdit') ? "onclick=setFormAction('$actionLink')" : "disabled='disabled'";
                   echo "<div class='groupButton dropButton'>";
                   echo html::commonButton($lang->edit, $misc);
                   echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
@@ -212,7 +212,7 @@ js::set('customed', $customed);
   <ul>
   <?php 
   $actionLink = $this->createLink('bug', 'batchResolve');
-  $misc = $canBatchClose ? "onclick=setFormAction('$actionLink')" : "class='disabled'";
+  $misc = common::hasPriv('bug', 'batchResolve') ? "onclick=setFormAction('$actionLink')" : "class='disabled'";
   echo "<li>" . html::a('#', $lang->bug->resolve, '', $misc) . "</li>";
   ?>
   </ul>
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 78d1723562..3c943d2679 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -65,7 +65,7 @@ $lang->testcase->import             = "Import";
 $lang->testcase->importID           = "Linenum";
 $lang->testcase->showImport         = "Show import";
 $lang->testcase->exportTemplet      = "Export templet";
-$lang->testcase->export             = "Export";
+$lang->testcase->export             = "Export data";
 $lang->testcase->confirmChange      = 'Confirm case change';
 $lang->testcase->confirmStoryChange = 'Confirm story change';
 
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 70ae7811fd..39c17a6ae9 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -65,7 +65,7 @@ $lang->testcase->import             = "导入";
 $lang->testcase->importID           = "行号";
 $lang->testcase->showImport         = "显示导入内容";
 $lang->testcase->exportTemplet      = "导出模板";
-$lang->testcase->export             = "导出";
+$lang->testcase->export             = "导出数据";
 $lang->testcase->confirmChange      = '确认用例变动';
 $lang->testcase->confirmStoryChange = '确认需求变动';
 
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index dbd74d7881..27ea34a6a3 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -15,6 +15,7 @@ include '../../common/view/header.html.php';
 include '../../common/view/datepicker.html.php';
 include '../../common/view/treeview.html.php';
 include '../../common/view/colorize.html.php';
+include '../../common/view/dropmenu.html.php';
 js::set('browseType', $browseType);
 js::set('moduleID'  , $moduleID);
 js::set('confirmDelete', $lang->testcase->confirmDelete);
@@ -29,13 +30,33 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
     ?>
   </div>
   <div class='f-right'>
-    <?php common::printIcon('testcase', 'import', "productID=$productID", '', 'button', '', '', 'export');?>
-    <?php common::printIcon('testcase', 'exportTemplet', "productID=$productID", '', 'button', 'export', '', 'export');?>
-    <?php if($browseType != 'needconfirm') common::printIcon('testcase', 'export', "productID=$productID&orderBy=$orderBy"); ?>
-    <?php common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID");?>
-    <?php common::printIcon('testcase', 'create', "productID=$productID&moduleID=$moduleID"); ?>
+    <?php 
+    common::printIcon('testcase', 'import', "productID=$productID", '', 'button', '', '', 'export');
+
+    echo '<span class="link-button dropButton">';
+    echo html::a("#", "&nbsp;", '', "id='exportAction' class='icon-green-common-export' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'");
+    echo html::a("#", $lang->export, '', "id='exportAction' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->export}'");
+    echo '</span>';
+
+    common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID");
+    common::printIcon('testcase', 'create', "productID=$productID&moduleID=$moduleID");
+    ?>
   </div>
 </div>
+<div id='exportActionMenu' class='listMenu hidden'>
+  <ul>
+  <?php 
+  $misc = common::hasPriv('testcase', 'export') ? "class='export'" : "class=disabled";
+  $link = common::hasPriv('testcase', 'export') ?  $this->createLink('testcase', 'export', "productID=$productID&orderBy=$orderBy") : '#';
+  echo "<li>" . html::a($link, $lang->testcase->export, '', $misc) . "</li>";
+
+  $misc = common::hasPriv('testcase', 'exportTemplet') ? "class='export'" : "class=disabled";
+  $link = common::hasPriv('testcase', 'exportTemplet') ?  $this->createLink('testcase', 'exportTemplet', "productID=$productID") : '#';
+  echo "<li>" . html::a($link, $lang->testcase->exportTemplet, '', $misc) . "</li>";
+  ?>
+  </ul>
+</div>
+
 <div id='querybox' class='<?php if($browseType != 'bysearch') echo 'hidden';?>'></div>
 <div class='treeSlider'><span>&nbsp;</span></div>
 <form id='batchForm' method='post'>
@@ -73,17 +94,11 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
             <th class='w-150px {sorter:false}'><?php echo $lang->actions;?></th>
             <?php endif;?>
           </tr>
-          <?php
-          $canBatchEdit = common::hasPriv('testcase', 'batchEdit');
-          $canBatchRun  = common::hasPriv('testtask', 'batchRun');
-          ?>
           <?php foreach($cases as $case):?>
           <tr class='a-center'>
             <?php $viewLink = inlink('view', "caseID=$case->id");?>
             <td>
-              <?php if($canBatchEdit or $canBatchRun):?>
               <input type='checkbox' name='caseIDList[]'  value='<?php echo $case->id;?>'/> 
-              <?php endif;?>
               <?php echo html::a($viewLink, sprintf('%03d', $case->id));?>
             </td>
             <td><span class='<?php echo 'pri' . $case->pri?>'><?php echo $case->pri?></span></td>
@@ -122,9 +137,14 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
              <?php if($cases):?>
              <div class='f-left'>
              <?php
-             if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse(); 
-             if($canBatchEdit) echo html::submitButton($lang->edit, "onclick='setFormAction(\"" . inLink('batchEdit', "productID=$productID") . "\")'");
-             if($canBatchRun) echo html::submitButton($lang->testtask->runCase,  "onclick='setFormAction(\"" . $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy") . "\")'");
+             echo "<div class='groupButton'>" . html::selectAll() . html::selectReverse() . "</div>"; 
+
+             $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID");
+             $misc       = common::hasPriv('testcase', 'batchEdit') ? "onclick=setFormAction('$actionLink')" : "disabled='disabled'";
+             echo "<div class='groupButton dropButton'>";
+             echo html::commonButton($lang->edit, $misc);
+             echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
+             echo "</div>";
              ?>
              </div>
              <?php endif?>
@@ -137,4 +157,15 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
   </tr>              
 </table>              
 </form>
+
+<div id='moreActionMenu' class='listMenu hidden'>
+  <ul>
+  <?php 
+  $actionLink = $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy");
+  $misc = common::hasPriv('testtask', 'batchRun') ? "onclick=setFormAction('$actionLink')" : "class='disabled'";
+  echo "<li>" . html::a('#', $lang->testtask->runCase, '', $misc) . "</li>";
+  ?>
+  </ul>
+</div>
+
 <?php include '../../common/view/footer.html.php';?>