From 7983d567db618190006ee7a205db8c36544e7af1 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 09:24:56 +0800
Subject: [PATCH 01/10]  * code for task#1678.

---
 www/js/my.full.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index 19193fc2bb..af06c77518 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -300,12 +300,14 @@ function toggleTreeBox()
         function()
         {
             $('.side').hide()
+            $('.divider').hide()
             $('.treeSlider span').css("border-right", "0 none");
             $('.treeSlider span').css("border-left", "4px solid #000000");
         }, 
         function()
         {
             $('.side').show()
+            $('.divider').show()
             $('.treeSlider span').css("border-right", "4px solid #000000");
             $('.treeSlider span').css("border-left", "0 none");
         }

From df52457ceff5bedb9a20adb35c3d07c4f5e9697c Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 09:34:52 +0800
Subject: [PATCH 02/10]  * code for task#1678.

---
 module/common/view/action.html.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php
index 36500a98bf..cd2f2c0e57 100755
--- a/module/common/view/action.html.php
+++ b/module/common/view/action.html.php
@@ -132,14 +132,14 @@ $(function(){
         <?php $this->action->printAction($action);?>
         <?php if(!empty($action->history)) echo "<span id='switchButton$i' class='hand change-show' onclick=switchChange($i)>&nbsp;</span>";?>
       </span>
-      <?php if($canEditComment):?>
-      <span class='link-button f-right comment<?php echo $action->id;?>'><?php echo html::a('#lastCommentBox', '&nbsp;', '', "class='icon-green-common-edit' onclick='toggleComment($action->id)'")?></span>
-      <?php endif;?>
       <?php if(!empty($action->comment) or !empty($action->history)):?>
       <?php if(!empty($action->comment)) echo "<div class='history'>";?>
         <div class='changes hidden' id='changeBox<?php echo $i;?>'>
         <?php echo $this->action->printChanges($action->objectType, $action->history);?>
         </div>
+        <?php if($canEditComment):?>
+        <span class='link-button f-right comment<?php echo $action->id;?>'><?php echo html::a('#lastCommentBox', '&nbsp;', '', "class='icon-green-common-edit' onclick='toggleComment($action->id)'")?></span>
+        <?php endif;?>
         <?php 
         if($action->comment) 
         {
@@ -148,7 +148,6 @@ $(function(){
             echo "</div>";
         }
         ?>
-
         <?php if($canEditComment):?>
         <div class='hidden' id='lastCommentBox'>
           <form method='post' action='<?php echo $this->createLink('action', 'editComment', "actionID=$action->id")?>'>

From e4d27b3a67ece0d5e8953d6aa22dfb12ed632ce9 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 09:56:43 +0800
Subject: [PATCH 03/10]  * code for task#1678.  * remove the byModule link.

---
 module/bug/control.php               | 31 ++++++++++++++--------------
 module/bug/js/browse.js              | 10 ---------
 module/bug/view/browse.html.php      |  7 +++----
 module/product/control.php           |  3 +--
 module/product/js/browse.js          | 10 ---------
 module/product/view/browse.html.php  | 11 ++++------
 module/testcase/control.php          |  3 +--
 module/testcase/js/browse.js         | 11 ----------
 module/testcase/view/browse.html.php |  5 ++---
 9 files changed, 26 insertions(+), 65 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 498efd42d6..7f149238da 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -61,7 +61,7 @@ class bug extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $browseType = 'byModule', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $browseType = 'all', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Set browseType, productID, moduleID and queryID. */
         $browseType = strtolower($browseType);
@@ -148,21 +148,20 @@ class bug extends control
         $position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
         $position[] = $this->lang->bug->common;
 
-        $this->view->title       = $title;
-        $this->view->position    = $position;
-        $this->view->productID   = $productID;
-        $this->view->productName = $this->products[$productID];
-        $this->view->moduleTree  = $this->tree->getTreeMenu($productID, $viewType = 'bug', $startModuleID = 0, array('treeModel', 'createBugLink'));
-        $this->view->browseType  = $browseType;
-        $this->view->bugs        = $bugs;
-        $this->view->users       = $users;
-        $this->view->pager       = $pager;
-        $this->view->param       = $param;
-        $this->view->orderBy     = $orderBy;
-        $this->view->moduleID    = $moduleID;
-        $this->view->customed    = $customed;
-        $this->view->customFields= explode(',', str_replace(' ', '', trim($customFields)));
-        $this->view->treeClass   = $browseType == 'bymodule' ? '' : 'hidden';
+        $this->view->title        = $title;
+        $this->view->position     = $position;
+        $this->view->productID    = $productID;
+        $this->view->productName  = $this->products[$productID];
+        $this->view->moduleTree   = $this->tree->getTreeMenu($productID, $viewType = 'bug', $startModuleID = 0, array('treeModel', 'createBugLink'));
+        $this->view->browseType   = $browseType;
+        $this->view->bugs         = $bugs;
+        $this->view->users        = $users;
+        $this->view->pager        = $pager;
+        $this->view->param        = $param;
+        $this->view->orderBy      = $orderBy;
+        $this->view->moduleID     = $moduleID;
+        $this->view->customed     = $customed;
+        $this->view->customFields = explode(',', str_replace(' ', '', trim($customFields)));
 
         $this->display();
     }
diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js
index 55f6788f5d..f2938ef993 100644
--- a/module/bug/js/browse.js
+++ b/module/bug/js/browse.js
@@ -1,13 +1,3 @@
-/* Browse by module. */
-function browseByModule(active)
-{
-    $('#treebox').removeClass('hidden');
-    $('.divider').removeClass('hidden');
-    $('#bymoduleTab').addClass('active');
-    $('#querybox').addClass('hidden');
-    $('#' + active + 'Tab').removeClass('active');
-}
-
 $(document).ready(function()
 {
     $("a.customFields").colorbox({width:540, height:340, iframe:true, transition:'none'});
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index b0ef9656cd..6bfcbf055f 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -22,7 +22,7 @@ js::set('customed', $customed);
 <div id='featurebar'>
   <div class='f-left'>
     <?php
-    echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->bug->moduleBugs . "</a></span> ";
+    echo "<span id='allTab'>"           . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . "</span>";
     echo "<span id='assigntomeTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToMe&param=0"),    $lang->bug->assignToMe)    . "</span>";
     echo "<span id='openedbymeTab'>"    . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=openedByMe&param=0"),    $lang->bug->openedByMe)    . "</span>";
     echo "<span id='resolvedbymeTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe&param=0"),  $lang->bug->resolvedByMe)  . "</span>";
@@ -31,7 +31,6 @@ js::set('customed', $customed);
     echo "<span id='unclosedTab'>"      . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unclosed&param=0"),      $lang->bug->unclosed)      . "</span>";
     echo "<span id='longlifebugsTab'>"  . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs&param=0"),  $lang->bug->longLifeBugs)  . "</span>";
     echo "<span id='postponedbugsTab'>" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs&param=0"), $lang->bug->postponedBugs) . "</span>";
-    echo "<span id='allTab'>"           . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . "</span>";
     echo "<span id='needconfirmTab'>"   . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->bug->needConfirm) . "</span>";
     echo "<span id='bysearchTab'><a href='#'><span class='icon-search'></span>{$lang->bug->byQuery}</a></span> ";
     ?>
@@ -61,7 +60,7 @@ js::set('customed', $customed);
 <form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
   <table class='cont-lt1'>
     <tr valign='top'>
-      <td class='side <?php echo $treeClass;?>' id='treebox'>
+      <td class='side' id='treebox'>
         <div class='box-title'><?php echo $productName;?></div>
         <div class='box-content'>
           <?php echo $moduleTree;?>
@@ -71,7 +70,7 @@ js::set('customed', $customed);
           </div>
         </div>
       </td>
-      <td class='divider <?php echo $treeClass;?>'></td>
+      <td class='divider'></td>
       <td>
         <table class='table-1 fixed colored tablesorter datatable' id='bugList'>
           <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
diff --git a/module/product/control.php b/module/product/control.php
index 6863eee4e9..9ba407d28c 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -93,7 +93,7 @@ class product extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $browseType = 'byModule', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $browseType = 'allStory', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Lower browse type. */
         $browseType = strtolower($browseType);
@@ -162,7 +162,6 @@ class product extends control
         $this->view->orderBy       = $orderBy;
         $this->view->browseType    = $browseType;
         $this->view->moduleID      = $moduleID;
-        $this->view->treeClass     = $browseType == 'bymodule' ? '' : 'hidden';
         $this->display();
     }
 
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index 5fe0cf9db2..d86a5b0aae 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -1,13 +1,3 @@
-/* Browse by module. */
-function browseByModule()
-{
-    $('#treebox').removeClass('hidden');
-    $('.divider').removeClass('hidden');
-    $('#querybox').addClass('hidden');
-    $('#featurebar .active').removeClass('active');
-    $('#bymoduleTab').addClass('active');
-}
-
 /**
  * Change form action.
  * 
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index a615f6926b..ee1fe9bacb 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -14,12 +14,10 @@
 <?php include '../../common/view/treeview.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
 <?php include '../../common/view/dropmenu.html.php';?>
-<script language='Javascript'>
-var browseType = '<?php echo $browseType;?>';
-</script>
+<?php js::set('browseType', $browseType);?>
 <div id='featurebar'>
   <div class='f-left'>
-    <span id='bymoduleTab' onclick='browseByModule()'><?php echo html::a($this->inlink('browse',"productID=$productID"), $lang->product->moduleStory);?></span>
+    <span id='allstoryTab'>     <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=allStory"),     $lang->product->allStory);?></span>
     <span id='assignedtomeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=assignedtome"), $lang->product->assignedToMe);?></span>
     <span id='openedbymeTab'>   <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=openedByMe"),   $lang->product->openedByMe);?></span>
     <span id='reviewedbymeTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=reviewedByMe"), $lang->product->reviewedByMe);?></span>
@@ -28,7 +26,6 @@ var browseType = '<?php echo $browseType;?>';
     <span id='activestoryTab'>  <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=activeStory"),  $lang->product->activeStory);?></span>
     <span id='changedstoryTab'> <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=changedStory"), $lang->product->changedStory);?></span>
     <span id='closedstoryTab'>  <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=closedStory"),  $lang->product->closedStory);?></span>
-    <span id='allstoryTab'>     <?php echo html::a($this->inlink('browse', "productID=$productID&browseType=allStory"),     $lang->product->allStory);?></span>
     <span id='bysearchTab' ><a href='#'><span class='icon-search'></span><?php echo $lang->product->searchStory;?></a></span>
   </div>
   <div class='f-right'>
@@ -44,7 +41,7 @@ var browseType = '<?php echo $browseType;?>';
 <form method='post' id='productStoryForm'>
   <table class='cont-lt1'>
     <tr valign='top'>
-      <td class='side <?php echo $treeClass;?>' id='treebox'>
+      <td class='side' id='treebox'>
         <div class='box-title'><?php echo $productName;?></div>
         <div class='box-content'>
           <?php echo $moduleTree;?>
@@ -54,7 +51,7 @@ var browseType = '<?php echo $browseType;?>';
           </div>
         </div>
       </td>
-      <td class='divider <?php echo $treeClass;?>'></td>
+      <td class='divider'></td>
       <td>
         <table class='table-1 fixed colored tablesorter datatable' id='storyList'>
           <thead>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index c472c3d706..b9cddebc7b 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -52,7 +52,7 @@ class testcase extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $browseType = 'byModule', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Set browseType, productID, moduleID and queryID. */
         $browseType = strtolower($browseType);
@@ -154,7 +154,6 @@ class testcase extends control
         $this->view->orderBy       = $orderBy;
         $this->view->browseType    = $browseType;
         $this->view->param         = $param;
-        $this->view->treeClass     = $browseType == 'bymodule' ? '' : 'hidden';
 
         $this->display();
     }
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index 4501bab2e9..ba3a3a48d8 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -1,14 +1,3 @@
-/* Switch to module browse. */
-function browseByModule(active)
-{
-    $('.side').removeClass('hidden');
-    $('.divider').removeClass('hidden');
-    $('#bymoduleTab').addClass('active');
-    $('#' + active + 'Tab').removeClass('active');
-    $('#bysearchTab').removeClass('active');
-    $('#querybox').addClass('hidden');
-}
-
 /* Swtich to search module. */
 function browseBySearch(active)
 {
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 6f380c7568..a533919a97 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -23,7 +23,6 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
 <div id='featurebar'>
   <div class='f-left'>
     <?php
-    echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->testcase->moduleCases . "</a></span> ";
     echo "<span id='allTab'>"         . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=all&param=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->testcase->allCases) . "</span>";
     echo "<span id='needconfirmTab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&browseType=needconfirm&param=0"), $lang->testcase->needConfirm) . "</span>";
     echo "<span id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#'><span class='icon-search'></span>{$lang->testcase->bySearch}</a></span> ";
@@ -42,7 +41,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
 <form id='batchForm' method='post'>
 <table class='cont-lt1'>
   <tr valign='top'>
-    <td class='side <?php echo $treeClass;?>'>
+    <td class='side'>
       <div class='box-title'><?php echo $productName;?></div>
       <div class='box-content'>
         <?php echo $moduleTree;?>
@@ -52,7 +51,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
         </div>
       </div>
     </td>
-    <td class='divider <?php echo $treeClass;?>'></td>
+    <td class='divider'></td>
     <td>
       <table class='table-1 colored tablesorter datatable fixed' id='caseList'>
         <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>

From 43c38fc552bc29dd87d94c45e871b63fed2303bc Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 10:22:50 +0800
Subject: [PATCH 04/10]  * add disabled the has no authority of
 project-importTask and  * project-importBug.

---
 module/project/view/taskheader.html.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 826209656c..29d8263d21 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -38,8 +38,13 @@
 <div id='importActionMenu' class='listMenu hidden'>
   <ul>
   <?php 
-  echo "<li>" . html::a($this->createLink('project', 'importTask', "project=$project->id"), $lang->project->importTask) . "</li>";
-  echo "<li>" . html::a($this->createLink('project', 'importBug', "projectID=$project->id"), $lang->project->importBug) . "</li>";
+  $misc = common::hasPriv('project', 'importTask') ? '' : "class=disabled";
+  $link = common::hasPriv('project', 'importTask') ?  $this->createLink('project', 'importTask', "project=$project->id") : '#';
+  echo "<li>" . html::a($link, $lang->project->importTask, '', $misc) . "</li>";
+
+  $misc = common::hasPriv('project', 'importBug') ? '' : "class=disabled";
+  $link = common::hasPriv('project', 'importBug') ?  $this->createLink('project', 'importTask', "project=$project->id") : '#';
+  echo "<li>" . html::a($link, $lang->project->importBug, '', $misc) . "</li>";
   ?>
   </ul>
 </div>

From a087704212dda33ad234bc17733ef9272389d7f9 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 11:13:15 +0800
Subject: [PATCH 05/10]  * finish task#1683.

---
 module/bug/lang/zh-cn.php               |  2 +-
 module/bug/view/browse.html.php         | 48 ++++++++++++++++++++-----
 module/project/view/task.html.php       |  4 +--
 module/project/view/taskheader.html.php | 16 ++++++++-
 module/task/lang/en.php                 |  2 +-
 module/task/lang/zh-cn.php              |  2 +-
 www/js/my.full.js                       | 14 ++++++++
 7 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 2c0a2c4f11..d057612796 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -82,7 +82,7 @@ $lang->bug->resolve            = '解决';
 $lang->bug->close              = '关闭';
 $lang->bug->activate           = '激活';
 $lang->bug->reportChart        = '报表统计';
-$lang->bug->export             = '导出';
+$lang->bug->export             = '导出数据';
 $lang->bug->delete             = '删除';
 $lang->bug->saveTemplate       = '保存模板';
 $lang->bug->deleteTemplate     = '删除模板';
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 6bfcbf055f..d3cc21beee 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -14,6 +14,7 @@
 include '../../common/view/header.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('customed', $customed);
@@ -37,14 +38,29 @@ js::set('customed', $customed);
   </div>
   <div class='f-right'>
     <?php
+
+    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('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");
-    if($browseType != 'needconfirm') common::printIcon('bug', 'export', "productID=$productID&orderBy=$orderBy");
     common::printIcon('bug', 'customFields');
     common::printIcon('bug', 'batchCreate', "productID=$productID&projectID=0&moduleID=$moduleID");
     common::printIcon('bug', 'create', "productID=$productID&extra=moduleID=$moduleID");
     ?>
   </div>
 </div>
+<div id='exportActionMenu' class='listMenu hidden'>
+  <ul>
+  <?php 
+  $misc = common::hasPriv('bug', 'export') ? "class='export'" : "class=disabled";
+  $link = common::hasPriv('bug', 'export') ?  $this->createLink('bug', 'export', "productID=$productID&orderBy=$orderBy") : '#';
+  echo "<li>" . html::a($link, $lang->bug->export, '', $misc) . "</li>";
+  ?>
+  </ul>
+</div>
+
 <div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'></div>
 
 <?php 
@@ -57,7 +73,7 @@ js::set('customed', $customed);
 ?>
 
 <div class='treeSlider'><span>&nbsp;</span></div>
-<form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>'>
+<form method='post'>
   <table class='cont-lt1'>
     <tr valign='top'>
       <td class='side' id='treebox'>
@@ -109,14 +125,11 @@ js::set('customed', $customed);
           </tr>
           </thead>
           <tbody>
-          <?php $canBatchEdit = common::hasPriv('bug', 'batchEdit');?>
           <?php foreach($bugs as $bug):?>
           <?php $bugLink = inlink('view', "bugID=$bug->id");?>
           <tr class='a-center'>
             <td class='<?php echo $bug->status;?>' style="font-weight:bold">
-              <?php if($canBatchEdit):?>
               <input type='checkbox' name='bugIDList[]'  value='<?php echo $bug->id;?>'/> 
-              <?php endif;?>
               <?php echo html::a($bugLink, sprintf('%03d', $bug->id));?>
             </td>
             <td><span class='<?php echo 'severity' . $bug->severity;?>'><?php echo $bug->severity;?></span></td>
@@ -169,11 +182,19 @@ js::set('customed', $customed);
               if($browseType == 'needconfirm') $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 7 : 6; 
               ?>
               <td colspan='<?php echo $columns;?>'>
-                <?php if(!empty($bugs) and $canBatchEdit):?>
+                <?php if(!empty($bugs)):?>
                 <div class='f-left'>
                   <?php 
-                  echo html::selectAll() . html::selectReverse(); 
-                  echo html::submitButton($lang->edit);
+                  echo "<div class='groupButton'>";
+                  echo html::selectAll() . html::selectReverse();
+                  echo "</div>";
+
+                  $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID");
+                  $misc       = common::hasPriv('task', '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?>
@@ -186,4 +207,15 @@ js::set('customed', $customed);
     </tr>
   </table>  
 </form>
+
+<div id='moreActionMenu' class='listMenu hidden'>
+  <ul>
+  <?php 
+  $actionLink = $this->createLink('bug', 'batchResolve');
+  $misc = $canBatchClose ? "onclick=setFormAction('$actionLink')" : "class='disabled'";
+  echo "<li>" . html::a('#', $lang->bug->resolve, '', $misc) . "</li>";
+  ?>
+  </ul>
+</div>
+
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 34465ac24f..72718de8ec 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -150,9 +150,9 @@ var browseType  = '<?php echo $browseType;?>';
                   echo "</div>";
 
                   $actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID");
-                  $misc       = $canBatchEdit ? "onclick=changeAction('$actionLink')" : "disabled='disabled'";
+                  $misc       = $canBatchEdit ? "onclick=changeAction('projectTaskForm','batchEdit','$actionLink')" : "disabled='disabled'";
                   echo "<div class='groupButton dropButton'>";
-                  echo html::commonButton($lang->edit, "onclick=\"changeAction('projectTaskForm', 'batchEdit', '$actionLink')\" $misc");
+                  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>";
               }
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 29d8263d21..b5190ad469 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -22,7 +22,11 @@
     if(!isset($browseType)) $browseType = '';
     if(!isset($orderBy))    $orderBy = '';
     common::printIcon('task', 'report', "project=$projectID&browseType=$browseType");
-    if($browseType != 'needconfirm') common::printIcon('task', 'export', "projectID=$projectID&orderBy=$orderBy");
+
+    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>';
 
     echo '<span class="link-button dropButton">';
     echo html::a("#", "&nbsp;", '', "id='importAction' class='icon-green-task-import' onclick=toggleSubMenu(this.id,'bottom',0) title='{$lang->import}'");
@@ -35,6 +39,16 @@
   </div>
 </div>
 
+<div id='exportActionMenu' class='listMenu hidden'>
+  <ul>
+  <?php 
+  $misc = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
+  $link = common::hasPriv('task', 'export') ?  $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy") : '#';
+  echo "<li>" . html::a($link, $lang->task->export, '', $misc) . "</li>";
+  ?>
+  </ul>
+</div>
+
 <div id='importActionMenu' class='listMenu hidden'>
   <ul>
   <?php 
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 2c3885ae64..c605ae0175 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -25,7 +25,7 @@ $lang->task->close              = "Close";
 $lang->task->batchClose         = "Batch close";
 $lang->task->cancel             = "Cancel";
 $lang->task->activate           = "Activate";
-$lang->task->export             = "Export";
+$lang->task->export             = "Export data";
 $lang->task->reportChart        = "Report chart";
 $lang->task->fromBug            = 'From Bug';
 $lang->task->confirmStoryChange = "Confirm story change";
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 3f33fb0d34..07f4ba8d20 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -25,7 +25,7 @@ $lang->task->close              = "关闭";
 $lang->task->batchClose         = "批量关闭";
 $lang->task->cancel             = "取消";
 $lang->task->activate           = "激活";
-$lang->task->export             = "导出";
+$lang->task->export             = "导出数据";
 $lang->task->reportChart        = "报表统计";
 $lang->task->fromBug            = '来源Bug';
 $lang->task->confirmStoryChange = "确认需求变动";
diff --git a/www/js/my.full.js b/www/js/my.full.js
index af06c77518..7c102ff032 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -464,6 +464,20 @@ function setForm()
     });
 }
 
+/**
+ * Set form action and submit.
+ * 
+ * @param  url    $actionLink 
+ * @param  string $hiddenwin 'hiddenwin'
+ * @access public
+ * @return void
+ */
+function setFormAction(actionLink, hiddenwin)
+{
+  if(hiddenwin) $('form').attr('target', hiddenwin);
+  $('form').attr('action', actionLink).submit();
+}
+
 /**
  * Set the max with of image.
  * 

From 3b74f6ad70bbb10c562eb7466c11d8ac28165b90 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 11:39:58 +0800
Subject: [PATCH 06/10]  * finish task#1686.

---
 module/my/js/common.js               |  6 -----
 module/my/js/todo.js                 | 15 -------------
 module/my/view/story.html.php        |  4 ++--
 module/my/view/task.html.php         |  4 ++--
 module/my/view/testcase.html.php     |  4 ++--
 module/my/view/todo.html.php         |  6 ++---
 module/product/js/browse.js          | 14 ------------
 module/product/view/browse.html.php  | 12 +++++-----
 module/project/js/story.js           | 14 ------------
 module/project/js/task.js            |  5 -----
 module/project/view/story.html.php   |  4 ++--
 module/project/view/task.html.php    |  4 ++--
 module/testcase/js/browse.js         |  5 -----
 module/testcase/view/browse.html.php |  4 ++--
 module/testtask/js/cases.js          |  5 -----
 module/testtask/view/cases.html.php  | 33 ++++++++++++++++------------
 16 files changed, 40 insertions(+), 99 deletions(-)

diff --git a/module/my/js/common.js b/module/my/js/common.js
index 5be5272b2d..65ecb791b2 100644
--- a/module/my/js/common.js
+++ b/module/my/js/common.js
@@ -2,9 +2,3 @@ $(function()
 { 
     if(typeof(listName) != 'undefined') setModal4List('iframe', listName, function(){$(".colorbox").colorbox({width:960, height:550, iframe:true, transition:'none'});});
 });
-
-function changeAction(formName, actionName, actionLink)
-{
-    if(formName =='myTaskForm' && actionName == 'batchClose') $('#' + formName).attr('target', 'hiddenwin');
-    $('#' + formName).attr('action', actionLink).submit();
-}
diff --git a/module/my/js/todo.js b/module/my/js/todo.js
index a3a789eb21..560727ea2b 100644
--- a/module/my/js/todo.js
+++ b/module/my/js/todo.js
@@ -5,19 +5,4 @@ function changeDate(date)
     location.href=link;
 }
 
-/**
- * Change form action.
- * 
- * @param  formName   $formName 
- * @param  actionName $actionName 
- * @param  actionLink $actionLink 
- * @access public
- * @return void
- */
-function changeAction(formName, actionName, actionLink)
-{
-    if(actionName == 'batchFinish') $('#' + formName).attr('target', 'hiddenwin');
-    $('#' + formName).attr('action', actionLink).submit();
-}
-
 $(".colorbox").colorbox({width:960, height:550, iframe:true, transition:'none'});
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 2375a5e64b..22e49befd8 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -85,12 +85,12 @@
           if($canBatchEdit)
           {
               $actionLink = $this->createLink('story', 'batchEdit');
-              echo html::commonButton($lang->edit, "onclick=\"changeAction('myStoryForm', 'batchEdit', '$actionLink')\"");
+              echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
           }
           if($canBatchClose)
           {
               $actionLink = $this->createLink('story', 'batchClose');
-              echo html::commonButton($lang->close, "onclick=\"changeAction('myStoryForm', 'batchClose', '$actionLink')\"");
+              echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink')\"");
           }
       }
       ?>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 06b02715a9..c208ab29da 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -83,12 +83,12 @@
         if($canBatchEdit)
         {
             $actionLink = $this->createLink('task', 'batchEdit', "projectID=0&orderBy=$orderBy");
-            echo html::commonButton($lang->edit, "onclick=\"changeAction('myTaskForm', 'batchEdit', '$actionLink')\"");
+            echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
         }
         if($canBatchClose)
         {
             $actionLink = $this->createLink('task', 'batchClose');
-            echo html::commonButton($lang->close, "onclick=\"changeAction('myTaskForm', 'batchClose', '$actionLink')\"");
+            echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
         }
          ?>
         </div> 
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index ca7a21ee59..e80d2736a2 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -89,12 +89,12 @@
           if($canBatchEdit) 
           {
               $actionLink = $this->createLink('testcase', 'batchEdit');
-              echo html::submitButton($lang->edit, "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
+              echo html::submitButton($lang->edit, "onclick=setFormAction('$actionLink')");
           }
           if($canBatchRun) 
           {
               $actionLink = $this->createLink('testtask', 'batchRun', "productID=0&orderBy=$orderBy&from=testcase");
-              echo html::submitButton($lang->testtask->runCase,  "onclick=changeAction('myCaseForm','batchEdit','$actionLink')");
+              echo html::submitButton($lang->testtask->runCase,  "onclick=setFormAction('$actionLink')");
           }
           ?>
           </div>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 20b7f9dfd7..d218a8aa13 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -104,19 +104,19 @@
         if(common::hasPriv('todo', 'batchEdit'))
         {
             $actionLink = $this->createLink('todo', 'batchEdit', "from=myTodo&type=$type&account=$account&status=$status");
-            echo html::commonButton($lang->edit, "onclick=\"changeAction('todoform', 'batchEdit', '$actionLink')\"");
+            echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
 
         }
         if(common::hasPriv('todo', 'batchFinish'))
         {
             $actionLink = $this->createLink('todo', 'batchFinish');
-            echo html::commonButton($lang->todo->finish, "onclick=\"changeAction('todoform', 'batchFinish', '$actionLink')\"");
+            echo html::commonButton($lang->todo->finish, "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
 
         }
         if(common::hasPriv('todo', 'import2Today') and $importFuture)
         {
             $actionLink = $this->createLink('todo', 'import2Today');
-            echo html::commonButton($lang->todo->import, "onclick=\"changeAction('todoform', 'import2Today', '$actionLink')\"");
+            echo html::commonButton($lang->todo->import, "onclick=\"setFormAction('$actionLink')\"");
             echo html::input('date', date('Y-m-d'), "class='date w-80px'");
         }
         ?>
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index d86a5b0aae..55a80528c5 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -1,17 +1,3 @@
-/**
- * Change form action.
- * 
- * @param  url  $actionLink 
- * @param  bool $hiddenwin 
- * @access public
- * @return void
- */
-function changeAction(actionLink, hiddenwin)
-{
-    if(hiddenwin) $('form').attr('target', 'hiddenwin');
-    $('form').attr('action', actionLink).submit();
-}
-
 $(function()
 {
     if(browseType == 'bysearch') ajaxGetSearchForm();
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index ee1fe9bacb..8d367bd724 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -119,7 +119,7 @@
                   $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=0");
 
                   echo "<div class='groupButton dropButton'>";
-                  echo html::commonButton($lang->edit, "onclick=\"changeAction('$actionLink')\" $disabled");
+                  echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\" $disabled");
                   echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
                   echo "</div>";
               }
@@ -140,7 +140,7 @@
 
           $canBatchClose = common::hasPriv('story', 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory';
           $actionLink    = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0");
-          $misc = $canBatchClose ? "onclick=changeAction('$actionLink')" : $class;
+          $misc = $canBatchClose ? "onclick=setFormAction('$actionLink')" : $class;
           echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
 
           $misc = common::hasPriv('story', 'batchReview') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='reviewItem'" : $class;
@@ -170,7 +170,7 @@
               }
               else
               {
-                  echo html::a('#', $result, '', "onclick=\"changeAction('$actionLink',true)\"");
+                  echo html::a('#', $result, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
               }
               echo "</li>";
           }
@@ -189,7 +189,7 @@
           {
               $actionLink = $this->createLink('story', 'batchReview', "result=reject&reason=$key");
               echo "<li>";
-              echo html::a('#', $reason, '', "onclick=\"changeAction('$actionLink',true)\"");
+              echo html::a('#', $reason, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
               echo "</li>";
           }
           ?>
@@ -204,7 +204,7 @@
           foreach($plans as $planID => $plan)
           {
               $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID");
-              echo "<li>" . html::a('#', $plan, '', "onclick=\"changeAction('$actionLink',true)\"") . "</li>";
+              echo "<li>" . html::a('#', $plan, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
           }
           ?>
           </ul>
@@ -217,7 +217,7 @@
           foreach($lang->story->stageList as $key => $stage)
           {
               $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key");
-              echo "<li>" . html::a('#', $stage, '', "onclick=\"changeAction('$actionLink',true)\"") . "</li>";
+              echo "<li>" . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
           }
           ?>
           </ul>
diff --git a/module/project/js/story.js b/module/project/js/story.js
index 3eee9acf9b..bf4d0687b5 100644
--- a/module/project/js/story.js
+++ b/module/project/js/story.js
@@ -2,17 +2,3 @@ $(document).ready(function()
 {
     $("a.iframe").colorbox({width:640, height:480, iframe:true, transition:'none'});
 });
-
-/**
- * Change form action.
- * 
- * @param  formName   $formName 
- * @param  actionName $actionName 
- * @param  actionLink $actionLink 
- * @access public
- * @return void
- */
-function changeAction(formName, actionName, actionLink)
-{
-    $('#' + formName).attr('action', actionLink).submit();
-}
diff --git a/module/project/js/task.js b/module/project/js/task.js
index f2cb074c39..b0367af308 100644
--- a/module/project/js/task.js
+++ b/module/project/js/task.js
@@ -4,10 +4,5 @@ $(function()
     if(browseType == 'bysearch') ajaxGetSearchForm();
 });
 
-function changeAction(formName, actionName, actionLink)
-{
-    if(actionName == 'batchClose') $('#' + formName).attr('target', 'hiddenwin');
-    $('#' + formName).attr('action', actionLink).submit();
-}
 $('#module' + moduleID).addClass('active');
 $('#product' + productID).addClass('active');
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 01d8ba966f..8543bc77c5 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -106,12 +106,12 @@
               if($canBatchEdit)
               {
                   $actionLink = $this->createLink('story', 'batchEdit', "productID=0&projectID=$project->id");
-                  echo html::commonButton($lang->edit, "onclick=\"changeAction('projectStoryForm', 'batchEdit', '$actionLink')\"");
+                  echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
               }
               if($canBatchClose)
               {
                   $actionLink = $this->createLink('story', 'batchClose', "productID=0&projectID=$project->id");
-                  echo html::commonButton($lang->close, "onclick=\"changeAction('projectStoryForm', 'batchClose', '$actionLink')\"");
+                  echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink')\"");
               }
           }
           echo $summary;
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 72718de8ec..c97ac3173f 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -150,7 +150,7 @@ var browseType  = '<?php echo $browseType;?>';
                   echo "</div>";
 
                   $actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID");
-                  $misc       = $canBatchEdit ? "onclick=changeAction('projectTaskForm','batchEdit','$actionLink')" : "disabled='disabled'";
+                  $misc       = $canBatchEdit ? "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>";
@@ -173,7 +173,7 @@ var browseType  = '<?php echo $browseType;?>';
   <ul>
   <?php 
   $actionLink = $this->createLink('task', 'batchClose');
-  $misc = $canBatchClose ? "onclick=changeAction('projectTaskForm','batchClose','$actionLink')" : "class='disabled'";
+  $misc = $canBatchClose ? "onclick=setFormAction('$actionLink','hiddenwin')" : "class='disabled'";
   echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
   ?>
   </ul>
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index ba3a3a48d8..747583cee2 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -9,11 +9,6 @@ function browseBySearch(active)
     $('#bymoduleTab').removeClass('active');
 }
 
-function changeAction(url)
-{
-  $('#batchForm').attr('action', url);
-}
-
 $(document).ready(function()
 {
     setModal4List('runCase', 'caseList', function(){$(".results").colorbox({width:900, height:550, iframe:true, transition:'none'});});
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index a533919a97..dbd74d7881 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -123,8 +123,8 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
              <div class='f-left'>
              <?php
              if($canBatchEdit or $canBatchRun) echo html::selectAll() . html::selectReverse(); 
-             if($canBatchEdit) echo html::submitButton($lang->edit, "onclick='changeAction(\"" . inLink('batchEdit', "productID=$productID") . "\")'");
-             if($canBatchRun) echo html::submitButton($lang->testtask->runCase,  "onclick='changeAction(\"" . $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy") . "\")'");
+             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") . "\")'");
              ?>
              </div>
              <?php endif?>
diff --git a/module/testtask/js/cases.js b/module/testtask/js/cases.js
index c7ee62f297..de106f2099 100644
--- a/module/testtask/js/cases.js
+++ b/module/testtask/js/cases.js
@@ -18,11 +18,6 @@ function browseBySearch(active)
     $('#bymoduleTab').removeClass('active');
 }
 
-function changeAction(url)
-{
-  $('#batchForm').attr('action', url);
-}
-
 $(document).ready(function()
 {
     setModal4List('runCase', 'caseList', function(){$(".results").colorbox({width:900, height:550, iframe:true, transition:'none'});});
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 9c09ab0691..433f42a846 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -106,20 +106,25 @@ var moduleID   = '<?php echo $moduleID;?>';
               <?php if($runs):?>
               <div class='f-left'>
 
-              <?php if($canBatchEdit or $canBatchAssign or $canBatchRun) echo html::selectAll() . html::selectReverse(); ?>
-
-              <?php if($canBatchEdit):?>
-              <input class='button-s' value="<?php echo $lang->edit; ?>" type="button" onclick="casesform.action='<?php echo $this->createLink('testcase', 'batchEdit', "from=testtaskCases&productID=$productID");?>';casesform.submit();">
-              <?php endif;?>
-
-              <?php if($canBatchAssign):?>
-              <?php echo html::select('assignedTo', $users);?>
-              <input class='button-s' value="<?php echo $lang->testtask->assign; ?>" type="button" onclick="casesform.action='<?php echo inLink('batchAssign', "taskID=$task->id");?>';casesform.submit();">
-              <?php endif;?>
-
-              <?php if($canBatchRun):?>
-              <input class='button-s' value="<?php echo $lang->testtask->runCase; ?>" type="button" onclick="casesform.action='<?php echo inLink('batchRUN', "productID=$productID&orderBy=id_desc&from=testtask");?>';casesform.submit();">
-              <?php endif;?>
+              <?php 
+              if($canBatchEdit or $canBatchAssign or $canBatchRun) echo html::selectAll() . html::selectReverse();
+              if($canBatchEdit)
+              {
+                  $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID");
+                  echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
+              }
+              if($canBatchAssign)
+              {
+                  $actionLink = inLink('batchAssign', "taskID=$task->id");
+                  echo html::select('assignedTo', $users);
+                  echo html::commonButton($lang->testtask->assign, "onclick=\"setFormAction('$actionLink')\"");
+              }
+              if($canBatchRun)
+              {
+                  $actionLink = inLink('batchRUN', "productID=$productID&orderBy=id_desc&from=testtask");
+                  echo html::commonButton($lang->testtask->runCase, "onclick=\"setFormAction('$actionLink')\"");
+              }
+              ?>
 
               </div>
               <?php endif;?>

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 07/10]  * 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';?>

From 3c97af8be2cc6bd335b74a09fa42ee85dfdcd71b Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 13:51:11 +0800
Subject: [PATCH 08/10]  * finish task#1687.

---
 module/product/view/browse.html.php | 25 ++++++++++++++++++++-----
 module/story/lang/en.php            |  2 +-
 module/story/lang/zh-cn.php         |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 8d367bd724..c3f600b5c0 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -29,14 +29,29 @@
     <span id='bysearchTab' ><a href='#'><span class='icon-search'></span><?php echo $lang->product->searchStory;?></a></span>
   </div>
   <div class='f-right'>
-    <?php common::printIcon('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");?>
-    <?php common::printIcon('story', 'export', "productID=$productID&orderBy=$orderBy");?>
-    <?php common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID");?>
-    <?php common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID"); ?>
+    <?php 
+    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('story', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID");
+    common::printIcon('story', 'batchCreate', "productID=$productID&moduleID=$moduleID");
+    common::printIcon('story', 'create', "productID=$productID&moduleID=$moduleID"); 
+    ?>
   </div>
 </div>
-<div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'></div>
+<div id='exportActionMenu' class='listMenu hidden'>
+  <ul>
+  <?php 
+  $misc = common::hasPriv('story', 'export') ? "class='export'" : "class=disabled";
+  $link = common::hasPriv('story', 'export') ?  $this->createLink('story', 'export', "productID=$productID&orderBy=$orderBy") : '#';
+  echo "<li>" . html::a($link, $lang->story->export, '', $misc) . "</li>";
+  ?>
+  </ul>
+</div>
 
+<div id='querybox' class='<?php if($browseType !='bysearch') echo 'hidden';?>'></div>
 <div class='treeSlider'><span>&nbsp;</span></div>
 <form method='post' id='productStoryForm'>
   <table class='cont-lt1'>
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 7efd42928b..c8adc9fc71 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -28,7 +28,7 @@ $lang->story->tasks       = "Tasks";
 $lang->story->taskCount   = 'Tasks count';
 $lang->story->bugs        = "Bug";
 $lang->story->linkStory   = 'Related story';
-$lang->story->export      = "Export";
+$lang->story->export      = "Export data";
 $lang->story->reportChart = "Report";
 $lang->story->batchChangePlan  = "Batch change plan";
 $lang->story->batchChangeStage = "Batch change stage";
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 0a0728d689..00df06d663 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -28,7 +28,7 @@ $lang->story->tasks       = "相关任务";
 $lang->story->taskCount   = '任务数';
 $lang->story->bugs        = "Bug";
 $lang->story->linkStory   = '关联需求';
-$lang->story->export      = "导出";
+$lang->story->export      = "导出数据";
 $lang->story->reportChart = "统计报表";
 $lang->story->batchChangePlan  = "批量修改计划";
 $lang->story->batchChangeStage = "批量修改阶段";

From 39399d6e69f01238acd7d7fc9898a06e7be0c92c Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 13:59:19 +0800
Subject: [PATCH 09/10]  * set the font-size=12 of summary.

---
 module/project/view/task.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index c97ac3173f..545f4a3e2d 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -156,7 +156,7 @@ var browseType  = '<?php echo $browseType;?>';
                   echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
                   echo "</div>";
               }
-              echo $summary;
+              echo "<span class='f-12px'>" . $summary . "</span>";
               ?>
               </div>
               <?php $pager->show();?>

From a14b2c5e7dd2117295a5c555fcab6fad7907d821 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Thu, 8 Aug 2013 15:02:27 +0800
Subject: [PATCH 10/10]  * finish task#1689.  * add authority for
 bug-batchResolve.

---
 module/bug/control.php          | 24 ++++++++++++++++++++++++
 module/bug/lang/en.php          |  2 ++
 module/bug/lang/zh-cn.php       |  2 ++
 module/bug/model.php            | 25 +++++++++++++++++++++++++
 module/bug/view/browse.html.php | 27 ++++++++++++++++++++++++---
 module/group/lang/resource.php  | 30 +++++++++++++++++-------------
 6 files changed, 94 insertions(+), 16 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 7f149238da..ed4c37eebb 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -667,6 +667,25 @@ class bug extends control
         $this->view->actions = $this->action->getList('bug', $bugID);
         $this->display();
     }
+
+    /**
+     * Batch confirm. 
+     * 
+     * @access public
+     * @return void
+     */
+    public function batchConfirm()
+    {
+        $bugIDList  = $this->post->bugIDList ? $this->post->bugIDList : die(js::locate($this->session->bugList, 'parent'));
+        $this->bug->batchConfirm($bugIDList);
+        if(dao::isError()) die(js::error(dao::getError()));
+        foreach($bugIDList as $bugID)
+        {
+            $actionID = $this->action->create('bug', $bugID, 'bugConfirmed');
+            $this->sendmail($bugID, $actionID);
+        }
+        die(js::locate($this->session->bugList, 'parent'));
+    }
     
     /**
      * Resolve a bug.
@@ -710,6 +729,11 @@ class bug extends control
         $this->display();
     }
 
+    public function batchResolve()
+    {
+        
+    }
+
     /**
      * Activate a bug.
      * 
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index c35cfa613a..3c1cb69661 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -73,12 +73,14 @@ $lang->bug->index              = 'Index';
 $lang->bug->create             = 'Create Bug';
 $lang->bug->batchCreate        = 'Batch create';
 $lang->bug->confirmBug         = 'Confirm Bug';
+$lang->bug->batchConfirm       = 'Batch confirm';
 $lang->bug->edit               = 'Edit Bug';
 $lang->bug->batchEdit          = 'Batch edit';
 $lang->bug->assignTo           = 'Assign';
 $lang->bug->browse             = 'Browse Bug';
 $lang->bug->view               = 'Bug Info';
 $lang->bug->resolve            = 'Resolve';
+$lang->bug->barchResolve       = 'batchResolve';
 $lang->bug->close              = 'Close';
 $lang->bug->activate           = 'Activate';
 $lang->bug->reportChart        = 'Report';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index d057612796..d89714dc2f 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -73,12 +73,14 @@ $lang->bug->index              = '首页';
 $lang->bug->create             = '提Bug';
 $lang->bug->batchCreate        = '批量添加';
 $lang->bug->confirmBug         = '确认';
+$lang->bug->batchConfirm       = '批量确认';
 $lang->bug->edit               = '编辑';
 $lang->bug->batchEdit          = '批量编辑';
 $lang->bug->assignTo           = '指派';
 $lang->bug->browse             = 'Bug列表';
 $lang->bug->view               = 'Bug详情';
 $lang->bug->resolve            = '解决';
+$lang->bug->batchResolve       = '批量解决';
 $lang->bug->close              = '关闭';
 $lang->bug->activate           = '激活';
 $lang->bug->reportChart        = '报表统计';
diff --git a/module/bug/model.php b/module/bug/model.php
index c2b54c6153..787a00a799 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -393,6 +393,31 @@ class bugModel extends model
         $this->dao->update(TABLE_BUG)->data($bug)->where('id')->eq($bugID)->exec();
     }
 
+    /**
+     * Batch confirm bugs.
+     * 
+     * @param  array $bugIDList 
+     * @access public
+     * @return void
+     */
+    public function batchConfirm($bugIDList)
+    {
+        $now = helper::now();
+        foreach($bugIDList as $bugID)
+        {
+            $oldBug = $this->getById($bugID);
+            if($oldBug->confirmed) continue;
+
+            $bug = new stdclass();
+            $bug->assignedTo     = $this->app->user->account;
+            $bug->lastEditedBy   = $this->app->user->account;
+            $bug->lastEditedDate = $now;
+            $bug->confirmed      = 1;
+
+            $this->dao->update(TABLE_BUG)->data($bug)->where('id')->eq($bugID)->exec();
+        }
+    }
+
     /**
      * Resolve a bug.
      * 
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 85b6143b6c..cbfef527bc 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -211,9 +211,30 @@ js::set('customed', $customed);
 <div id='moreActionMenu' class='listMenu hidden'>
   <ul>
   <?php 
-  $actionLink = $this->createLink('bug', 'batchResolve');
-  $misc = common::hasPriv('bug', 'batchResolve') ? "onclick=setFormAction('$actionLink')" : "class='disabled'";
-  echo "<li>" . html::a('#', $lang->bug->resolve, '', $misc) . "</li>";
+  $class = "class='disabled'";
+
+  $actionLink = $this->createLink('bug', 'batchConfirm');
+  $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=setFormAction('$actionLink','hiddenwin')" : "class='disabled'";
+  echo "<li>" . html::a('#', $lang->bug->confirmBug, '', $misc) . "</li>";
+
+  $misc = common::hasPriv('bug', 'batchResolve') ? "onmouseover='toggleSubMenu(this.id)' onmouseout='toggleSubMenu(this.id)' id='resolveItem'" : $class;
+  echo "<li>" . html::a('#', $lang->bug->resolve,  '', $misc) . "</li>";
+  ?>
+  </ul>
+</div>
+
+<div id='resolveItemMenu' class='hidden listMenu'>
+  <ul>
+  <?php
+  unset($lang->bug->resolutionList['']);
+  unset($lang->bug->resolutionList['duplicate']);
+  foreach($lang->bug->resolutionList as $key => $resolution)
+  {
+      $actionLink = $this->createLink('story', 'batchResolve', "resolution=$key");
+      echo "<li>";
+      echo html::a('#', $resolution, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
+      echo "</li>";
+  }
   ?>
   </ul>
 </div>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index b9f1514d13..0c2efc9fcf 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -355,11 +355,13 @@ $lang->resource->bug->browse             = 'browse';
 $lang->resource->bug->create             = 'create';
 $lang->resource->bug->batchCreate        = 'batchCreate';
 $lang->resource->bug->confirmBug         = 'confirmBug';
+$lang->resource->bug->batchConfirm       = 'batchConfirm';
 $lang->resource->bug->view               = 'view';
 $lang->resource->bug->edit               = 'edit';
 $lang->resource->bug->batchEdit          = 'batchEdit';
 $lang->resource->bug->assignTo           = 'assignTo';
 $lang->resource->bug->resolve            = 'resolve';
+$lang->resource->bug->batchResolve       = 'batchResolve';
 $lang->resource->bug->activate           = 'activate';
 $lang->resource->bug->close              = 'close';
 $lang->resource->bug->report             = 'reportChart';
@@ -375,19 +377,21 @@ $lang->bug->methodOrder[5]  = 'browse';
 $lang->bug->methodOrder[10] = 'create';
 $lang->bug->methodOrder[15] = 'batchCreate';
 $lang->bug->methodOrder[20] = 'confirmBug';
-$lang->bug->methodOrder[25] = 'view';
-$lang->bug->methodOrder[30] = 'edit';
-$lang->bug->methodOrder[35] = 'assignTo';
-$lang->bug->methodOrder[40] = 'resolve';
-$lang->bug->methodOrder[45] = 'activate';
-$lang->bug->methodOrder[50] = 'close';
-$lang->bug->methodOrder[55] = 'report';
-$lang->bug->methodOrder[60] = 'export';
-$lang->bug->methodOrder[65] = 'confirmStoryChange';
-$lang->bug->methodOrder[70] = 'delete';
-$lang->bug->methodOrder[75] = 'saveTemplate';
-$lang->bug->methodOrder[80] = 'deleteTemplate';
-$lang->bug->methodOrder[85] = 'customFields';
+$lang->bug->methodOrder[25] = 'batchConfirm';
+$lang->bug->methodOrder[30] = 'view';
+$lang->bug->methodOrder[35] = 'edit';
+$lang->bug->methodOrder[40] = 'assignTo';
+$lang->bug->methodOrder[45] = 'resolve';
+$lang->bug->methodOrder[50] = 'batchResolve';
+$lang->bug->methodOrder[55] = 'activate';
+$lang->bug->methodOrder[60] = 'close';
+$lang->bug->methodOrder[65] = 'report';
+$lang->bug->methodOrder[70] = 'export';
+$lang->bug->methodOrder[75] = 'confirmStoryChange';
+$lang->bug->methodOrder[80] = 'delete';
+$lang->bug->methodOrder[85] = 'saveTemplate';
+$lang->bug->methodOrder[90] = 'deleteTemplate';
+$lang->bug->methodOrder[95] = 'customFields';
 
 /* Test case. */
 $lang->resource->testcase = new stdclass();