From a4cfb2b94036d72e70ae767eafb914ab012e77d1 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Thu, 26 Apr 2012 07:50:14 +0000
Subject: [PATCH] * code for task#769

---
 module/story/css/edit.css          | 2 +-
 module/story/lang/en.php           | 2 +-
 module/story/lang/zh-cn.php        | 2 +-
 module/story/view/edit.html.php    | 2 +-
 module/task/css/edit.css           | 1 +
 module/task/lang/en.php            | 1 +
 module/task/lang/zh-cn.php         | 1 +
 module/task/view/activate.html.php | 2 +-
 module/task/view/assignto.html.php | 2 +-
 module/task/view/create.html.php   | 2 +-
 module/task/view/edit.html.php     | 6 +++---
 module/task/view/finish.html.php   | 2 +-
 module/task/view/start.html.php    | 4 ++--
 13 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/module/story/css/edit.css b/module/story/css/edit.css
index bfc147bd41..f93017f51d 100644
--- a/module/story/css/edit.css
+++ b/module/story/css/edit.css
@@ -1,2 +1,2 @@
 #module, #plan {width:90%}
-.estimate {width:80%}
+.hour {width:70%}
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index ffd28062a9..8468b96bcd 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -41,8 +41,8 @@ $lang->story->verify         = 'Verify';
 $lang->story->type           = 'Type ';
 $lang->story->pri            = 'Priority';
 $lang->story->estimate       = 'Estimate';
-$lang->story->hour           = 'Hour';
 $lang->story->estimateAB     = 'Estimate';
+$lang->story->hour           = 'Hour';
 $lang->story->status         = 'Status';
 $lang->story->stage          = 'Stage';
 $lang->story->stageAB        = 'Stage';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index d70f1309a0..08edbf20ce 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -41,8 +41,8 @@ $lang->story->verify         = '验收标准';
 $lang->story->type           = '需求类型 ';
 $lang->story->pri            = '优先级';
 $lang->story->estimate       = '预计工时';
-$lang->story->hour           = '小时';
 $lang->story->estimateAB     = '预计';
+$lang->story->hour           = '小时';
 $lang->story->status         = '当前状态';
 $lang->story->stage          = '所处阶段';
 $lang->story->stageAB        = '阶段';
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 1ff471a9f4..0a46bb37d3 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -73,7 +73,7 @@
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->story->estimate;?></td>
-            <td><?php echo html::input('estimate', $story->estimate, 'class=estimate') . $lang->story->hour;?></td>
+            <td><?php echo html::input('estimate', $story->estimate, "class='text-1 hour'") . $lang->story->hour;?></td>
           </tr>
           <tr>
             <td class='rowhead'><?php echo $lang->story->keywords;?></td>
diff --git a/module/task/css/edit.css b/module/task/css/edit.css
index ccdb369518..ed5e091844 100644
--- a/module/task/css/edit.css
+++ b/module/task/css/edit.css
@@ -1,3 +1,4 @@
 #story    {width:220px}
 .select-1 {width:220px}
 .text-1   {width:215px}
+.hour     {width:70%}
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 59a3be548f..3fb9d4befd 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -43,6 +43,7 @@ $lang->task->left           = 'Left';
 $lang->task->leftAB         = 'Left';
 $lang->task->consumed       = 'Consumed';
 $lang->task->consumedAB     = 'Use';
+$lang->task->hour           = 'Hour';
 $lang->task->deadline       = 'Deadline';
 $lang->task->deadlineAB     = 'Deadline';
 $lang->task->status         = 'Status';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 20cb2bd6b1..25dbaa9768 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -43,6 +43,7 @@ $lang->task->left           = '预计剩余';
 $lang->task->leftAB         = '剩';
 $lang->task->consumed       = '已经消耗';
 $lang->task->consumedAB     = '耗';
+$lang->task->hour           = '小时';
 $lang->task->deadline       = '截止日期';
 $lang->task->deadlineAB     = '截止';
 $lang->task->status         = '任务状态';
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index b3d76c6e93..c33c25105a 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -20,7 +20,7 @@
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->task->left;?></th>
-      <td><?php echo html::input('left', '', "class='text-3'");?></td>
+      <td><?php echo html::input('left', '', "class='text-3'") . $lang->task->hour;?></td>
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index f4d842d250..3228c42469 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -20,7 +20,7 @@
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->task->left;?></th>
-      <td><?php echo html::input('left', $task->left, "class='text-3'");?></td>
+      <td><?php echo html::input('left', $task->left, "class='text-3'") . $lang->task->hour;?></td>
     </tr>  
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 5c51705154..b475552ba2 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -56,7 +56,7 @@ $(function(){
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->task->estimate;?></th>
-      <td><?php echo html::input('estimate', '', "class='text-3'");?></td>
+      <td><?php echo html::input('estimate', '', "class='text-3'") . $lang->task->hour;?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->task->deadline;?></th>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index b032a061fa..78c84b814a 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -89,15 +89,15 @@
           </tr>  
           <tr>
             <th class='rowhead w-p20'><?php echo $lang->task->estimate;?></th>
-            <td><?php echo html::input('estimate', $task->estimate, "class='text-1'");?></td>
+            <td><?php echo html::input('estimate', $task->estimate, "class='text-1 hour'") . $lang->task->hour;?></td>
           </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->consumed;?></th>
-            <td><?php echo html::input('consumed', $task->consumed, "class='text-1'");?></td>
+            <td><?php echo html::input('consumed', $task->consumed, "class='text-1 hour'") . $lang->task->hour;?></td>
           </tr>  
           <tr>
             <th class='rowhead'><?php echo $lang->task->left;?></th>
-            <td><?php echo html::input('left', $task->left, "class='text-1'");?></td>
+            <td><?php echo html::input('left', $task->left, "class='text-1 hour'") . $lang->task->hour;?></td>
           </tr>
         </table>
       </fieldset>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 888b9d6574..d7dca9d9fe 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -16,7 +16,7 @@
     <caption><?php echo $task->name;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->task->consumed;?></th>
-      <td><?php echo html::input('consumed', $task->consumed, "class='text-3'");?></td>
+      <td><?php echo html::input('consumed', $task->consumed, "class='text-3'") . $lang->task->hour;?></td>
     </tr>  
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 500e173e9d..941e247b93 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -16,11 +16,11 @@
     <caption><?php echo $task->name;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->task->consumed;?></th>
-      <td><?php echo html::input('consumed', $task->consumed, "class='text-3'");?></td>
+      <td><?php echo html::input('consumed', $task->consumed, "class='text-3'") . $lang->task->hour;?></td>
     </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->task->left;?></th>
-      <td><?php echo html::input('left', $task->left, "class='text-3'");?></td>
+      <td><?php echo html::input('left', $task->left, "class='text-3'") . $lang->task->hour;?></td>
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>