* adjust task #2695.

module/product/view/browsedata.html.php

@@ -24,9 +24,9 @@
         <th class='w-hour {sorter:false}'><?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
         <th class='w-50px {sorter:false}'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
         <th class='w-70px {sorter:false}'><?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-        <th class='w-30px'><?php echo $lang->story->taskCountAB;?></th>
-        <th class='w-30px'><?php echo $lang->story->bugCountAB;?></th>
-        <th class='w-30px'><?php echo $lang->story->caseCountAB;?></th>
+        <th title='<?php echo $lang->story->taskCount?>' class='w-30px'><?php echo $lang->story->taskCountAB;?></th>
+        <th title='<?php echo $lang->story->bugCount?>'  class='w-30px'><?php echo $lang->story->bugCountAB;?></th>
+        <th title='<?php echo $lang->story->caseCount?>' class='w-30px'><?php echo $lang->story->caseCountAB;?></th>
         <th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
       </tr>
       </thead>

module/story/css/bugs.css

@@ -0,0 +1,3 @@
+body{background:white}
+.bugsList {padding:10px;}
+.bugsList .table{border: 1px solid #ddd;}

module/story/css/cases.css

@@ -0,0 +1,3 @@
+body{background:white}
+.casesList{padding:10px;}
+.casesList .table{border: 1px solid #ddd;}

module/story/css/tasks.css

@@ -1 +1,3 @@
 body{background:white}
+.tasksList{padding:10px;}
+.tasksList .table{border: 1px solid #ddd;}

module/story/lang/en.php

@@ -24,12 +24,14 @@ $lang->story->activate    = 'Activate';
 $lang->story->delete      = "Delete";
 $lang->story->view        = "Story Details";
 $lang->story->tasks       = "Linked Task";
-$lang->story->taskCount   = 'Tasks';
-$lang->story->bugCount    = 'Bugs';
-$lang->story->caseCount   = 'Testcases';
-$lang->story->taskCountAB = 'Tasks';
-$lang->story->bugCountAB  = 'Bugs';
-$lang->story->caseCountAB = 'Cases';
+$lang->story->bugs        = "Linked Bug";
+$lang->story->cases       = "Linked Case";
+$lang->story->taskCount   = 'Tasks Count';
+$lang->story->bugCount    = 'Bugs Count';
+$lang->story->caseCount   = 'Testcases Count';
+$lang->story->taskCountAB = 'T';
+$lang->story->bugCountAB  = 'B';
+$lang->story->caseCountAB = 'C';
 $lang->story->linkStory   = 'Link Story';
 $lang->story->unlinkStory = 'Unlink Story';
 $lang->story->export      = "Export Data";

module/story/lang/zh-cn.php

@@ -24,12 +24,14 @@ $lang->story->activate    = '激活';
 $lang->story->delete      = "删除";
 $lang->story->view        = "需求详情";
 $lang->story->tasks       = "相关任务";
+$lang->story->bugs        = "相关Bug";
+$lang->story->cases       = "相关用例";
 $lang->story->taskCount   = '任务数';
 $lang->story->bugCount    = 'Bug数';
 $lang->story->caseCount   = '用例数';
-$lang->story->taskCountAB = '任';
-$lang->story->bugCountAB  = 'Bug';
-$lang->story->caseCountAB = '用';
+$lang->story->taskCountAB = 'T';
+$lang->story->bugCountAB  = 'B';
+$lang->story->caseCountAB = 'C';
 $lang->story->linkStory   = '关联需求';
 $lang->story->unlinkStory = '移除相关需求';
 $lang->story->export      = "导出数据";

module/story/view/bugs.html.php

@@ -0,0 +1,40 @@
+<?php include '../../common/view/header.lite.html.php';?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span><?php echo html::icon($lang->icons['report']);?></span>
+    <small class='text-muted'> <?php echo $lang->story->bugs;?></small>
+  </div>
+</div>
+<div class='bugsList'>
+  <form class='form-condensed' target='hiddenwin'>
+    <table class='table'>
+      <thead>
+        <tr class='text-center'>
+          <th class='w-20px'>    <?php echo $lang->idAB;?></th>
+          <th class='w-p30'>   <?php echo $lang->bug->title;?></th>
+          <th class='w-pri'>   <?php echo $lang->priAB;?></th>
+          <th class='w-type'>  <?php echo $lang->bug->type;?></th>
+          <th class='w-40px'><?php echo $lang->statusAB;?></th>
+          <th class='w-user'>  <?php echo $lang->bug->assignedTo;?></th>
+          <th class='w-50px'>  <?php echo $lang->bug->resolvedBy;?></th>
+          <th class='w-50px'>  <?php echo $lang->bug->resolution;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($bugs as $key => $bug):?>
+        <tr class='text-center'>
+          <td><?php echo $bug->id;?></td>
+          <td class='text-left' title="<?php echo $bug->title?>"><?php echo $bug->title;?></td>
+          <td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo $bug->pri == '0' ? '' : zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
+          <td><?php echo $lang->bug->typeList[$bug->type];?></td>
+          <td><?php echo $lang->bug->statusList[$bug->status];?></td>
+          <td><?php echo zget($users, $bug->assignedTo, $bug->assignedTo);?></td>
+          <td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
+          <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+  </form>
+</div>
+<?php include '../../common/view/footer.lite.html.php';?>

module/story/view/cases.html.php

@@ -0,0 +1,40 @@
+<?php include '../../common/view/header.lite.html.php';?>
+<div id='titlebar'>
+  <div class='heading'>
+    <span><?php echo html::icon($lang->icons['report']);?></span>
+    <small class='text-muted'> <?php echo $lang->story->cases;?></small>
+  </div>
+</div>
+<div class='casesList'>
+  <form class='form-condensed' target='hiddenwin'>
+    <table class='table'>
+      <thead>
+        <tr class='text-center'>
+          <th class='w-20px'>    <?php echo $lang->idAB;?></th>
+          <th class='w-p30'>   <?php echo $lang->testcase->title;?></th>
+          <th class='w-pri'>   <?php echo $lang->priAB;?></th>
+          <th class='w-type'>  <?php echo $lang->testcase->type;?></th>
+          <th class='w-status'><?php echo $lang->statusAB;?></th>
+          <th class='w-user'>  <?php echo $lang->testcase->lastRunner;?></th>
+          <th class='w-60px'>  <?php echo $lang->testcase->lastRunDate;?></th>
+          <th class='w-40px'>  <?php echo $lang->testcase->lastRunResult;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($cases as $key => $case):?>
+        <tr class='text-center'>
+          <td><?php echo $case->id;?></td>
+          <td class='text-left' title="<?php echo $case->title?>"><?php echo $case->title;?></td>
+          <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo $case->pri == '0' ? '' : zget($lang->case->priList, $case->pri, $case->pri);?></span></td>
+          <td><?php echo $lang->testcase->typeList[$case->type];?></td>
+          <td><?php echo $lang->testcase->statusList[$case->status];?></td>
+          <td><?php echo zget($users, $case->lastRunner, $case->lastRunner);?></td>
+          <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
+          <td><?php echo $case->lastRunResult ? $lang->testcase->resultList[$case->lastRunResult] : '';?></td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+  </form>
+</div>
+<?php include '../../common/view/footer.lite.html.php';?>

module/story/view/tasks.html.php

@@ -5,23 +5,25 @@
     <small class='text-muted'> <?php echo $lang->story->tasks;?></small>
   </div>
 </div>
-<div>
+<div class='tasksList'>
   <form class='form-condensed' target='hiddenwin'>
     <table class='table'>
       <thead>
         <tr class='text-center'>
+          <th class='w-20px'>    <?php echo $lang->idAB;?></th>
           <th class='w-p30'>   <?php echo $lang->task->name;?></th>
           <th class='w-pri'>   <?php echo $lang->priAB;?></th>
           <th class='w-status'><?php echo $lang->statusAB;?></th>
           <th class='w-user'>  <?php echo $lang->task->assignedToAB;?></th>
-          <th class='w-40px'>  <?php echo $lang->task->estimate;?></th>
-          <th class='w-40px'>  <?php echo $lang->task->consumed;?></th>
-          <th class='w-40px'>  <?php echo $lang->task->left;?></th>
+          <th class='w-40px'>  <?php echo $lang->task->estimateAB;?></th>
+          <th class='w-40px'>  <?php echo $lang->task->consumedAB;?></th>
+          <th class='w-40px'>  <?php echo $lang->task->leftAB;?></th>
         </tr>
       </thead>
       <tbody>
         <?php foreach($tasks as $key => $task):?>
         <tr class='text-center'>
+          <td><?php echo $task->id;?></td>
           <td class='text-left' title="<?php echo $task->name?>"><?php echo $task->name;?></td>
           <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
           <td><?php echo $lang->task->statusList[$task->status];?></td>