From 51920ba04e829f59db0989b72fa5ccefebecd04d Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Fri, 26 Mar 2010 06:32:49 +0000
Subject: [PATCH]  * adjust the fields, add help link.

---
 module/bug/view/activate.html.php          |  2 +-
 module/bug/view/close.html.php             |  2 +-
 module/bug/view/create.html.php            |  2 +-
 module/bug/view/edit.html.php              |  8 +++++---
 module/bug/view/resolve.html.php           |  2 +-
 module/common/lang/zh-cn.php               |  1 +
 module/file/view/buildform.html.php        |  2 +-
 module/group/view/copy.html.php            |  4 ++--
 module/group/view/edit.html.php            |  4 ++--
 module/my/view/editprofile.html.php        |  4 ++--
 module/project/view/managemembers.html.php | 16 ++++++++--------
 module/story/lang/zh-cn.php                |  2 +-
 module/story/view/change.html.php          |  2 +-
 module/story/view/close.html.php           |  2 +-
 module/story/view/create.html.php          |  2 +-
 module/story/view/edit.html.php            |  2 +-
 module/story/view/review.html.php          |  2 +-
 module/task/view/create.html.php           | 12 ++++++++----
 module/task/view/edit.html.php             |  4 ++--
 module/todo/view/create.html.php           |  2 +-
 module/user/view/login.html.php            |  2 +-
 21 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 6a4fa34194..c2bd8015b6 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -37,7 +37,7 @@
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><textarea name='comment' rows='6' class='area-1'></textarea></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->bug->files;?></th>
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index a2fd397156..a471cd946d 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -29,7 +29,7 @@
     <caption><?php echo $bug->title;?></caption>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><textarea name='comment' rows='6' class='area-1'></textarea></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 8f03c43048..84284b943d 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -168,7 +168,7 @@ $(function() {
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->bug->steps;?></th>
-        <td><textarea name='steps' class='area-1' rows='6'><?php echo $steps;?></textarea></td>
+        <td><?php echo html::textarea('steps', '', "class='area-1' rows='6'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->bug->files;?></th>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index f8f6c174e3..bde95ed923 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -25,7 +25,9 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/autocomplete.html.php';?>
 <style>
-#product, #module, #project, #story, #task, #resolvedBuild{width:245px}
+#product, #module, #project, #story, #task, #resolvedBuild{width:230px}
+.select-3 {width:230px}
+.text-3   {width:225px}
 </style>
 <script language='Javascript'>
 changeProductConfirmed = false;
@@ -159,11 +161,11 @@ $(function() {
         <tr class='bd-none'><td class='bd-none'>
           <fieldset>
           <legend><?php echo $lang->bug->legendSteps;?></legend>
-            <textarea name='steps' rows='8' class='area-1'><?php echo $bug->steps;?></textarea>
+            <?php echo html::textarea('steps', $bug->steps, "rows='8' class='area-1'");?>
           </fieldset>
           <fieldset>
           <legend><?php echo $lang->bug->legendComment;?></legend>
-            <textarea name='comment' rows='6' class='area-1'></textarea>
+            <?php echo html::textarea('comment', '', "rows='6' class='area-1'");?>
           </fieldset>
           <fieldset>
           <legend><?php echo $lang->bug->legendAttatch;?></legend>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index e96b9cd019..7a1bd04ab2 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -58,7 +58,7 @@ function setDuplicate(resolution)
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><textarea name='comment' rows='6' class='area-1'></textarea></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 9ef0620815..0750ab5943 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -56,6 +56,7 @@ $lang->addFiles   = '上传了附件 ';
 $lang->files      = '附件 ';
 $lang->workingHour= '工时';
 $lang->preview    = '预览';
+$lang->showHelp   = '显示帮助';
 
 /* 主导航菜单。*/
 $lang->menu->index   = '首页|index|index';
diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php
index 1c9d961d9c..0a89a961a6 100644
--- a/module/file/view/buildform.html.php
+++ b/module/file/view/buildform.html.php
@@ -1,7 +1,7 @@
 <div id='fileform'>
 <?php for($i = 0; $i < $fileCount; $i ++):?>
 <input type='file' name='files[]' id="file<?php echo $i;?>"  tabindex='-1' />
-<label id='label<?php echo $i;?>' tabindex='-1'><?php echo $lang->file->label;?></label><input type='text' name='labels[]' class='text-3' tabindex='-1' /><br />
+<label id='label<?php echo $i;?>' tabindex='-1'><?php echo $lang->file->label;?></label><input type='text' id='label<?php echo $i;?>' name='labels[]' class='text-3' tabindex='-1' /><br />
 <?php endfor;?>
 </div>
 <script language='javascript'>
diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php
index 9e76035700..f94c04a43b 100644
--- a/module/group/view/copy.html.php
+++ b/module/group/view/copy.html.php
@@ -29,11 +29,11 @@
       <caption><?php echo $lang->group->copy;?></caption>
       <tr>
         <th class='rowhead'><?php echo $lang->group->name;?></th>
-        <td><input type='text' name='name' value="<?php echo $group->name;?>"  class='text-1' /></td>
+        <td><?php echo html::input('name', $group->name, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->group->desc;?></th>
-        <td><textarea name='desc' rows='5' class='area-1'><?php echo $group->desc;?></textarea></td>
+        <td><?php echo html::textarea('desc', $group->desc, "rows='5' class='area-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->group->option;?></th>
diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php
index ebd36dcddd..f39d8bec0a 100644
--- a/module/group/view/edit.html.php
+++ b/module/group/view/edit.html.php
@@ -29,11 +29,11 @@
       <caption><?php echo $lang->group->edit;?></caption>
       <tr>
         <th class='rowhead'><?php echo $lang->group->name;?></th>
-        <td><input type='text' name='name' value="<?php echo $group->name;?>"  class='text-1' /></td>
+        <td><?php echo html::input('name', $group->name, "class='text-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->group->desc;?></th>
-        <td><textarea name='desc' rows='5' class='area-1'><?php echo $group->desc;?></textarea></td>
+        <td><?php echo html::textarea('desc', $group->desc, "rows='5' class='area-1'");?></td>
       </tr>  
       <tr><td colspan='2' class='a-center'><?php echo html::submitButton();?></td></tr>
     </table>
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php
index bfc9c1ed8c..156f52957b 100644
--- a/module/my/view/editprofile.html.php
+++ b/module/my/view/editprofile.html.php
@@ -45,11 +45,11 @@
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->password;?></th>
-        <td><input type='password' name='password1' /></td>
+        <td><?php echo html::password('password1');?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->user->password2;?></th>
-        <td><input type='password' name='password2' /></td>
+        <td><?php echo html::password('password2');?></td>
       </tr>  
       <tr>
         <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td>
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 58cb0a8374..31fffc97e6 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -23,22 +23,22 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='doc3'>
+<div class='yui-d0'>
   <form method='post'>
-    <table align='center' class='table-3'> 
+    <table align='center' class='table-4 a-center'> 
       <caption><?php echo $lang->project->manageMembers;?></caption>
       <tr>
         <th><?php echo $lang->team->account;?></th>
         <th><?php echo $lang->team->role;?></th>
         <th><?php echo $lang->team->workingHour;?></th>
       </tr>
-      <?php foreach($members as $member):?>
+      <?php foreach($members as $key => $member):?>
       <?php unset($users[$member->account]);?>
       <tr>
-        <td><input type='text' name='accounts[]' value='<?php echo $member->account;?>' readonly class='text-2' /></td>
-        <td><input type='text' name='roles[]'    value='<?php echo $member->role;?>' class='text-2' /></td>
+        <td><input type='text' name='accounts[]' id='account<?php echo $key;?>' value='<?php echo $member->account;?>' readonly class='text-2' /></td>
+        <td><input type='text' name='roles[]'    id='role<?php echo $key;?>'    value='<?php echo $member->role;?>' class='text-2' /></td>
         <td>
-          <input type='text'   name='workingHours[]' value='<?php echo $member->workingHour;?>' class='text-2' />
+          <input type='text'   name='workingHours[]' id='workingHour<?php echo $key;?>' value='<?php echo $member->workingHour;?>' class='text-2' />
           <input type='hidden' name='modes[]'        value='update' />
         </td>
       </tr>
@@ -51,9 +51,9 @@
       <?php for($i = 0; $i < $count; $i ++):?>
       <tr>
         <td><?php echo html::select('accounts[]', $users, '', 'class=select-2');?></td>
-        <td><input type='text' name='roles[]' class='text-2' /></td>
+        <td><input type='text' name='roles[]' id='role<?php echo ($key + $i);?>' class='text-2' /></td>
         <td>
-          <input type='text'   name='workingHours[]' class='text-2' />
+          <input type='text'   name='workingHours[]' id='workingHour<?php echo ($key + $i);?>' class='text-2' />
           <input type='hidden' name='modes[]' value='create' />
         </td>
       </tr>
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 0b4e01aaa5..6f02981b6d 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -122,7 +122,7 @@ $lang->story->legendHistory        = '历史记录';
 $lang->story->legendVersion        = '历史版本';
 $lang->story->legendMisc           = '其他相关';
 
-$lang->story->specTemplate          = "建议参考的模板：<br />作为一名<<i class='red'>某种类型的用户</i>><br />我希望<<i class='red'>达成某些目的</i>><br />这样可以<<i class='red'>开发的价值</i>>";
+$lang->story->specTemplate          = "建议参考的模板：作为一名<<i class='red'>某种类型的用户</i>>，我希望<<i class='red'>达成某些目的</i>>，这样可以<<i class='red'>开发的价值</i>>。";
 $lang->story->needNotReview         = '不需要评审';
 $lang->story->confirmDelete         = "您确认删除该需求吗?";
 $lang->story->errorFormat           = '需求数据有误';
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index ccf87b9ad1..61b979e1c9 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -29,7 +29,7 @@
     <caption><?php echo $lang->story->change;?></caption>
     <tr>
       <th class='rowhead'><?php echo $lang->story->reviewedBy;?></th>
-      <td><?php echo html::select('assignedTo', $users, $story->reviewedBy, 'class="select-3"') . html::checkbox('needNotReview', $lang->story->needNotReview);?></td>
+      <td><?php echo html::select('assignedTo', $users, $story->reviewedBy, 'class="select-3"') . html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview'");?></td>
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->story->title;?></th>
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index 3e90a84f15..1df0eab627 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -61,7 +61,7 @@ function setStory(reason)
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->story->comment;?></th>
-      <td><textarea rows='8' name='comment' class='area-1'></textarea></td>
+      <td><?php echo html::textarea('comment', '', "rows='8' class='area-1'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 92bd3598ef..e7bf76fbcd 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -49,7 +49,7 @@
       </tr> 
       <tr>
         <th class='rowhead'><?php echo $lang->story->reviewedBy;?></th>
-        <td><?php echo html::select('assignedTo', $users, '', 'class=select-3') . html::checkbox('needNotReview', $lang->story->needNotReview);?></td>
+        <td><?php echo html::select('assignedTo', $users, '', 'class=select-3') . html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->story->title;?></th>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 83a1aa197d..aa47969d7e 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -43,7 +43,7 @@
       </fieldset>
       <fieldset>
         <legend><?php echo $lang->story->comment;?></legend>
-        <textarea name='comment' rows='5' class='area-1'></textarea>
+        <?php echo html::textarea('comment', '', "rows='5' class='area-1'");?>
       </fieldset>
       <div class='a-center'><?php echo html::submitButton() .  html::linkButton($lang->goback, inlink('view', "storyID=$story->id"));?></div>
       <?php include '../../common/view/action.html.php';?>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php
index b6a3aaf78f..873518deda 100644
--- a/module/story/view/review.html.php
+++ b/module/story/view/review.html.php
@@ -111,7 +111,7 @@ function setStory(reason)
     </tr>
     <tr>
       <th class='rowhead'><?php echo $lang->story->comment;?></th>
-      <td><textarea rows='8' name='comment' class='area-1'></textarea></td>
+      <td><?php echo html::textarea('comment', '', "rows='8' class='area-1'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 6e2d6626e0..a202aee223 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -70,11 +70,15 @@ $(document).ready(function()
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->task->name;?></th>
-        <td><input type='text' name='name' id='name' class='text-1' /><?php echo html::commonButton($lang->task->copyStoryTitle, 'onclick=copyStoryTitle()');?></td>
+        <td>
+          <?php
+          echo html::input('name', '', "class='text-1'");
+          echo html::commonButton($lang->task->copyStoryTitle, 'onclick=copyStoryTitle()');?>
+        </td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->task->desc;?></th>
-        <td><textarea name='desc' rows='5' class='area-1'></textarea>
+        <td><?php echo html::textarea('desc', '', "rows='5' class='area-1'");?></td>
       </tr>  
       <tr>
         <th class='rowhead'><?php echo $lang->files;?></th>
@@ -86,11 +90,11 @@ $(document).ready(function()
       </tr> 
       <tr>
         <th class='rowhead'><?php echo $lang->task->estimate;?></th>
-        <td><input type='text' name='estimate' id='estimate' class='text-3' /></td>
+        <td><?php echo html::input('estimate', '', "class='text-3'");?></td>
       </tr>
       <tr>
         <th class='rowhead'><?php echo $lang->task->deadline;?></th>
-        <td><input type='text' name='deadline' class='text-3 date' /></td>
+        <td><?php echo html::input('deadline', '', "class='text-3 date'");?></td>
       </tr>
       <tr>
         <th class='rowhead'><?php echo $lang->task->type;?></th>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 1820fec8a2..a76a772d85 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -94,11 +94,11 @@
         </tr>  
         <tr>
           <th class='rowhead'><?php echo $lang->task->consumed;?></th>
-          <td><input type='text' name='consumed' value='<?php echo $task->consumed;?>' class='text-1' /></td>
+          <td><?php echo html::input('consumed', $task->consumed, "class='text-1'");?></td>
         </tr>  
         <tr>
           <th class='rowhead'><?php echo $lang->task->left;?></th>
-          <td><input type='text' name='left' value='<?php echo $task->left;?>' class='text-1' /></td>
+          <td><?php echo html::input('left', $task->left, "class='text-1'");?></td>
         </tr>
       </table>
     </fieldset>
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index dd7d3484ad..994f716439 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -56,7 +56,7 @@
         <th class='rowhead'><?php echo $lang->todo->beginAndEnd;?></th>
         <td>
           <?php echo html::select('begin', $times, $time, 'onchange=selectNext(); class=select-2') . html::select('end', $times, '', 'class=select-2');?>
-          <input type='checkbox' onclick='switchDateFeature(this);'><?php echo $lang->todo->lblDisableDate;?>
+          <input type='checkbox' id='switchDate' onclick='switchDateFeature(this);'><?php echo $lang->todo->lblDisableDate;?>
         </td>
       </tr>  
       <tr>
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index 2934a89ab4..008d3a44e8 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -49,7 +49,7 @@ $themeRoot   = $webRoot . "theme/";
       <caption><?php printf($lang->welcome, $app->company->name);?></caption>
       <tr>
         <th><?php echo $lang->user->account;?></th>  
-        <td><input type='text' name='account' id='account' /></td>
+        <td><input type='text' name='account' /></td>
       </tr>  
       <tr>
         <th><?php echo $lang->user->password;?></th>