From 026e6cc927e519e60297f0ed8f9dc1bec683ad3a Mon Sep 17 00:00:00 2001
From: chujilu <chujilu1991@163.com>
Date: Wed, 20 Aug 2014 09:21:19 +0800
Subject: [PATCH 1/3] * add $jsRoot in search/view/buildform.html.php

---
 module/search/view/buildform.html.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 3d84badf51..a098d6717b 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -10,6 +10,10 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php 
+$webRoot    = $this->app->getWebRoot();
+$jsRoot     = $webRoot . "js/";
+?>
 <?php include '../../common/view/datepicker.html.php';?>
 <style>
 #bysearchTab {transition: all .3s cubic-bezier(.175, .885, .32, 1);}

From 989b653d1142799305eaef9fb3b0793c7e6333e6 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Wed, 20 Aug 2014 09:24:08 +0800
Subject: [PATCH 2/3]  * ajusted style of forms.

---
 module/bug/view/create.html.php         |  2 +-
 module/doc/view/create.html.php         |  2 +-
 module/doc/view/edit.html.php           |  2 +-
 module/my/view/testtask.html.php        |  2 +-
 module/product/view/close.html.php      |  2 +-
 module/product/view/create.html.php     |  2 +-
 module/product/view/edit.html.php       |  2 +-
 module/productplan/view/create.html.php |  2 +-
 module/productplan/view/edit.html.php   |  2 +-
 module/project/view/create.html.php     |  2 +-
 module/project/view/edit.html.php       |  2 +-
 module/project/view/putoff.html.php     |  9 +++++----
 module/project/view/start.html.php      |  8 +++-----
 module/project/view/suspend.html.php    |  2 +-
 module/release/view/create.html.php     |  2 +-
 module/release/view/edit.html.php       |  2 +-
 module/story/view/change.html.php       |  2 +-
 module/story/view/create.html.php       |  2 +-
 module/story/view/review.html.php       |  2 +-
 module/task/view/create.html.php        |  2 +-
 module/testcase/view/create.html.php    |  2 +-
 module/testtask/view/create.html.php    |  2 +-
 module/testtask/view/edit.html.php      |  2 +-
 module/todo/view/create.html.php        |  2 +-
 www/js/my.full.js                       | 14 ++++----------
 www/theme/default/style.css             |  6 +++++-
 26 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index d049c22288..368b94b8e2 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -21,7 +21,7 @@ js::set('createRelease', $lang->release->create);
 js::set('createBuild', $lang->build->create);
 js::set('refresh', $lang->refresh);
 ?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['bug']);?></span>
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index af04e64b29..9f505c2290 100644
--- a/module/doc/view/create.html.php
+++ b/module/doc/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('holders ', $lang->doc->placeholder);?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['doc']);?></span>
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index 300e58975c..3e18678e18 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -19,7 +19,7 @@ $(document).ready(function()
     setType(type);
 });
 </script>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['doc']);?> <strong><?php echo $doc->id;?></strong></span>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 64abcec73c..69adbd94ec 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -55,7 +55,7 @@
       if(common::hasPriv('testtask', 'delete'))
       {
           $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-          echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-remove"></i>', '', "title='{$lang->testtask->delete}'");
+          echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-remove"></i>', '', "title='{$lang->testtask->delete}' class='btn-icon'");
       }
       ?>
     </td>
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index 30f1ff7efe..8b99b04f31 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $product->id;?></strong></span>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 6c9f69b8c8..f8b7dbb4e3 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['product']);?></span>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 2e0978a181..0745bc7d22 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $product->id;?></strong></span>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index 26b2a117e1..9e2969193c 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['plan']);?></span>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 135e869824..bceef38f22 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['plan']);?></span>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index b724967485..08c09d6b07 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -32,7 +32,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <?php js::set('holders', $lang->project->placeholder);?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['project']);?></span>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 2d97694d53..b46cb2e33a 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container mw-900px'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index 4eca7e5be0..5fa16b81b9 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container mw-800px'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
@@ -26,7 +26,7 @@
     <table class='table table-form'>
       <tr>
         <th class='w-90px'><?php echo $lang->project->dateRange;?></th>
-        <td>
+        <td class='w-p50'>
           <div class='input-group'>
             <?php echo html::input('begin', $project->begin, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "'");?>
             <span class='input-group-addon'><?php echo $lang->project->to;?></span>
@@ -41,6 +41,7 @@
             </div>
           </div>
         </td>
+        <td></td>
       </tr>
       <tr>
         <th><?php echo $lang->project->days;?></th>
@@ -53,10 +54,10 @@
       </tr> 
       <tr>
         <th><?php echo $lang->comment;?></th>
-        <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+        <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        <th></th><td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php
index 8fbf389065..096c89993c 100644
--- a/module/project/view/start.html.php
+++ b/module/project/view/start.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<div class='container mw-800px'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
@@ -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 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::icon($lang->icons['start']) . ' ' . $lang->project->start) . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        <th></th><td><?php echo html::submitButton($lang->project->start) . html::linkButton($lang->goback, $this->session->taskList); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index 2c3e9111f9..185459f4ff 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container mw-800px'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 6b93feedff..c910bcde31 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['release']);?></span>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index 16926bd3d1..5b32cf31e5 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['release']);?> <strong><?php echo $release->id;?></strong></span>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index 10ece46c52..b0d91c359a 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include './header.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['story']);?> <strong><?php echo $story->id;?></strong></span>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 893ff9a991..3378660b9f 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include './header.html.php';?>
 <?php include '../../common/view/form.html.php';?>
 <?php js::set('holders', $lang->story->placeholder); ?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php
index 897eabd6c0..9afe6bc9f8 100644
--- a/module/story/view/review.html.php
+++ b/module/story/view/review.html.php
@@ -15,7 +15,7 @@
 <script language='Javascript'>
 var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : print($story->openedBy);?>';
 </script>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['story']);?> <strong><?php echo $story->id;?></strong></span>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index a910b2804b..d3d6fbc716 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -15,7 +15,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('holders', $lang->task->placeholder);?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 82682026b9..1ca6f3ab0e 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -16,7 +16,7 @@
 <?php js::set('lblDelete', $lang->testcase->deleteStep);?>
 <?php js::set('lblBefore', $lang->testcase->insertBefore);?>
 <?php js::set('lblAfter', $lang->testcase->insertAfter);?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['testcase']);?></span>
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index aae49f1b82..98a887465b 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['testtask']);?></span>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index dd65e201d6..3796977886 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix' title='TESTTASK'><?php echo html::icon($lang->icons['testtask']);?></span>
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 5026972c77..4a5bd9914d 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container'>
+<div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['todo']);?></span>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index b181dc7962..4f9e5e1a79 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -497,20 +497,15 @@ function setImageSize(image, maxWidth)
 }
 
 /**
- * Set the repo link.
+ * Set the modal trigger to link.
  * 
  * @access public
  * @return void
  */
-function setRepoLink()
+function setModalTriggerLink()
 {
     $('.repolink').modalTrigger({width:960, type:'iframe'});
-}
-
-/* Set the modal dialog of export. */
-function setExport()
-{
-   $(".export").modalTrigger({width:650, type:'iframe'});
+    $(".export").modalTrigger({width:650, type:'iframe'});
 }
 
 /**
@@ -1181,8 +1176,7 @@ $(document).ready(function()
     setRequiredFields();
     setPlaceholder();
 
-    setExport();
-    setRepoLink();
+    setModalTriggerLink();
 
     autoCheck();
     toggleSearch();
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index b5dd1434d4..b1d658f95b 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -14,7 +14,7 @@
 .w-p5 {width: 5%} .w-p10 {width: 10%} .w-p15 {width: 15%} .w-p20 {width: 20%} .w-p25 {width: 25%} .w-p30 {width: 30%} .w-p35 {width: 35%} .w-p40 {width: 40%} .w-p45 {width: 45%} .w-p50 {width: 50%} .w-p55 {width: 55%} .w-p60 {width: 60%} .w-p65 {width: 65%} .w-p70 {width: 70%} .w-p75 {width: 75%} .w-p80 {width: 80%} .w-p85 {width: 85%} .w-p90 {width: 90%} .w-p94 {width: 94%} .w-p95 {width: 95%} .w-p98 {width: 98%} .w-p99 {width: 99%} .w-p100{width: 100%}
 
 .w-auto {width: auto} .w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-300px {width:300px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px} .w-900px {width:900px}
-.mw-200px {max-width:200px!important} .mw-300px {max-width:300px!important} .mw-400px {max-width:400px!important} .mw-500px {max-width:500px!important} .mw-600px {max-width:600px!important} .mw-700px {max-width:700px!important} .mw-800px {max-width:800px!important} .mw-900px {max-width:900px!important}
+.mw-200px {max-width:200px!important} .mw-300px {max-width:300px!important} .mw-400px {max-width:400px!important} .mw-500px {max-width:500px!important} .mw-600px {max-width:600px!important} .mw-700px {max-width:700px!important} .mw-800px {max-width:800px!important} .mw-900px {max-width:900px!important} .mw-1400px {max-width:1400px!important}
 
 .w-id {width:70px;} .w-pri {width:40px;} .w-severity {width:50px;} .w-hour {width:54px;} .w-date {width:90px;} .w-user {width:65px;} .w-status {width:55px} .w-type {width:80px} .w-resolution {width:70px}
 
@@ -182,6 +182,7 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
 .actionbox #historyItem {margin:0}
 .actionbox blockquote {margin:0}
 .actionbox > legend > i, .actionbox > .panel-heading > i {display: none}
+.actionbox .history {background: #f5f5f5; padding: 4px 10px 6px; min-height: 20px; border: 1px solid #f1f1f1; border-left: 1px dashed #ddd}
 fieldset.actionbox {padding-bottom: 10px;}
 
 /* actionbox, hack for ie8 */
@@ -453,6 +454,9 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 #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;}
+#titlebar > .heading > strong a {color: #333}
+#titlebar > .heading:hover > strong a {color: #03c}
+#titlebar > .heading > strong a:hover {color: #1A53FF}
 #titlebar > .heading > strong > i, #titlebar > .heading > strong > small > i {display: none}
 #titlebar > .heading > small > i {position: relative; top: 1px; display: none}
 #titlebar > .heading > small {font-size: 14px; color: #333;}

From 337a05fa6520248c4a4658553645975abb60204d Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Wed, 20 Aug 2014 10:47:33 +0800
Subject: [PATCH 3/3]  * fixed an error of function 'setModal'.

---
 www/js/my.full.js | 116 ++++++++++++++++++++++++----------------------
 1 file changed, 60 insertions(+), 56 deletions(-)

diff --git a/www/js/my.full.js b/www/js/my.full.js
index 4f9e5e1a79..59317ed7a6 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -834,66 +834,72 @@ function setModal()
 {
     jQuery.fn.modalTrigger = function(setting)
     {
-        $(this).click(function(event)
+        return $(this).each(function()
         {
-            var $e   = $(this);
-            if($e.closest('.body-modal').length) return;
+            var $this = $(this);
+            $this.off('click.modalTrigger.zui');
 
-            if($e.hasClass('disabled')) return false;
-
-            var url  = (setting ? setting.url : false) || $e.attr('href') || $e.data('url');
-            var type = (setting ? setting.type : false) || $e.hasClass('iframe') ? 'iframe' : ($e.data('type') || 'ajax');
-            if(type == 'iframe')
+            $this.on('click.modalTrigger.zui', function(event)
             {
-                var options = 
-                {
-                    url:        url,
-                    width:      $e.data('width') || 800,
-                    height:     $e.data('height') || 'auto',
-                    icon:       $e.data('icon') || '?',
-                    title:      $e.data('title') || $e.attr('title') || $e.text(),
-                    name:       $e.data('name') || 'modalIframe',
-                    cssClass:   $e.data('class'),
-                    headerless: $e.data('headerless') || false,
-                    center:     $e.data('center') || true
-                };
+                var $e   = $(this);
+                if($e.closest('.body-modal').length) return;
 
-                if(options.icon == '?')
+                if($e.hasClass('disabled')) return false;
+
+                var url  = (setting ? setting.url : false) || $e.attr('href') || $e.data('url');
+                var type = (setting ? setting.type : false) || $e.hasClass('iframe') ? 'iframe' : ($e.data('type') || 'ajax');
+                if(type == 'iframe')
                 {
-                    var i = $e.find("[class^='icon-']");
-                    options.icon = i.length ? i.attr('class').substring(5) : 'file-text';
+                    var options = 
+                    {
+                        url:        url,
+                        width:      $e.data('width') || 800,
+                        height:     $e.data('height') || 'auto',
+                        icon:       $e.data('icon') || '?',
+                        title:      $e.data('title') || $e.attr('title') || $e.text(),
+                        name:       $e.data('name') || 'modalIframe',
+                        cssClass:   $e.data('class'),
+                        headerless: $e.data('headerless') || false,
+                        center:     $e.data('center') || true
+                    };
+
+                    if(options.icon == '?')
+                    {
+                        var i = $e.find("[class^='icon-']");
+                        options.icon = i.length ? i.attr('class').substring(5) : 'file-text';
+                    }
+
+                    showIframeModal($.extend(options, setting));
+                }
+                else
+                {
+                    initModalFrame();
+                    $.get(url, function(data)
+                    {
+                        var ajaxModal = $('#ajaxModal');
+                        if(data.indexOf('modal-dialog') < 0)
+                        {
+                            data = "<div class='modal-dialog modal-ajax' style='width: {width};'><div class='modal-content'><div class='modal-header'><button class='close' data-dismiss='modal'>×</button><h4 class='modal-title'><i class='icon-{icon}'></i> {title}</h4></div><div class='modal-body' style='height:{height}'>{content}</div></div></div>".format($.extend({content: data}, options));
+                        }
+                        ajaxModal.html(data);
+
+                        /* Set the width of modal dialog. */
+                        if($e.data('width'))
+                        {
+                            var modalWidth = parseInt($e.data('width'));
+                            $(this).data('width', modalWidth).find('.modal-dialog').css('width', modalWidth);
+                            ajustModalPosition();
+                        }
+
+                        ajaxModal.modal('show');
+                    });
                 }
 
-                showIframeModal($.extend(options, setting));
-            }
-            else
-            {
-                initModalFrame();
-                $.get(url, function(data)
-                {
-                    var ajaxModal = $('#ajaxModal');
-                    if(data.indexOf('modal-dialog') < 0)
-                    {
-                        data = "<div class='modal-dialog modal-ajax' style='width: {width};'><div class='modal-content'><div class='modal-header'><button class='close' data-dismiss='modal'>×</button><h4 class='modal-title'><i class='icon-{icon}'></i> {title}</h4></div><div class='modal-body' style='height:{height}'>{content}</div></div></div>".format($.extend({content: data}, options));
-                    }
-                    ajaxModal.html(data);
+                /* Save the href to rel attribute thus we can save it. */
+                $('#ajaxModal').attr('rel', url);
 
-                    /* Set the width of modal dialog. */
-                    if($e.data('width'))
-                    {
-                        var modalWidth = parseInt($e.data('width'));
-                        $(this).data('width', modalWidth).find('.modal-dialog').css('width', modalWidth);
-                        ajustModalPosition();
-                    }
-
-                    ajaxModal.modal('show');
-                });
-            }
-
-            /* Save the href to rel attribute thus we can save it. */
-            $('#ajaxModal').attr('rel', url);
-
-            return false;
+                return false;
+            });
         });
     }
 
@@ -951,11 +957,10 @@ function setModal()
         {
             options.waitingFuc = setTimeout(function(){showModal(options, modal, modalBody, dialog);}, options.waittime );
         }
-
+        
         var frame = document.getElementById(options.name);
         frame.onload = frame.onreadystatechange = function()
         {
-
             if(this.readyState && this.readyState != 'complete') return;
             if(modal.data('first') && (!modal.hasClass('modal-loading'))) return;
             if(!modal.data('first')) modal.addClass('modal-loading');
@@ -1014,10 +1019,9 @@ function setModal()
                 modal.removeClass('modal-loading');
             }
 
-            var iframe$ = window.frames[options.name].$;
             if(iframe$)
             {
-                iframe$.extend({'closeModal': $.closeModal});
+                // iframe$.extend({'closeModal': $.closeModal});
             }
         }
         catch(e)