From 648168287d6df0b4d1a0c8d1fff90065086a3abd Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Thu, 19 Apr 2018 14:41:08 +0800
Subject: [PATCH 1/3] * Refact report page of bug.

---
 module/bug/css/report.css       |   3 +
 module/bug/view/report.html.php | 121 +++++++++++++++-----------------
 2 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/module/bug/css/report.css b/module/bug/css/report.css
index b4d3ca6834..0a68d53777 100644
--- a/module/bug/css/report.css
+++ b/module/bug/css/report.css
@@ -5,3 +5,6 @@
 .col-side {width: 250px}
 
 .panel-heading > strong > span {float: right; color: #29a8cd;}
+
+.checkboxes {margin-bottom: 10px;}
+.checkboxes .checkbox-primary {margin-bottom: 5px;}
diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 99d13ee63a..9e784747d4 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -11,78 +11,73 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/chart.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['bug']);?></span>
-    <strong><small class='text-muted'><?php echo html::icon($lang->icons['report']);?></small> <?php echo $lang->bug->report->common;?></strong>
-  </div>
-  <div class='actions'>
-    <?php echo html::a($this->createLink('bug', 'browse', "productID=$productID&branch=0&browseType=$browseType&moduleID=$moduleID"), $lang->goback, '', "class='btn'");?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php echo html::a($this->createLink('bug', 'browse', "productID=$productID&branch=0&browseType=$browseType&moduleID=$moduleID"), "<i class='icon icon-back icon-sm'> </i>" . $lang->goback, '', "class='btn btn-link'");?>
+    <div class='divider'></div>
+    <div class='page-title'>
+      <span class='text'><?php echo $lang->bug->report->common;?></span>
+    </div>
   </div>
 </div>
-<div class='row-table row-table-side-left'>
-  <div class='col-side'>
-    <div class='panel panel-sm'>
+<div id="mainContent" class='main-row'>
+  <div class='side-col col-lg'>
+    <div class='panel'>
       <div class='panel-heading'>
-        <strong><?php echo $lang->bug->report->select;?></strong>
+        <div class='panel-title'><?php echo $lang->bug->report->select;?></div>
       </div>
-      <div class='panel-body' style='padding-top:0'>
-        <form method='post'>
-          <?php echo html::checkBox('charts', $lang->bug->report->charts, $checkedCharts, '', 'block');?>
-          <?php echo html::selectAll('', "button", false, 'btn-sm')?>
-          <?php echo html::submitButton($lang->bug->report->create, '', "btn btn-primary btn-sm");?>
+      <div class='panel-body'>
+        <form method='post' id='chartTypesForm'>
+          <div class='checkboxes'>
+            <?php echo html::checkBox('charts', $lang->bug->report->charts, $checkedCharts, '', 'block');?>
+          </div>
+          <div class='btn-toolbar'>
+            <?php echo html::selectAll();?>
+            <?php echo html::submitButton($lang->bug->report->create, '', 'btn btn-primary');?>
+          </div>
         </form>
       </div>
     </div>
   </div>
-  <div class='col-main'>
-    <div class='panel panel-sm'>
-      <div class='panel-heading'>
-        <strong>
-          <?php echo $lang->bug->report->common;?>
-          <div class="btn-group">
-          <?php foreach($lang->report->typeList as $type => $typeName):?>
-          <?php echo html::a("javascript:changeChartType(\"$type\")", $typeName, '', "class='btn btn-sm " . ($type == $chartType ? 'active' : '') . "'")?>
-          <?php endforeach;?>
-          </div>
-          <span><?php echo $lang->report->notice->help?></span>
-        </strong>
-      </div>
-      <table class='table active-disabled'>
-        <?php foreach($charts as $chartType => $chartOption):?>
-        <tr class='text-top'>
-          <td>
-            <div class='chart-wrapper text-center'>
-              <h5><?php echo $lang->bug->report->charts[$chartType];?></h5>
-              <div class='chart-canvas'><canvas id='chart-<?php echo $chartType ?>' width='<?php echo $chartOption->width;?>' height='<?php echo $chartOption->height;?>' data-responsive='true'></canvas></div>
-            </div>
-          </td>
-          <td style='width: 320px'>
-            <?php $height = zget($lang->bug->report->$chartType, 'height', $lang->bug->report->options->height) . 'px'; ?>
-            <div style="overflow:auto" class='table-wrapper'>
-              <table class='table table-condensed table-hover table-striped table-bordered table-chart' data-chart='<?php echo $chartOption->type; ?>' data-target='#chart-<?php echo $chartType ?>' data-animation='false'>
-                <thead>
-                  <tr>
-                    <th class='chart-label' colspan='2'><?php echo $lang->report->item;?></th>
-                    <th><?php echo $lang->report->value;?></th>
-                    <th><?php echo $lang->report->percent;?></th>
-                  </tr>
-                </thead>
-                <?php foreach($datas[$chartType] as $key => $data):?>
-                <tr class='text-center'>
-                  <td class='chart-color w-20px'><i class='chart-color-dot icon-circle'></i></td>
-                  <td class='chart-label'><?php echo $data->name;?></td>
-                  <td class='chart-value'><?php echo $data->value;?></td>
-                  <td><?php echo ($data->percent * 100) . '%';?></td>
-                </tr>
-                <?php endforeach;?>
-              </table>
-            </div>
-          </td>
-        </tr>
+  <div class='main-col'>
+    <div class='cell'>
+      <div class='btn-toolbar'>
+        <?php foreach($lang->report->typeList as $type => $typeName):?>
+        <?php echo html::a("javascript:changeChartType(\"$type\")", "<i class='icon icon-chart-{$type}'> </i>" . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
-      </table>
+        <div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
+      </div>
+      <?php foreach($charts as $chartType => $chartOption):?>
+      <div class='table-row chart-row'>
+        <div class='main-col'>
+          <div class='chart-wrapper text-center'>
+            <h4><?php echo $lang->bug->report->charts[$chartType];?></h4>
+            <div class='chart-canvas'><canvas id='chart-<?php echo $chartType ?>' width='<?php echo $chartOption->width;?>' height='<?php echo $chartOption->height;?>' data-responsive='true'></canvas></div>
+          </div>
+        </div>
+        <div class='side-col col-xl'>
+          <div style="overflow:auto;" class='table-wrapper'>
+            <table class='table table-condensed table-hover table-striped table-bordered table-chart' data-chart='<?php echo $chartOption->type; ?>' data-target='#chart-<?php echo $chartType ?>' data-animation='false'>
+              <thead>
+                <tr>
+                  <th class='chart-label' colspan='2'><?php echo $lang->report->item;?></th>
+                  <th><?php echo $lang->report->value;?></th>
+                  <th><?php echo $lang->report->percent;?></th>
+                </tr>
+              </thead>
+              <?php foreach($datas[$chartType] as $key => $data):?>
+              <tr class='text-center'>
+                <td class='chart-color'><i class='chart-color-dot'></i></td>
+                <td class='chart-label'><?php echo $data->name;?></td>
+                <td class='chart-value'><?php echo $data->value;?></td>
+                <td><?php echo ($data->percent * 100) . '%';?></td>
+              </tr>
+              <?php endforeach;?>
+            </table>
+          </div>
+        </div>
+      </div>
+      <?php endforeach;?>
     </div>
   </div>
 </div>

From 02be1c5ce6bb3a85631ddbaf89689cb1456ba142 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 19 Apr 2018 14:46:59 +0800
Subject: [PATCH 2/3]  * Rewrite putoff file of project.

---
 module/project/view/putoff.html.php | 89 +++++++++++++++--------------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index 05893a5ee3..e670cac219 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -12,55 +12,58 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?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-1400px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
-      <small class='text-muted'> <?php echo $lang->project->putoff;?> <?php echo html::icon($lang->icons['putoff']);?></small>
-    </div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
+      <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
+      <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <small><?php echo $lang->arrow . $lang->project->putoff;?></small>
+    </h2>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin'>
+  <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
-      <tr>
-        <th class='w-80px'><?php echo $lang->project->dateRange;?></th>
-        <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>
-            <?php echo html::input('end', $project->end, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "'");?>
-            <div class='input-group-btn'>
-              <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><?php echo $lang->project->byPeriod;?> <span class='caret'></span></button>
-              <ul class='dropdown-menu'>
-              <?php foreach ($lang->project->endList as $key => $name):?>
-                <li><a href='javascript:computeEndDate("<?php echo $key;?>")'><?php echo $name;?></a></li>
-              <?php endforeach;?>
-              </ul>
+      <tbody>
+        <tr>
+          <th><?php echo $lang->project->dateRange;?></th>
+          <td colspan='2'>
+            <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>
+              <?php echo html::input('end', $project->end, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "'");?>
+              <div class='input-group-btn'>
+                <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><?php echo $lang->project->byPeriod;?> <span class='caret'></span></button>
+                <ul class='dropdown-menu'>
+                  <?php foreach ($lang->project->endList as $key => $name):?>
+                  <li><a href='javascript:computeEndDate("<?php echo $key;?>")'><?php echo $name;?></a></li>
+                  <?php endforeach;?>
+                </ul>
+              </div>
             </div>
-          </div>
-        </td>
-        <td></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->project->days;?></th>
-        <td>
-          <div class='input-group'>
-          <?php echo html::input('days', $project->days, "class='form-control' autocomplete='off'");?>
-            <span class='input-group-addon'><?php echo $lang->project->day;?></span>
-          </div>
-        </td>
-      </tr> 
-      <tr>
-        <th><?php echo $lang->comment;?></th>
-        <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th></th><td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
-      </tr>
+          </td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->days;?></th>
+          <td colspan='2'>
+            <div class='input-group'>
+            <?php echo html::input('days', $project->days, "class='form-control' autocomplete='off'");?>
+              <span class='input-group-addon'><?php echo $lang->project->day;?></span>
+            </div>
+          </td> 
+          <td></td>
+        </tr> 
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+        </tr>
+        <tr>
+          <th></th><td colspan='3'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        </tr>
+      </tbody>
     </table>
   </form>
+  <hr class='small' />
   <div class='main'><?php include '../../common/view/action.html.php';?></div>
 </div>
 <?php js::set('weekend', $config->project->weekend);?>

From 437a019d6206c7ce68680c3c32164184c06d5d19 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 19 Apr 2018 14:48:43 +0800
Subject: [PATCH 3/3]  * Rewrite suspend file of project.

---
 module/project/view/suspend.html.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index 70be041044..e0c6a6e8e3 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -12,19 +12,19 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<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>
-      <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
-      <small class='text-warning'> <?php echo $lang->project->suspend;?> <?php echo html::icon($lang->icons['suspend']);?></small>
-    </div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
+      <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
+      <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <small><?php echo $lang->arrow . $lang->project->suspend;?></small>
+    </h2>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin'>
+  <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th class='text-left'><?php echo $lang->comment;?></th>
-        <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+        <th><?php echo $lang->comment;?></th>
+        <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
         <th></th>
@@ -32,6 +32,7 @@
       </tr>
     </table>
   </form>
+  <hr class='small' /> 
   <div class='main'><?php include '../../common/view/action.html.php';?></div>
 </div>
 <?php include '../../common/view/footer.html.php';?>