From eb5e30e2faf13762366847234128cfc47d37bf7a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 10 Jul 2019 13:14:31 +0800
Subject: [PATCH]  * finish task #5968.

---
 module/product/lang/en.php       | 20 +++++++++++++-------
 module/product/lang/zh-cn.php    | 20 +++++++++++++-------
 module/product/view/all.html.php | 18 ++++++++----------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 619ef41758..56452e0e88 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -47,13 +47,19 @@ $lang->product->project     = $lang->projectCommon . ' List';
 $lang->product->build       = 'Build List';
 $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
 
-$lang->product->currentProject   = "{$lang->projectCommon}";
-$lang->product->activeStories    = 'Active [S]';
-$lang->product->changedStories   = 'Changed [S]';
-$lang->product->draftStories     = 'Draft [S]';
-$lang->product->closedStories    = 'Closed [S]';
-$lang->product->unResolvedBugs   = 'Active [B]';
-$lang->product->assignToNullBugs = 'Unassigned [B]';
+$lang->product->currentProject        = "{$lang->projectCommon}";
+$lang->product->activeStories         = 'Active [S]';
+$lang->product->activeStoriesTitle    = 'Active Stories';
+$lang->product->changedStories        = 'Changed [S]';
+$lang->product->changedStoriesTitle   = 'Changed Stories';
+$lang->product->draftStories          = 'Draft [S]';
+$lang->product->draftStoriesTitle     = 'Draft Stories';
+$lang->product->closedStories         = 'Closed [S]';
+$lang->product->closedStoriesTitle    = 'Closed Stories';
+$lang->product->unResolvedBugs        = 'Active [B]';
+$lang->product->unResolvedBugsTitle   = 'Active Bugs';
+$lang->product->assignToNullBugs      = 'Unassigned [B]';
+$lang->product->assignToNullBugsTitle = 'Unassigned Bugs';
 
 $lang->product->confirmDelete  = " Do you want to delete the {$lang->productCommon}?";
 $lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 2c251c54de..7254bb1e89 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -47,13 +47,19 @@ $lang->product->project     = $lang->projectCommon . '列表';
 $lang->product->build       = '版本列表';
 $lang->product->projectInfo = "所有与此产品关联的{$lang->projectCommon}";
 
-$lang->product->currentProject   = '当前' . $lang->projectCommon;
-$lang->product->activeStories    = '激活需求';
-$lang->product->changedStories   = '已变更需求';
-$lang->product->draftStories     = '草稿需求';
-$lang->product->closedStories    = '已关闭需求';
-$lang->product->unResolvedBugs   = '未解决Bug';
-$lang->product->assignToNullBugs = '未指派Bug';
+$lang->product->currentProject        = '当前' . $lang->projectCommon;
+$lang->product->activeStories         = '激活需求';
+$lang->product->activeStoriesTitle    = '激活需求';
+$lang->product->changedStories        = '已变更需求';
+$lang->product->changedStoriesTitle   = '已变更需求';
+$lang->product->draftStories          = '草稿需求';
+$lang->product->draftStoriesTitle     = '草稿需求';
+$lang->product->closedStories         = '已关闭需求';
+$lang->product->closedStoriesTitle    = '已关闭需求';
+$lang->product->unResolvedBugs        = '未解决Bug';
+$lang->product->unResolvedBugsTitle   = '未解决Bug';
+$lang->product->assignToNullBugs      = '未指派Bug';
+$lang->product->assignToNullBugsTitle = '未指派Bug';
 
 $lang->product->confirmDelete  = " 您确定删除该{$lang->productCommon}吗？";
 $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！";
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index f3708d4b40..bcf352baa9 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -64,15 +64,14 @@
             </th>
             <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?></th>
             <th class='w-110px text-left'><?php common::printOrderLink('line', $orderBy, $vars, $lang->product->line);?></th>
-            <th class='w-80px'><?php echo $lang->product->activeStories;?></th>
-            <th class='w-90px'><?php echo $lang->product->changedStories;?></th>
-            <th class='w-70px'><?php echo $lang->product->draftStories;?></th>
-            <th class='w-90px'><?php echo $lang->product->closedStories;?></th>
-            <th class='w-70px'><?php echo $lang->product->plans;?></th>
-            <th class='w-70px'><?php echo $lang->product->releases;?></th>
-            <th class='w-80px'><?php echo $lang->product->bugs;?></th>
-            <th class='w-80px'><?php echo $lang->product->unResolvedBugs;?></th>
-            <th class='w-100px'><?php echo $lang->product->assignToNullBugs;?></th>
+            <th class='w-80px' title='<?php echo $lang->product->activeStoriesTitle;?>'><?php echo $lang->product->activeStories;?></th>
+            <th class='w-90px' title='<?php echo $lang->product->changedStoriesTitle;?>'><?php echo $lang->product->changedStories;?></th>
+            <th class='w-70px' title='<?php echo $lang->product->draftStoriesTitle;?>'><?php echo $lang->product->draftStories;?></th>
+            <th class='w-90px' title='<?php echo $lang->product->closedStoriesTitle;?>'><?php echo $lang->product->closedStories;?></th>
+            <th class='w-70px' title='<?php echo $lang->product->plans;?>'><?php echo $lang->product->plans;?></th>
+            <th class='w-70px' title='<?php echo $lang->product->releases;?>'><?php echo $lang->product->releases;?></th>
+            <th class='w-80px' title='<?php echo $lang->product->unResolvedBugsTitle;?>'><?php echo $lang->product->unResolvedBugs;?></th>
+            <th class='w-110px' title='<?php echo $lang->product->assignToNullBugsTitle;?>'><?php echo $lang->product->assignToNullBugs;?></th>
             <?php if($canOrder):?>
             <th class='w-70px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->product->updateOrder);?></th>
             <?php endif;?>
@@ -96,7 +95,6 @@
           <td class='text-center'><?php echo $product->stories['closed'];?></td>
           <td class='text-center'><?php echo $product->plans;?></td>
           <td class='text-center'><?php echo $product->releases;?></td>
-          <td class='text-center'><?php echo $product->bugs;?></td>
           <td class='text-center'><?php echo $product->unResolved;?></td>
           <td class='text-center'><?php echo $product->assignToNull;?></td>
           <?php if($canOrder):?>