* finish task#1683.

2013-08-08 11:13:15 +08:00
parent 43c38fc552
commit a087704212
7 changed files with 74 additions and 14 deletions
--- 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     = '删除模板';
--- 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 "<div class='groupButton'>";
                  echo html::selectAll() . html::selectReverse();
-                  echo html::submitButton($lang->edit);
+                  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';?>
--- 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>";
              }
--- 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 
--- 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";
--- 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 = "确认需求变动";
--- 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.
 *