* finish task #4911.

module/block/view/productstatisticblock.html.php

@@ -41,7 +41,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic .nav-secondary > li.active > a:hover,
 .block-statistic .nav-secondary > li.active > a:focus,
 .block-statistic .nav-secondary > li > a:hover {box-shadow: none; border-radius: 4px 0 0 4px;}
-.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; right: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;}
+.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;}
 .block-statistic .nav-secondary > li.switch-icon {display: none;}
 .block-statistic.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px;}
 .block-statistic.block-sm .panel-body > .table-row,
@@ -142,12 +142,12 @@ $(function()
                 <div class="type-label">
                   <table class='status-count'>
                     <tr>
-                      <td class='text-right'><?php echo $lang->productplan->featureBar['browse']['unexpired'];?> :</td>
-                      <td class='text-left'><?php echo $unexpiredPlan;?></td>
+                      <td class='text-right'><?php echo $lang->productplan->all;?> :</td>
+                      <td class='text-left'><?php echo $totalPlan;?></td>
                     </tr>
                     <tr>
-                      <td class='text-right'><?php echo $lang->story->planAB;?> :</td>
-                      <td class='text-left'><?php echo $totalPlan;?></td>
+                      <td class='text-right'><?php echo $lang->productplan->featureBar['browse']['unexpired'];?> :</td>
+                      <td class='text-left'><?php echo $unexpiredPlan;?></td>
                     </tr>
                   </table>
                 </div>
@@ -176,12 +176,12 @@ $(function()
                 <div class="type-label">
                   <table class='status-count'>
                     <tr>
-                      <td class='text-right'><?php echo $lang->project->statusList['doing'];?> :</td>
-                      <td class='text-left'><?php echo $doingProject;?></td>
+                      <td class='text-right'><?php echo $lang->project->allProjects;?> :</td>
+                      <td class='text-left'><?php echo $totalProject;?></td>
                     </tr>
                     <tr>
-                      <td class='text-right'><?php echo $lang->projectCommon;?> :</td>
-                      <td class='text-left'><?php echo $totalProject;?></td>
+                      <td class='text-right'><?php echo $lang->project->statusList['doing'];?> :</td>
+                      <td class='text-left'><?php echo $doingProject;?></td>
                     </tr>
                   </table>
                 </div>

module/block/view/projectstatisticblock.html.php

@@ -28,7 +28,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .block-statistic .nav-secondary > li.active > a:hover,
 .block-statistic .nav-secondary > li.active > a:focus,
 .block-statistic .nav-secondary > li > a:hover {box-shadow: none; border-radius: 4px 0 0 4px;}
-.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; right: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;}
+.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;}
 .block-statistic .nav-secondary > li.switch-icon {display: none;}
 .block-statistic.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px; border-radius: 3px;}
 .block-statistic.block-sm .panel-body > .table-row,
@@ -121,14 +121,14 @@ $(function()
               <div class="type-info">
                 <div class="type-label">
                   <table class='status-count'>
-                    <tr>
-                      <td class='text-right'><?php echo $lang->task->noFinished;?> :</td>
-                      <td class='text-left'><?php echo $project->undoneTasks;?></td>
-                    </tr>
                     <tr>
                       <td class='text-right'><?php echo $lang->task->allTasks;?> :</td>
                       <td class='text-left'><?php echo $project->totalTasks;?></td>
                     </tr>
+                    <tr>
+                      <td class='text-right'><?php echo $lang->task->noFinished;?> :</td>
+                      <td class='text-left'><?php echo $project->undoneTasks;?></td>
+                    </tr>
                   </table>
                 </div>
               </div>
@@ -141,14 +141,14 @@ $(function()
               <div class="type-info">
                 <div class="type-label">
                   <table class='status-count'>
-                    <tr>
-                      <td class='text-right'><?php echo $lang->story->unclosed;?> :</td>
-                      <td class='text-left'><?php echo $project->unclosedStories;?></td>
-                    </tr>
                     <tr>
                       <td class='text-right'><?php echo $lang->story->total;?> :</td>
                       <td class='text-left'><?php echo $project->totalStories;?></td>
                     </tr>
+                    <tr>
+                      <td class='text-right'><?php echo $lang->story->unclosed;?> :</td>
+                      <td class='text-left'><?php echo $project->unclosedStories;?></td>
+                    </tr>
                   </table>
                 </div>
               </div>
@@ -163,12 +163,12 @@ $(function()
                 <div class="type-label">
                   <table class='status-count'>
                     <tr>
-                      <td class='text-right'><?php echo $lang->bug->unResolved;?> :</td>
-                      <td class='text-left'><?php echo $project->activeBugs;?></td>
+                      <td class='text-right'><?php echo $lang->bug->allBugs . ' Bug';?> :</td>
+                      <td class='text-left'><?php echo $project->totalBugs;?></td>
                     </tr>
                     <tr>
-                      <td class='text-right'><?php echo $lang->bug->allBugs;?> :</td>
-                      <td class='text-left'><?php echo $project->totalBugs;?></td>
+                      <td class='text-right'><?php echo $lang->bug->unResolved;?> :</td>
+                      <td class='text-left'><?php echo $project->activeBugs;?></td>
                     </tr>
                   </table>
                 </div>

module/block/view/qastatisticblock.html.php

@@ -77,6 +77,17 @@ $(function()
 </script>
 <div class="panel-body">
   <div class="table-row">
+    <div class="col col-nav">
+      <ul class="nav nav-stacked nav-secondary" id='<?php echo $blockNavId;?>'>
+        <li class='switch-icon prev'><a><i class='icon icon-arrow-left'></i></a></li>
+        <?php $index = 1;?>
+        <?php foreach($products as $product):?>
+        <li class="<?php if($index == 1) echo 'active';?>"><a data-target="#tabContent<?php echo $product->id;?>" data-toggle="tab"><?php echo $product->name;?></a></li>
+        <?php $index++;?>
+        <?php endforeach;?>
+        <li class='switch-icon next'><a><i class='icon icon-arrow-right'></i></a></li>
+      </ul>
+    </div>
     <div class="col tab-content">
       <?php $index = 1;?>
       <?php foreach($products as $product):?>
@@ -157,16 +168,5 @@ $(function()
       <?php $index++;?>
       <?php endforeach;?>
     </div>
-    <div class="col col-nav">
-      <ul class="nav nav-stacked nav-secondary" id='<?php echo $blockNavId;?>'>
-        <li class='switch-icon prev'><a><i class='icon icon-arrow-left'></i></a></li>
-        <?php $index = 1;?>
-        <?php foreach($products as $product):?>
-        <li class="<?php if($index == 1) echo 'active';?>"><a data-target="#tabContent<?php echo $product->id;?>" data-toggle="tab"><?php echo $product->name;?></a></li>
-        <?php $index++;?>
-        <?php endforeach;?>
-        <li class='switch-icon next'><a><i class='icon icon-arrow-right'></i></a></li>
-      </ul>
-    </div>
   </div>
 </div>

module/productplan/lang/en.php

@@ -34,6 +34,7 @@ $lang->productplan->batchUnlinkBug   = "Batch Unlink Bug";
 $lang->productplan->linkedBugs       = 'Linked Bug';
 $lang->productplan->unlinkedBugs     = 'Unlinked';
 $lang->productplan->unexpired        = 'Unexpired Plan';
+$lang->productplan->all              = 'All Plan';
 
 $lang->productplan->confirmDelete      = "Do you want to delete this Plan?";
 $lang->productplan->confirmUnlinkStory = "Do you want to unlink this Story?";

module/productplan/lang/zh-cn.php

@@ -34,6 +34,7 @@ $lang->productplan->batchUnlinkBug   = "批量移除Bug";
 $lang->productplan->linkedBugs       = 'Bug';
 $lang->productplan->unlinkedBugs     = '未关联Bug';
 $lang->productplan->unexpired        = '未过期计划';
+$lang->productplan->all              = '所有计划';
 
 $lang->productplan->confirmDelete      = "您确认删除该计划吗？";
 $lang->productplan->confirmUnlinkStory = "您确认移除该需求吗？";

www/theme/default/style.css

@@ -9,8 +9,8 @@
 * @link        http://www.zentao.net
 */
 
-.c-assignedTo.has-btn .icon-hand-right{font-size:14px;width:20px;height:20px;line-height:25px;}
-.c-assignedTo.has-btn .btn-icon-left.btn-sm {padding-left: 20px;}
+.c-assignedTo.has-btn .icon-hand-right{font-size:14px;width:20px;height:20px;line-height:21px;}
+.c-assignedTo.has-btn .btn-icon-left.btn-sm {padding-left: 20px;line-height:16px;}
 .table thead>tr>th.c-assign, .table thead>tr>th.c-assignedTo {padding-left: 27px;}
 
 /* 取消历史记录的缩进,与标题对齐*/