From 9f8927de0ca1bdee663cdb12f70e237a8058d818 Mon Sep 17 00:00:00 2001
From: azhi <chencongzhi520@gmail.com>
Date: Mon, 22 Jul 2013 14:24:56 +0800
Subject: [PATCH]  * finish task#1594.

---
 module/testtask/lang/en.php        |   4 +
 module/testtask/lang/zh-cn.php     |   4 +
 module/testtask/view/view.html.php | 142 +++++++++++++++++------------
 3 files changed, 90 insertions(+), 60 deletions(-)

diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 9b8e590d35..6771461921 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -49,6 +49,10 @@ $lang->testtask->lastRunTime    = 'Time';
 $lang->testtask->lastRunResult  = 'Result';
 $lang->testtask->report         = 'Report';
 
+$lang->testtask->legendDesc      = 'Desc';
+$lang->testtask->legendReport    = 'Report';
+$lang->testtask->legendBasicInfo = 'Basic info';
+
 $lang->testtask->statusList['wait']    = 'Pending';
 $lang->testtask->statusList['doing']   = 'In progress';
 $lang->testtask->statusList['done']    = 'Done';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 86711f1272..15073b11a2 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -49,6 +49,10 @@ $lang->testtask->lastRunTime    = '执行时间';
 $lang->testtask->lastRunResult  = '结果';
 $lang->testtask->report         = '测试总结';
 
+$lang->testtask->legendDesc      = '任务描述';
+$lang->testtask->legendReport    = '测试总结';
+$lang->testtask->legendBasicInfo = '基本信息';
+
 $lang->testtask->statusList['wait']    = '未开始';
 $lang->testtask->statusList['doing']   = '进行中';
 $lang->testtask->statusList['done']    = '已完成';
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index b1f3c944c3..e3c605ed01 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -11,66 +11,88 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/tablesorter.html.php';?>
-<table class='table-1'> 
-  <caption <?php if($task->deleted) echo "class='deleted'";?>>TASK #<?php echo $task->id . ' ' . $task->name;?></caption>
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->name;?></th>
-    <td><?php echo $task->name;?>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->project;?></th>
-    <td><?php echo $task->projectName;?></td>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->build;?></th>
-    <td><?php $task->buildName ? print($task->buildName) : print($task->build);?></td>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
-    <td><?php echo $users[$task->owner];?></td>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->pri;?></th>
-    <td><?php echo $task->pri;?></td>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
-    <td><?php echo $task->begin;?></td>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->end;?></th>
-    <td><?php echo $task->end;?></td>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->status;?></th>
-    <td><?php echo $lang->testtask->statusList[$task->status];?></td>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->desc;?></th>
-    <td class='content'><?php echo $task->desc;?></td>
-  </tr>  
-  <tr>
-    <th class='rowhead'><?php echo $lang->testtask->report;?></th>
-    <td class='content'><?php echo $task->report;?></td>
-  </tr>  
-</table>
-<div class='a-center f-16px strong'>
-  <?php
-  $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browse', "productID=$task->product");
-  if(!$task->deleted)
-  {
-      common::printIcon('testtask', 'start',    "taskID=$task->id", $task);
-      common::printIcon('testtask', 'close',    "taskID=$task->id", $task);
-      common::printIcon('testtask', 'cases',    "taskID=$task->id", $task);
-      common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task);
+<div id='titlebar'>
+  <div id='main' <?php if($task->deleted) echo "class='deleted'";?>>TASK #<?php echo $task->id . ' ' . $task->title;?></div>
+  <div>
+    <?php
+    $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browse', "productID=$task->product");
+    $actionLinks = '';
+    if(!$task->deleted)
+    {
+        ob_start();
 
-      common::printDivider();
-      common::printIcon('testtask', 'edit',     "taskID=$task->id");
-      common::printIcon('testtask', 'delete',   "taskID=$task->id", '', 'button', '', 'hiddenwin');
-  }
-  common::printRPN($browseLink);
-  ?>
+        common::printIcon('testtask', 'start',    "taskID=$task->id", $task);
+        common::printIcon('testtask', 'close',    "taskID=$task->id", $task);
+        common::printIcon('testtask', 'cases',    "taskID=$task->id", $task);
+        common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task);
+
+        common::printDivider();
+        common::printIcon('testtask', 'edit',     "taskID=$task->id");
+        common::printIcon('testtask', 'delete',   "taskID=$task->id", '', 'button', '', 'hiddenwin');
+
+        $actionLinks = ob_get_contents();
+        ob_clean();
+        echo $actionLinks;
+    }
+    common::printRPN($browseLink);
+    ?>
+  </div>
 </div>
-<?php include '../../common/view/action.html.php';?>
+
+<table class='cont-rt5'>
+  <tr valign='top'>
+    <td>
+      <fieldset>
+        <legend><?php echo $lang->testtask->legendDesc;?></legend>
+        <div class='content'><?php echo $task->desc;?></div>
+      </fieldset>
+      <fieldset>
+        <legend><?php echo $lang->testtask->legendReport;?></legend>
+        <div class='content'><?php echo $task->report;?></div>
+      </fieldset>
+      <?php include '../../common/view/action.html.php';?>
+      <div class='a-center actionlink'><?php echo $actionLinks;?></div>
+    </td>
+    <td class='divider'></td>
+    <td class='side'>
+      <fieldset>
+        <legend><?php echo $lang->testtask->legendBasicInfo;?></legend>
+        <table class='table-1 a-left fixed'>
+          <tr>
+            <th class='rowhead'><?php echo $lang->testtask->project;?></th>
+            <td><?php echo $task->projectName;?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->testtask->build;?></th>
+            <td><?php $task->buildName ? print($task->buildName) : print($task->build);?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
+            <td><?php echo $users[$task->owner];?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->testtask->pri;?></th>
+            <td><?php echo $task->pri;?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
+            <td><?php echo $task->begin;?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->testtask->end;?></th>
+            <td><?php echo $task->end;?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->testtask->status;?></th>
+            <td><?php echo $lang->testtask->statusList[$task->status];?></td>
+          </tr>  
+          <tr>
+            <th class='rowhead'><?php echo $lang->testtask->report;?></th>
+            <td class='content'><?php echo $task->report;?></td>
+          </tr>  
+       </table>
+      </fieldset>
+    </td>
+  </tr>
+</table>
 <?php include '../../common/view/footer.html.php';?>