From 0c2f995ffa48b17daa2367c4a88b59eb0d6ddd67 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Tue, 1 May 2012 14:11:22 +0000
Subject: [PATCH]  * adjust the testtask-cases page's style.

---
 module/testtask/lang/en.php         | 18 +++++++++---------
 module/testtask/lang/zh-cn.php      | 18 +++++++++---------
 module/testtask/view/cases.html.php | 16 +++++++++-------
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 44e4ef0a69..bc6f17feb6 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -17,11 +17,11 @@ $lang->testtask->edit           = "Edit";
 $lang->testtask->browse         = "Testtask browse";
 $lang->testtask->linkCase       = "Link case";
 $lang->testtask->linkCaseAB     = "Link";
-$lang->testtask->unlinkCase     = "Remove";
+$lang->testtask->unlinkCase     = "Del";
 $lang->testtask->batchAssign    = "Batch Assign";
 $lang->testtask->runCase        = "Run";
 $lang->testtask->results        = "Result";
-$lang->testtask->createBug      = "Create bug";
+$lang->testtask->createBug      = "Bug(+)";
 $lang->testtask->assign         = 'Assign';
 $lang->testtask->cases          = 'Cases';
 
@@ -36,19 +36,19 @@ $lang->testtask->begin          = 'Begin';
 $lang->testtask->end            = 'End';
 $lang->testtask->desc           = 'Desc';
 $lang->testtask->status         = 'Status';
-$lang->testtask->assignedTo     = 'Assigned to';
-$lang->testtask->linkVersion    = 'Link(version)';
-$lang->testtask->lastRunAccount = "Run account";
-$lang->testtask->lastRunTime    = 'Last run';
-$lang->testtask->lastRunResult  = 'Last result';
+$lang->testtask->assignedTo     = 'Assign';
+$lang->testtask->linkVersion    = 'Version';
+$lang->testtask->lastRunAccount = "Run";
+$lang->testtask->lastRunTime    = 'Time';
+$lang->testtask->lastRunResult  = 'Result';
 
 $lang->testtask->statusList['wait']    = 'Pending';
 $lang->testtask->statusList['doing']   = 'In progress';
 $lang->testtask->statusList['done']    = 'Done';
 $lang->testtask->statusList['blocked'] = 'Blocked';
 
-$lang->testtask->unlinkedCases = 'Unlinked cases';
-$lang->testtask->linkedCases   = 'Linked cases';
+$lang->testtask->unlinkedCases = 'Unlinked';
+$lang->testtask->linkedCases   = 'Linked';
 $lang->testtask->linkByStory   = 'Link by story';
 $lang->testtask->linkByBug     = 'Link by bug';
 $lang->testtask->confirmDelete = 'Are you sure to delete this test task?';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index e9421cacc7..f55c31eac0 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -21,7 +21,7 @@ $lang->testtask->unlinkCase     = "移除";
 $lang->testtask->batchAssign    = "批量指派";
 $lang->testtask->runCase        = "执行";
 $lang->testtask->results        = "结果";
-$lang->testtask->createBug      = "创建Bug";
+$lang->testtask->createBug      = "提Bug";
 $lang->testtask->assign         = '指派';
 $lang->testtask->cases          = '用例';
 
@@ -37,20 +37,20 @@ $lang->testtask->end            = '结束日期';
 $lang->testtask->desc           = '任务描述';
 $lang->testtask->status         = '当前状态';
 $lang->testtask->assignedTo     = '指派给';
-$lang->testtask->linkVersion    = '关联(版本)';
-$lang->testtask->lastRunAccount = '最后执行人';
-$lang->testtask->lastRunTime    = '最后执行时间';
-$lang->testtask->lastRunResult  = '最终结果';
+$lang->testtask->linkVersion    = '版本';
+$lang->testtask->lastRunAccount = '执行人';
+$lang->testtask->lastRunTime    = '执行时间';
+$lang->testtask->lastRunResult  = '结果';
 
 $lang->testtask->statusList['wait']    = '未开始';
 $lang->testtask->statusList['doing']   = '进行中';
 $lang->testtask->statusList['done']    = '已完成';
 $lang->testtask->statusList['blocked'] = '被阻塞';
 
-$lang->testtask->unlinkedCases = '未关联用例列表';
-$lang->testtask->linkedCases   = '已关联用例列表';
-$lang->testtask->linkByStory   = '按需求关联用例';
-$lang->testtask->linkByBug     = '按Bug关联用例';
+$lang->testtask->unlinkedCases = '未关联';
+$lang->testtask->linkedCases   = '已关联';
+$lang->testtask->linkByStory   = '按需求关联';
+$lang->testtask->linkByBug     = '按Bug关联';
 $lang->testtask->confirmDelete = '您确认要删除该测试任务吗？';
 $lang->testtask->passAll       = '全部通过';
 $lang->testtask->pass          = '通过';
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index a493100a56..97e9389058 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -50,13 +50,13 @@ var moduleID   = '<?php echo $moduleID;?>';
             <th class='w-id'><nobr><?php echo $lang->idAB;?></nobr></th>
             <th class='w-pri'><?php echo $lang->priAB;?></th>
             <th><?php echo $lang->testcase->title;?></th>
-            <th><?php echo $lang->testcase->type;?></th>
-            <th class='w-100px'><?php echo $lang->testtask->assignedTo;?></th>
-            <th class='w-100px'><?php echo $lang->testtask->lastRunAccount;?></th>
+            <th class='w-type'><?php echo $lang->testcase->type;?></th>
+            <th class='w-user'><?php echo $lang->testtask->assignedTo;?></th>
+            <th class='w-user'><?php echo $lang->testtask->lastRunAccount;?></th>
             <th class='w-100px'><?php echo $lang->testtask->lastRunTime;?></th>
             <th class='w-80px'><?php echo $lang->testtask->lastRunResult;?></th>
             <th class='w-status'><?php echo $lang->statusAB;?></th>
-            <th class='w-160px {sorter: false}'><?php echo $lang->actions;?></th>
+            <th class='w-140px {sorter: false}'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody>
@@ -86,9 +86,11 @@ var moduleID   = '<?php echo $moduleID;?>';
         <?php if($canBatchAssign):?>
         <tfoot>
           <tr>
-            <td colspan='9'>
-              <div class='half-left'><?php echo html::selectAll() . html::selectReverse();?> </div>
-              <div class='half-right'><?php echo html::select('assignedTo', $users) . html::submitButton($lang->testtask->assign); ?></div>
+            <td colspan='10'>
+              <?php 
+              echo html::selectAll() . html::selectReverse();
+              echo html::select('assignedTo', $users) . html::submitButton($lang->testtask->assign); 
+              ?>
             </td>
           </tr>
         <tfoot>