From f077b68309285e18fbbc3f0c037e5eb717de1966 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Wed, 2 Mar 2011 15:53:28 +0000
Subject: [PATCH]  * split the css and js.  * rewrite the ui code.

---
 module/testtask/control.php            |   1 +
 module/testtask/css/cases.css          |   0
 module/testtask/css/results.css        |   1 +
 module/testtask/css/runcase.css        |   1 +
 module/testtask/js/cases.js            |  22 +++++
 module/testtask/js/linkcase.js         |   7 ++
 module/testtask/view/browse.html.php   |  84 +++++++++---------
 module/testtask/view/cases.html.php    |  80 +++++++----------
 module/testtask/view/create.html.php   |  87 +++++++++----------
 module/testtask/view/edit.html.php     |  82 +++++++++---------
 module/testtask/view/linkcase.html.php | 113 +++++++++++--------------
 module/testtask/view/results.html.php  |  48 +++++------
 module/testtask/view/runcase.html.php  |   8 +-
 module/testtask/view/view.html.php     |  98 +++++++++++----------
 14 files changed, 307 insertions(+), 325 deletions(-)
 create mode 100644 module/testtask/css/cases.css
 create mode 100644 module/testtask/css/results.css
 create mode 100644 module/testtask/css/runcase.css
 create mode 100644 module/testtask/js/cases.js
 create mode 100644 module/testtask/js/linkcase.js

diff --git a/module/testtask/control.php b/module/testtask/control.php
index ae70310dd1..cfebe43668 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -181,6 +181,7 @@ class testtask extends control
         $this->view->browseType  = $browseType;
         $this->view->taskID      = $taskID;
         $this->view->moduleID    = $moduleID;
+        $this->view->treeClass   = $browseType == 'bymodule' ? '' : 'hidden';
 
         $this->display();
     }
diff --git a/module/testtask/css/cases.css b/module/testtask/css/cases.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/module/testtask/css/results.css b/module/testtask/css/results.css
new file mode 100644
index 0000000000..620aa31b05
--- /dev/null
+++ b/module/testtask/css/results.css
@@ -0,0 +1 @@
+body{background:white}
diff --git a/module/testtask/css/runcase.css b/module/testtask/css/runcase.css
new file mode 100644
index 0000000000..620aa31b05
--- /dev/null
+++ b/module/testtask/css/runcase.css
@@ -0,0 +1 @@
+body{background:white}
diff --git a/module/testtask/js/cases.js b/module/testtask/js/cases.js
new file mode 100644
index 0000000000..cdb93ad52e
--- /dev/null
+++ b/module/testtask/js/cases.js
@@ -0,0 +1,22 @@
+function checkall(checker)
+{
+    $('input').each(function() 
+    {
+        $(this).attr("checked", checker.checked)
+    });
+}
+
+function browseByModule(active)
+{
+    $('.side').removeClass('hidden');
+    $('.divider').removeClass('hidden');
+    $('#bymoduleTab').addClass('active');
+    $('#' + active + 'Tab').removeClass('active');
+}
+
+$(document).ready(function()
+{
+    $("a.iframe").colorbox({width:900, height:600, iframe:true, transition:'none'});
+    $('#' + browseType + 'Tab').addClass('active');
+    $('#module' + moduleID).addClass('active'); 
+});
diff --git a/module/testtask/js/linkcase.js b/module/testtask/js/linkcase.js
new file mode 100644
index 0000000000..f83e62a9a5
--- /dev/null
+++ b/module/testtask/js/linkcase.js
@@ -0,0 +1,7 @@
+function checkall(checker)
+{
+    $('input').each(function() 
+    {
+        $(this).attr("checked", checker.checked)
+    });
+}
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 745b5756c6..b8d0cd8924 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -12,47 +12,45 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<div class='yui-d0'>
-  <table class='table-1 colored tablesorter fixed'>
-    <caption class='caption-tl'>
-      <div class='f-left'><?php echo $lang->testtask->browse;?></div>
-      <div class='f-right'><?php common::printLink('testtask', 'create', "product=$productID", $lang->testtask->create);?></div>
-    </caption>
-    <thead>
-    <tr class='colhead'>
-      <th class='w-id'><?php echo $lang->idAB;?></th>
-      <th><?php echo $lang->testtask->name;?></th>
-      <th><?php echo $lang->testtask->project;?></th>
-      <th><?php echo $lang->testtask->build;?></th>
-      <th class='w-user'><?php echo $lang->testtask->owner;?></th>
-      <th class='w-80px'><?php echo $lang->testtask->begin;?></th>
-      <th class='w-80px'><?php echo $lang->testtask->end;?></th>
-      <th class='w-50px'><?php echo $lang->statusAB;?></th>
-      <th class='w-130px {sorter:false}'><?php echo $lang->actions;?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php foreach($tasks as $task):?>
-    <tr class='a-center'>
-      <td><?php echo html::a(inlink('view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
-      <td class='a-left nobr'><?php echo html::a(inlink('view', "taskID=$task->id"), $task->name);?></td>
-      <td class='nobr'><?php echo $task->projectName?></td>
-      <td class='nobr'><?php $task->build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
-      <td><?php echo $users[$task->owner];?></td>
-      <td><?php echo $task->begin?></td>
-      <td><?php echo $task->end?></td>
-      <td><?php echo $lang->testtask->statusList[$task->status];?></td>
-      <td>
-        <?php
-        common::printLink('testtask', 'cases',    "taskID=$task->id", $lang->testtask->cases);
-        common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCaseAB);
-        common::printLink('testtask', 'edit',     "taskID=$task->id", $lang->edit);
-        common::printLink('testtask', 'delete',   "taskID=$task->id", $lang->delete, 'hiddenwin');
-        ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-    </tbody>
-  </table>
-</div>  
+<table class='table-1 colored tablesorter fixed'>
+  <caption class='caption-tl'>
+    <div class='f-left'><?php echo $lang->testtask->browse;?></div>
+    <div class='f-right'><?php common::printLink('testtask', 'create', "product=$productID", $lang->testtask->create);?></div>
+  </caption>
+  <thead>
+  <tr class='colhead'>
+    <th class='w-id'><?php echo $lang->idAB;?></th>
+    <th><?php echo $lang->testtask->name;?></th>
+    <th><?php echo $lang->testtask->project;?></th>
+    <th><?php echo $lang->testtask->build;?></th>
+    <th class='w-user'><?php echo $lang->testtask->owner;?></th>
+    <th class='w-80px'><?php echo $lang->testtask->begin;?></th>
+    <th class='w-80px'><?php echo $lang->testtask->end;?></th>
+    <th class='w-50px'><?php echo $lang->statusAB;?></th>
+    <th class='w-130px {sorter:false}'><?php echo $lang->actions;?></th>
+  </tr>
+  </thead>
+  <tbody>
+  <?php foreach($tasks as $task):?>
+  <tr class='a-center'>
+    <td><?php echo html::a(inlink('view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
+    <td class='a-left nobr'><?php echo html::a(inlink('view', "taskID=$task->id"), $task->name);?></td>
+    <td class='nobr'><?php echo $task->projectName?></td>
+    <td class='nobr'><?php $task->build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
+    <td><?php echo $users[$task->owner];?></td>
+    <td><?php echo $task->begin?></td>
+    <td><?php echo $task->end?></td>
+    <td><?php echo $lang->testtask->statusList[$task->status];?></td>
+    <td>
+      <?php
+      common::printLink('testtask', 'cases',    "taskID=$task->id", $lang->testtask->cases);
+      common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCaseAB);
+      common::printLink('testtask', 'edit',     "taskID=$task->id", $lang->edit);
+      common::printLink('testtask', 'delete',   "taskID=$task->id", $lang->delete, 'hiddenwin');
+      ?>
+    </td>
+  </tr>
+  <?php endforeach;?>
+  </tbody>
+</table>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 83b23194a2..ee9593e1f9 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -14,50 +14,36 @@
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include '../../common/view/treeview.html.php';?>
 <?php include '../../common/view/table2csv.html.php';?>
-<script language='javascript'>
-$(document).ready(function()
-{
-    $("a.iframe").colorbox({width:900, height:600, iframe:true, transition:'none'});
-});
-
-function checkall(checker)
-{
-    $('input').each(function() 
-    {
-        $(this).attr("checked", checker.checked)
-    });
-}
-/* 切换至按模块浏览。*/
-function browseByModule(active)
-{
-    $('#mainbox').addClass('yui-t1');
-    $('#treebox').removeClass('hidden');
-    $('#bymoduleTab').addClass('active');
-    $('#' + active + 'Tab').removeClass('active');
-}
+<script language="Javascript">
+var browseType = '<?php echo $browseType;?>';
+var moduleID   = '<?php echo $moduleID;?>';
 </script>
-<div class='yui-d0'>
-  <div id='featurebar'>
-    <div class='f-left'>
-      <?php
-      echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->testtask->byModule . "</a></span> ";
-      echo "<span id='allTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), $lang->testtask->allCases) . "</span>";
-      echo "<span id='assignedtomeTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), $lang->testtask->assignedToMe) . "</span>";
-      ?>
-    </div>
-    <div class='f-right'>
-      <?php
-      echo html::export2csv($lang->exportCSV, $lang->setFileName);
-      common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCase);
-      echo html::a($this->session->testtaskList, $lang->goback);
-      ?>
-    </div>
+
+<div id='featurebar'>
+  <div class='f-left'>
+    <?php
+    echo "<span id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->testtask->byModule . "</a></span> ";
+    echo "<span id='allTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), $lang->testtask->allCases) . "</span>";
+    echo "<span id='assignedtomeTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), $lang->testtask->assignedToMe) . "</span>";
+    ?>
+  </div>
+  <div class='f-right'>
+    <?php
+    echo html::export2csv($lang->exportCSV, $lang->setFileName);
+    common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCase);
+    echo html::a($this->session->testtaskList, $lang->goback);
+    ?>
   </div>
 </div>
 
-<div class='yui-d0 <?php if($browseType == 'bymodule') echo 'yui-t1';?>' id='mainbox'>
-  <div class='yui-main'>
-    <div class='yui-b'>
+<table class='cont-lt1'>
+  <tr valign='top'>
+    <td class='side <?php echo $treeClass;?>'>
+      <div class='box-title'><?php echo $productName;?></div>
+      <div class='box-content'><?php echo $moduleTree;?></div>
+    </td>
+    <td class='divider <?php echo $treeClass;?>'></td>
+    <td>
       <form method='post' action='<?php echo inlink('batchAssign', "task=$task->id");?>' target='hiddenwin'>
       <table class='table-1 tablesorter datatable mb-zero fixed'>
         <thead>
@@ -109,15 +95,7 @@ function browseByModule(active)
         </tr>
       </table>
       </form>
-    </div>
-  </div>
-  <div class='yui-b  <?php if($browseType != 'bymodule') echo 'hidden';?>' id='treebox'>
-    <div class='box-title'><?php echo $productName;?></div>
-    <div class='box-content'><?php echo $moduleTree;?></div>
-  </div>
-</div>
-<script language="Javascript">
-$("#<?php echo $browseType;?>Tab").addClass('active');
-$("#module<?php echo $moduleID;?>").addClass('active'); 
-</script>
+    </td>
+  </tr>
+</table>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index edd5082eba..13c7531881 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -13,51 +13,44 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script language='Javascript'>
-function loadBuilds()
-{
-}
-</script>
-<div class='yui-d0'>
-  <form method='post' target='hiddenwin'>
-    <table class='table-1'> 
-      <caption><?php echo $lang->testtask->create;?></caption>
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->project;?></th>
-        <td><?php echo html::select('project', $projects, '', 'class=select-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->build;?></th>
-        <td><?php echo html::select('build', $builds, '', 'class=select-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
-        <td><?php echo html::select('owner', $users, '', 'class=select-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
-        <td><?php echo html::input('begin', '', "class='text-3 date'");?>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->end;?></th>
-        <td><?php echo html::input('end', '', "class='text-3 date'");?>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->status;?></th>
-        <td><?php echo html::select('status', $lang->testtask->statusList, '',  "class='select-3'");?>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->name;?></th>
-        <td><?php echo html::input('name', '', "class='text-1'");?>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->desc;?></th>
-        <td><?php echo html::textarea('desc', '', "rows=10 class='area-1'");?>
-      </tr>  
-      <tr>
-        <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?> </td>
-      </tr>
-    </table>
-  </form>
-</div>
+<form method='post' target='hiddenwin'>
+  <table class='table-1'> 
+    <caption><?php echo $lang->testtask->create;?></caption>
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->project;?></th>
+      <td><?php echo html::select('project', $projects, '', 'class=select-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->build;?></th>
+      <td><?php echo html::select('build', $builds, '', 'class=select-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
+      <td><?php echo html::select('owner', $users, '', 'class=select-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
+      <td><?php echo html::input('begin', '', "class='text-3 date'");?>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->end;?></th>
+      <td><?php echo html::input('end', '', "class='text-3 date'");?>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->status;?></th>
+      <td><?php echo html::select('status', $lang->testtask->statusList, '',  "class='select-3'");?>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->name;?></th>
+      <td><?php echo html::input('name', '', "class='text-1'");?>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->desc;?></th>
+      <td><?php echo html::textarea('desc', '', "rows=10 class='area-1'");?>
+    </tr>  
+    <tr>
+      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?> </td>
+    </tr>
+  </table>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 4252782d78..41aee9f0b6 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -13,46 +13,44 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='yui-d0'>
-  <form method='post' target='hiddenwin'>
-    <table class='table-1'> 
-      <caption><?php echo $lang->testtask->edit;?></caption>
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->project;?></th>
-        <td><?php echo html::select('project', $projects, $task->project, 'class=select-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->build;?></th>
-        <td><?php echo html::select('build', $builds, $task->build, 'class=select-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
-        <td><?php echo html::select('owner', $users, $task->owner, 'class=select-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
-        <td><?php echo html::input('begin', $task->begin, "class='text-3 date'");?>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->end;?></th>
-        <td><?php echo html::input('end', $task->end, "class='text-3 date'");?>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->status;?></th>
-        <td><?php echo html::select('status', $lang->testtask->statusList, $task->status,  "class='select-3'");?>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->name;?></th>
-        <td><?php echo html::input('name', $task->name, "class='text-1'");?>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->testtask->desc;?></th>
-        <td><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='area-1'");?>
-      </tr>  
-      <tr>
-        <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?> </td>
-      </tr>
-    </table>
-  </form>
-</div>
+<form method='post' target='hiddenwin'>
+  <table class='table-1'> 
+    <caption><?php echo $lang->testtask->edit;?></caption>
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->project;?></th>
+      <td><?php echo html::select('project', $projects, $task->project, 'class=select-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->build;?></th>
+      <td><?php echo html::select('build', $builds, $task->build, 'class=select-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->owner;?></th>
+      <td><?php echo html::select('owner', $users, $task->owner, 'class=select-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->begin;?></th>
+      <td><?php echo html::input('begin', $task->begin, "class='text-3 date'");?>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->end;?></th>
+      <td><?php echo html::input('end', $task->end, "class='text-3 date'");?>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->status;?></th>
+      <td><?php echo html::select('status', $lang->testtask->statusList, $task->status,  "class='select-3'");?>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->name;?></th>
+      <td><?php echo html::input('name', $task->name, "class='text-1'");?>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->testtask->desc;?></th>
+      <td><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='area-1'");?>
+    </tr>  
+    <tr>
+      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?> </td>
+    </tr>
+  </table>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index 077ed46c42..32c7d409c7 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -12,66 +12,55 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<script language="Javascript">
-function checkall(checker)
-{
-    $('input').each(function() 
-    {
-        $(this).attr("checked", checker.checked)
-    });
-}
-</script>
-<div class='yui-d0'>
-  <?php echo $searchForm;?>
-  <form method='post'>
-  <table class='table-1 colored tablesorter fixed'>
-    <caption class='caption-tl'>
-      <div class='f-left'><?php echo $lang->testtask->unlinkedCases;?></div>
-      <div class='f-right'><?php echo html::a($this->session->testtaskList, $lang->goback);?></div>
-    </caption>
-    <thead>
-    <tr class='colhead'>
-      <th class='w-id'><?php echo $lang->idAB;?></th>
-      <th class='w-pri'><?php echo $lang->priAB;?></th>
-      <th><?php echo $lang->testcase->title;?></th>
-      <th class='w-type'><?php echo $lang->testcase->type;?></th>
-      <th class='w-user'><?php echo $lang->openedByAB;?></th>
-      <th class='w-status'><?php echo $lang->statusAB;?></th>
-      <th class='w-100px'><nobr><?php echo $lang->testtask->linkVersion;?></nobr></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php foreach($cases as $case):?>
-    <tr class='a-center'>
-      <td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?></td>
-      <td><?php echo $case->pri?></td>
-      <td class='a-left'>
-        <?php
-        echo $case->title . ' ( ';
-        for($i = $case->version; $i >= 1; $i --)
-        {
-            echo html::a($this->createLink('testcase', 'view', "caseID=$case->id&version=$i"), "#$i", '_blank');
-        }
-        echo ')';
-        ?>
-      </td>
-      <td><?php echo $lang->testcase->typeList[$case->type];?></td>
-      <td><?php echo $users[$case->openedBy];?></td>
-      <td><?php echo $lang->testcase->statusList[$case->status];?></td>
-      <td class='a-left'><nobr>
-        <input type='checkbox' name='cases[]' value='<?php echo $case->id;?>' />
-        <?php echo html::select("versions[$case->id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'style=width:50px');?></nobr>
-      </td>
-    </tr>
-    </tbody>
-    <?php endforeach;?>
-    <tfoot> 
-    <tr>
-      <td colspan='6' class='a-center'><?php echo html::submitButton();?></td>
-      <td class='a-left'><input type='checkbox' onclick='checkall(this);'><?php echo $lang->selectAll;?></td>
-    </tr>
-    </tfoot>
-  </table>
-  </form>
-</div>  
+<?php echo $searchForm;?>
+<form method='post'>
+<table class='table-1 colored tablesorter fixed'>
+  <caption class='caption-tl'>
+    <div class='f-left'><?php echo $lang->testtask->unlinkedCases;?></div>
+    <div class='f-right'><?php echo html::a($this->session->testtaskList, $lang->goback);?></div>
+  </caption>
+  <thead>
+  <tr class='colhead'>
+    <th class='w-id'><?php echo $lang->idAB;?></th>
+    <th class='w-pri'><?php echo $lang->priAB;?></th>
+    <th><?php echo $lang->testcase->title;?></th>
+    <th class='w-type'><?php echo $lang->testcase->type;?></th>
+    <th class='w-user'><?php echo $lang->openedByAB;?></th>
+    <th class='w-status'><?php echo $lang->statusAB;?></th>
+    <th class='w-100px'><nobr><?php echo $lang->testtask->linkVersion;?></nobr></th>
+  </tr>
+  </thead>
+  <tbody>
+  <?php foreach($cases as $case):?>
+  <tr class='a-center'>
+    <td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?></td>
+    <td><?php echo $case->pri?></td>
+    <td class='a-left'>
+      <?php
+      echo $case->title . ' ( ';
+      for($i = $case->version; $i >= 1; $i --)
+      {
+          echo html::a($this->createLink('testcase', 'view', "caseID=$case->id&version=$i"), "#$i", '_blank');
+      }
+      echo ')';
+      ?>
+    </td>
+    <td><?php echo $lang->testcase->typeList[$case->type];?></td>
+    <td><?php echo $users[$case->openedBy];?></td>
+    <td><?php echo $lang->testcase->statusList[$case->status];?></td>
+    <td class='a-left'><nobr>
+      <input type='checkbox' name='cases[]' value='<?php echo $case->id;?>' />
+      <?php echo html::select("versions[$case->id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'style=width:50px');?></nobr>
+    </td>
+  </tr>
+  </tbody>
+  <?php endforeach;?>
+  <tfoot> 
+  <tr>
+    <td colspan='6' class='a-center'><?php echo html::submitButton();?></td>
+    <td class='a-left'><input type='checkbox' onclick='checkall(this);'><?php echo $lang->selectAll;?></td>
+  </tr>
+  </tfoot>
+</table>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 7d53123b1f..e96810bed2 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -11,30 +11,28 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<style>body{background:white}</style>
-<div class='yui-d0'>
-  <h1>CASE#<?php echo $run->case->id. $lang->colon . $run->case->title;?></h1>
-  <?php foreach($results as $result):?>
-  <table class='table-1'>
-  <caption>RESULT#<?php echo $result->id . ' ' . $result->date . " <span class='$result->caseResult'>" . $lang->testcase->resultList[$result->caseResult] . '</span>';?></caption>
-    <tr>
-      <th class='w-30px'><?php echo $lang->testcase->stepID;?></th>
-      <th class='w-p40'><?php echo $lang->testcase->stepDesc;?></th>
-      <th class='w-p20'><?php echo $lang->testcase->stepExpect;?></th>
-      <th><?php echo $lang->testcase->result;?></th>
-      <th class='w-p20'><?php echo $lang->testcase->real;?></th>
-    </tr>
-    <?php foreach($run->case->steps as $key => $step):?>
-    <?php $stepResult = (object)$result->stepResults[$step->id];?>
-    <tr>
-      <th><?php echo $key + 1;?></th>
-      <td><?php echo nl2br($step->desc);?></td>
-      <td><?php echo nl2br($step->expect);?></td>
-      <td class='<?php echo $stepResult->result;?> a-center'><?php echo $lang->testcase->resultList[$stepResult->result];?></td>
-      <td><?php echo $stepResult->real;?></td>
-    </tr>
-    <?php if($stepResult->result == 'blocked' or $stepResult->result == 'fail') break;?>
-    <?php endforeach;?>
-  </table>
+<h1>CASE#<?php echo $run->case->id. $lang->colon . $run->case->title;?></h1>
+<?php foreach($results as $result):?>
+<table class='table-1'>
+<caption>RESULT#<?php echo $result->id . ' ' . $result->date . " <span class='$result->caseResult'>" . $lang->testcase->resultList[$result->caseResult] . '</span>';?></caption>
+  <tr>
+    <th class='w-30px'><?php echo $lang->testcase->stepID;?></th>
+    <th class='w-p40'><?php echo $lang->testcase->stepDesc;?></th>
+    <th class='w-p20'><?php echo $lang->testcase->stepExpect;?></th>
+    <th><?php echo $lang->testcase->result;?></th>
+    <th class='w-p20'><?php echo $lang->testcase->real;?></th>
+  </tr>
+  <?php foreach($run->case->steps as $key => $step):?>
+  <?php $stepResult = (object)$result->stepResults[$step->id];?>
+  <tr>
+    <th><?php echo $key + 1;?></th>
+    <td><?php echo nl2br($step->desc);?></td>
+    <td><?php echo nl2br($step->expect);?></td>
+    <td class='<?php echo $stepResult->result;?> a-center'><?php echo $lang->testcase->resultList[$stepResult->result];?></td>
+    <td><?php echo $stepResult->real;?></td>
+  </tr>
+  <?php if($stepResult->result == 'blocked' or $stepResult->result == 'fail') break;?>
   <?php endforeach;?>
+</table>
+<?php endforeach;?>
 </div>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 38b64b2272..3c2cf2cd3c 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -11,9 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<style>body{background:white}</style>
-<div class='yui-d0'>
-  <form method='post'>
+<form method='post'>
   <table class='table-1'>
     <caption class='caption-tl'>CASE#<?php echo $run->case->id. $lang->colon . $run->case->title;?></caption>
     <tr class='colhead'>
@@ -45,5 +43,5 @@
       </td>
     </tr>
   </table>
-  </form>
-</div>
+</form>
+<?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 8ba8f7a24d..f5fec182c4 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -12,55 +12,53 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<div class='yui-d0'>
-  <table class='table-1'> 
-    <caption><?php echo $lang->testtask->view;?></caption>
-    <tr>
-      <th class='rowhead'><?php echo $lang->testtask->name;?></th>
-      <td class='<?php if($task->deleted) echo 'deleted';?>'><?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->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>  
-  </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::printLink('testtask', 'cases',    "taskID=$task->id", $lang->testtask->cases);
-        common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCaseAB);
-        common::printLink('testtask', 'edit',   "taskID=$task->id", $lang->edit);
-        common::printLink('testtask', 'delete', "taskID=$task->id", $lang->delete, 'hiddenwin');
-    }
-    echo html::a($browseLink, $lang->goback);
-    ?>
-  </div>
-  <?php include '../../common/view/action.html.php';?>
+<table class='table-1'> 
+  <caption><?php echo $lang->testtask->view;?></caption>
+  <tr>
+    <th class='rowhead'><?php echo $lang->testtask->name;?></th>
+    <td class='<?php if($task->deleted) echo 'deleted';?>'><?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->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>  
+</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::printLink('testtask', 'cases',    "taskID=$task->id", $lang->testtask->cases);
+      common::printLink('testtask', 'linkcase', "taskID=$task->id", $lang->testtask->linkCaseAB);
+      common::printLink('testtask', 'edit',   "taskID=$task->id", $lang->edit);
+      common::printLink('testtask', 'delete', "taskID=$task->id", $lang->delete, 'hiddenwin');
+  }
+  echo html::a($browseLink, $lang->goback);
+  ?>
 </div>
+<?php include '../../common/view/action.html.php';?>
 <?php include '../../common/view/footer.html.php';?>