From d658a6fa2339a91f0be8f4b38e2729dc3e147df9 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Tue, 19 Aug 2014 10:48:50 +0800
Subject: [PATCH]  * ajusted views.

---
 module/bug/view/activate.html.php         | 2 +-
 module/bug/view/assignto.html.php         | 2 +-
 module/bug/view/close.html.php            | 6 ++----
 module/bug/view/confirmbug.html.php       | 2 +-
 module/bug/view/resolve.html.php          | 2 +-
 module/convert/view/convertIssue.html.php | 3 +--
 module/group/view/copy.html.php           | 2 +-
 module/group/view/create.html.php         | 2 +-
 module/group/view/edit.html.php           | 2 +-
 module/project/view/activate.html.php     | 6 ++----
 module/task/view/assignto.html.php        | 2 +-
 module/task/view/cancel.html.php          | 2 +-
 module/task/view/close.html.php           | 2 +-
 module/task/view/finish.html.php          | 2 +-
 module/task/view/pause.html.php           | 2 +-
 module/task/view/start.html.php           | 2 +-
 module/user/view/create.html.php          | 2 +-
 www/js/my.full.js                         | 5 +++++
 www/theme/default/style.css               | 4 ++--
 19 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index eee8f612a0..adc4c9935e 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -40,7 +40,7 @@
       <td colspan='2' class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
     </tr>  
     <tr>
-      <td colspan='3' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
     </tr>
   </table>
 </form>
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index 08ae90ffcc..8e0330e8f4 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -40,7 +40,7 @@ js::set('page', 'assignedto');
       <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
-      <td colspan='3' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
+      <th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
     </tr>
   </table>
 </form>
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index 0007783afe..5a94f73e6e 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -23,13 +23,11 @@
 <form class='form-condensed' method='post' target='hiddenwin'>
   <table class='table table-form'>
     <tr>
-      <th class='text-left'><?php echo $lang->comment;?></th>
-    </tr>
-    <tr>
+      <th><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
-      <td class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <th></th><td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
     </tr>
   </table>
 </form>
diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index 9757aaec63..614a266518 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -45,7 +45,7 @@ js::set('page', 'confirmbug');
       <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
     </tr>
     <tr>
-      <td colspan='3' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
+      <th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>
     </tr>
   </table>
 </form>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index bb6930f7b3..1348aed3c3 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -48,7 +48,7 @@
       <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
-      <td colspan='3' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
+      <th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
     </tr>
   </table>
 </form>
diff --git a/module/convert/view/convertIssue.html.php b/module/convert/view/convertIssue.html.php
index e1058ddd31..7c9ef05e8d 100644
--- a/module/convert/view/convertIssue.html.php
+++ b/module/convert/view/convertIssue.html.php
@@ -1,5 +1,4 @@
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/colorize.html.php';?>
 <form method='post'>
   <table align='center' class='table-5 f-14px'>
     <caption><?php echo $lang->convert->direction;?></caption>
@@ -14,7 +13,7 @@
     </tr>
     <?php endforeach;?>
     <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
+      <th></th><td><?php echo html::submitButton();?></td>
     </tr>
   </table>
 </form>
diff --git a/module/group/view/copy.html.php b/module/group/view/copy.html.php
index 6b6ab7753b..1e09cd7835 100644
--- a/module/group/view/copy.html.php
+++ b/module/group/view/copy.html.php
@@ -33,7 +33,7 @@
       <th><?php echo $lang->group->option;?></th>
       <td><?php echo html::checkbox('options', $lang->group->copyOptions);?></td>
     </tr>  
-    <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
+    <tr><th></th><td><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/view/create.html.php b/module/group/view/create.html.php
index a0a4be4acb..a4a6863a67 100644
--- a/module/group/view/create.html.php
+++ b/module/group/view/create.html.php
@@ -28,7 +28,7 @@
         <th><?php echo $lang->group->desc;?></th>
         <td><?php echo html::textarea('desc', '', "rows=5 class=form-control");?></td>
       </tr>  
-      <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
+      <tr><th></th><td><?php echo html::submitButton();?></td></tr>
     </table>
   </form>
 </div>
diff --git a/module/group/view/edit.html.php b/module/group/view/edit.html.php
index 1cf7d90b84..6027504f0f 100644
--- a/module/group/view/edit.html.php
+++ b/module/group/view/edit.html.php
@@ -29,7 +29,7 @@
       <th><?php echo $lang->group->desc;?></th>
       <td><?php echo html::textarea('desc', $group->desc, "rows='5' class='form-control'");?></td>
     </tr>  
-    <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
+    <tr><th></th><td><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index 9fcc9721df..ef4af1ce41 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -24,13 +24,11 @@
   <form class='form-condensed' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th class='text-left'><?php echo $lang->comment;?></th>
-      </tr>
-      <tr>
+        <th class='w-60px'><?php echo $lang->comment;?></th>
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
       </tr>
       <tr>
-        <td class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        <th></th><td class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index 5328006c2c..2f654eb66d 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -34,7 +34,7 @@
       <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
     </tr>
     <tr>
-      <td colspan='3' class='text-center'><?php echo html::submitButton();?></td>
+      <th></th><td colspan='2'><?php echo html::submitButton();?></td>
     </tr>
   </table>
 </form>
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php
index 6c5025cf91..1ea8b578c9 100644
--- a/module/task/view/cancel.html.php
+++ b/module/task/view/cancel.html.php
@@ -26,7 +26,7 @@
       <th><?php echo $lang->comment;?></th>
       <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
-    <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
+    <tr><th></th><td><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <div class='main'>
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php
index 16f9d93fc5..7431a71704 100644
--- a/module/task/view/close.html.php
+++ b/module/task/view/close.html.php
@@ -27,7 +27,7 @@
       <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
+      <th></th><td><?php echo html::submitButton();?></td>
     </tr>
   </table>
 </form>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 99fab83475..f6c85d9114 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -40,7 +40,7 @@
       <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
     </tr>
     <tr>
-      <td colspan='3' class='text-center'><?php echo html::submitButton();?></td>
+      <th></th><td colspan='2'><?php echo html::submitButton();?></td>
     </tr>
   </table>
 </form>
diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php
index 5d9043c090..ff5373ac55 100644
--- a/module/task/view/pause.html.php
+++ b/module/task/view/pause.html.php
@@ -27,7 +27,7 @@
       <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
+      <th></th><td><?php echo html::submitButton();?></td>
     </tr>
   </table>
 </form>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 3aa9edd175..63d54c3ed3 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -40,7 +40,7 @@
       <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
-      <td colspan='3' class='text-center'><?php echo html::submitButton(); ?></td>
+      <th></th><td colspan='2'><?php echo html::submitButton(); ?></td>
     </tr>
   </table>
 </form>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index bc588f1017..3d69982210 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -70,7 +70,7 @@
         <td><?php echo html::radio('gender', (array)$lang->user->genderList, 'm');?></td>
       </tr>
 
-      <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+      <tr><th></th><td><?php echo html::submitButton() . html::backButton();?></td></tr>
     </table>
   </form>
 </div>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 9d31da948f..b181dc7962 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -994,6 +994,11 @@ function setModal()
                 setTimeout(function()
                 {
                     var fbH = $framebody.addClass('body-modal').outerHeight();
+                    frame$('#titlebar > .heading a').each(function()
+                    {
+                        var $a = frame$(this);
+                        $a.replaceWith("<strong class='heading-title'>" + $a.text() + "</strong>");
+                    });
                     if(typeof fbH == 'object') fbH = $framebody.height();
                     modalBody.css('height', fbH);
                     ajustModalPosition();
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index a80afa9457..611d574368 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -196,7 +196,7 @@ td.doing, td[class$="-doing"]  {color:#d2322d;}
 td.delayed, td[class$="-delayed"] {background:#e84e0f!important; color:white;}
 td.blocked, td[class$="-blocked"] {background:yellow!important;}
 td.fail, td[class$="-fail"]  {color:#d2322d}
-td.active, td[class$="-active"] {color: #e48600; background: #fff4e5!important}
+td.status-active, td[class$="-active"] {color: #e48600; background: #fff4e5!important}
 td.draft, td[class$="-draft"]  {color:#8957a1}
 
 /* tabs */
@@ -445,7 +445,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 #titlebar > .heading {font-size: 14px; line-height: 20px; font-weight: bold;}
 #titlebar > .heading > i {display: none;}
 #titlebar > .heading > .prefix {display: inline-block; margin-right: 5px; color: #666;}
-#titlebar > .heading > .prefix > strong {border-radius: 4px; border: 1px solid #aaa; padding: 0px 4px; background: #fff; text-align: center; min-width: 20px; color: #666; font-size: 12px}
+#titlebar > .heading > .prefix > strong {font-weight: normal; border: 1px solid #aaa; padding: 0px 4px; background: #fff; text-align: center; min-width: 20px; color: #666; font-size: 12px}
 #titlebar > .heading > .prefix > i {font-size: 14px; color: #808080; display: none}
 #titlebar > .heading > strong {display: inline-block; margin-right: 5px;}
 #titlebar > .heading > strong > i, #titlebar > .heading > strong > small > i {display: none}