From d0bee531e62bec7fe239e898ec64aeb453138d22 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Thu, 27 Jun 2013 08:57:54 +0000
Subject: [PATCH]  * code for task#1424.

---
 module/bug/view/m.activate.html.php   | 21 ++++++++++++---
 module/bug/view/m.close.html.php      | 11 ++++++--
 module/bug/view/m.confirmbug.html.php | 16 +++++++++---
 module/bug/view/m.resolve.html.php    | 37 ++++++++++++++++++++-------
 4 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/module/bug/view/m.activate.html.php b/module/bug/view/m.activate.html.php
index 75cd1eda30..a45456c10c 100755
--- a/module/bug/view/m.activate.html.php
+++ b/module/bug/view/m.activate.html.php
@@ -1,10 +1,23 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
 <form method='post' enctype='multipart/form-data' target='hiddenwin'>
-  <div><?php echo $bug->title;?></caption>
-  <div><?php echo $lang->bug->assignedTo . html::select('assignedTo', $users, $bug->resolvedBy, 'class=select-3');?></div>
-  <div><?php echo $lang->bug->openedBuild . html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class=select-3');?></div>
-  <div><?php echo html::textarea('comment', '', "rows='6' class='area-1' placeholder=$lang->comment");?></div>
+  <h3><?php echo "BUG#$bug->id $bug->title";?></h3>
+
+  <table class='table-1'>
+    <tr>
+      <td class='w-80px'><?php echo $lang->bug->assignedTo?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->resolvedBy, 'class=select-3');?></td>
+    </tr>
+    <tr>
+      <td class='w-80px'><?php echo $lang->bug->openedBuild;?></td>
+      <td><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class=select-3');?></td>
+    </tr>
+    <tr>
+      <td class='w-80px'><?php echo $lang->comment;?></td>
+      <td><?php echo html::textarea('comment', '');?></td>
+    </tr>
+  </table>
+
   <div class='a-center'>
   <?php echo html::submitButton($lang->bug->buttonConfirm, 'data-inline="true" data-theme="b"');?>
   <?php echo html::backButton("data-inline='true'");?>
diff --git a/module/bug/view/m.close.html.php b/module/bug/view/m.close.html.php
index d5eb30ba89..485efb984a 100755
--- a/module/bug/view/m.close.html.php
+++ b/module/bug/view/m.close.html.php
@@ -1,8 +1,15 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
 <form method='post' target='hiddenwin'>
-  <div><?php echo $bug->title;?></div>
-  <div><?php echo html::textarea('comment', '', "rows='6' class='area-1' placeholder=$lang->comment");?></div>
+  <h3><?php echo "BUG#$bug->id $bug->title";?></h3>
+
+  <table class='table-1'>
+    <tr>
+      <td class='w-60px'><?php echo $lang->comment;?></td>
+      <td><?php echo html::textarea('comment', '');?></td>
+    </tr>
+  </table>
+
   <div class='a-center'>
   <?php echo html::submitButton('', 'data-inline="true" data-theme="b"');?>
   <?php echo html::backButton("data-inline='true'");?>
diff --git a/module/bug/view/m.confirmbug.html.php b/module/bug/view/m.confirmbug.html.php
index 705a700d0d..a31b037376 100755
--- a/module/bug/view/m.confirmbug.html.php
+++ b/module/bug/view/m.confirmbug.html.php
@@ -1,9 +1,19 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
 <form method='post' target='hiddenwin'>
-  <div><?php echo $bug->title;?></div>
-  <div><?php echo $lang->bug->assignedTo . html::select('assignedTo', $users, $bug->assignedTo, "class='text-3'");?></div>
-  <div><?php echo $lang->comment . html::textarea('comment', '', "rows='6' class='area-1'");?></div>
+  <h3><?php echo "BUG#$bug->id $bug->title";?></h3>
+
+  <table class='table-1'>
+    <tr>
+      <td class='w-60px'><?php echo $lang->bug->assignedTo;?></td>
+      <td><?php echo html::select('assignedTo', $users, $bug->assignedTo);?></td>
+    </tr>
+    <tr>
+      <td class='w-60px'><?php echo $lang->comment;?></td>
+      <td><?php echo html::textarea('comment', '');?></td>
+    </tr>
+  </table>
+
   <div class='a-center'>
   <?php echo html::submitButton($lang->bug->buttonConfirm, 'data-inline="true" data-theme="b"');?>
   <?php echo html::backButton("data-inline='true'");?>
diff --git a/module/bug/view/m.resolve.html.php b/module/bug/view/m.resolve.html.php
index 8bfd27ec11..2244a3205c 100755
--- a/module/bug/view/m.resolve.html.php
+++ b/module/bug/view/m.resolve.html.php
@@ -1,16 +1,35 @@
 <?php include '../../common/view/m.header.html.php';?>
 </div>
 <form method='post' target='hiddenwin'>
-  <div><?php echo $bug->title;?></div>
-  <div><?php unset($lang->bug->resolutionList['tostory']); echo $lang->bug->resolution . html::select('resolution', $lang->bug->resolutionList, '', 'class=select-3 onchange=setDuplicate(this.value)');?></div>
-  <div id='duplicateBugBox' style='display:none'>
-    <div><?php echo $lang->bug->duplicateBug . html::input('duplicateBug', '', 'class=text-3');?></div>
-  </div>
+  <h3><?php echo "BUG#$bug->id $bug->title";?></h3>
+
+  <table class='table-1'>
+    <tr>
+      <td class='w-80px'><?php unset($lang->bug->resolutionList['tostory']); echo $lang->bug->resolution ;?></td>
+      <td><?php echo html::select('resolution', $lang->bug->resolutionList, '', 'class=select-3 onchange=setDuplicate(this.value)');?></div>
+    </tr>
+    <tr id='duplicateBugBox' style='display:none'>
+      <td class='w-80px'><?php echo $lang->bug->duplicateBug;?></td>
+      <td><?php echo $lang->bug->duplicateBug . html::input('duplicateBug');?></div>
+    </tr>
+    <tr>
+      <td class='w-80px'><?php echo $lang->bug->resolvedBuild?></td>
+      <td><?php echo html::select('resolvedBuild', $builds);?></td>
+    </tr>
+    <tr>
+      <td><?php echo $lang->bug->resolvedDate?></div>
+      <td><?php echo html::input('resolvedDate', helper::now());?></div>
+    </tr>
+    <tr>
+      <td><?php echo $lang->bug->assignedTo?></div>
+      <td><?php echo html::select('assignedTo', $users, $bug->openedBy);?></div>
+    </tr>
+    <tr>
+      <td><?php echo $lang->comment;?></td>
+      <td><?php echo html::textarea('comment');?></td>
+    </tr>
+  </table>
 
-  <div><?php echo $lang->bug->resolvedBuild . html::select('resolvedBuild', $builds, '', 'class=select-3');?></div>
-  <div><?php echo $lang->bug->resolvedDate . html::input('resolvedDate', helper::now(), "class='select-3'");?></div>
-  <div><?php echo $lang->bug->assignedTo . html::select('assignedTo', $users, $bug->openedBy, 'class=select-3');?></div>
-  <div><?php echo html::textarea('comment', '', "rows='6' class='area-1' placeholder='$lang->comment'");?></div>
   <div class='a-center'>
   <?php echo html::submitButton('', 'data-inline="true" data-theme="b"');?>
   <?php echo html::backButton("data-inline='true'");?>