From e54b7946fc784140e3dbdde673bb644bfb7461f8 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 23 May 2018 15:34:46 +0800
Subject: [PATCH 1/3]  * finish task #4222.

---
 module/score/css/reset.css          | 1 +
 module/score/view/reset.html.php    | 2 +-
 module/webhook/view/browse.html.php | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 module/score/css/reset.css

diff --git a/module/score/css/reset.css b/module/score/css/reset.css
new file mode 100644
index 0000000000..d53a7d9391
--- /dev/null
+++ b/module/score/css/reset.css
@@ -0,0 +1 @@
+.alert{margin-bottom:0px;}
diff --git a/module/score/view/reset.html.php b/module/score/view/reset.html.php
index 2aa9a10a71..abdcc24fdb 100644
--- a/module/score/view/reset.html.php
+++ b/module/score/view/reset.html.php
@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.html.php'; ?>
 <div class="alert with-icon" id="scoreStart">
-  <i class="icon-inbox"></i>
+  <i class="icon-cube"></i>
   <div class="content">
     <p><?php echo $lang->score->resetTips; ?></p>
     <p><button class="btn btn-primary" id="scoreReset"><?php echo $lang->score->resetStart; ?></button></p>
diff --git a/module/webhook/view/browse.html.php b/module/webhook/view/browse.html.php
index 320a5461d3..cc72b16d53 100644
--- a/module/webhook/view/browse.html.php
+++ b/module/webhook/view/browse.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include 'header.html.php';?>
 <?php js::set('confirmDelete', $lang->webhook->confirmDelete);?>
-<div id='mainContent' class='main-content'>
+<div id='mainContent'>
   <form class='main-table' id='ajaxForm' method='post'>
     <table id='webhookList' class='table has-sort-head table-fixed'>
       <thead>
@@ -34,12 +34,12 @@
           <td class='text' title='<?php echo $webhook->url;?>'><?php echo $webhook->url;?></td>
           <td class='c-actions'>
             <?php
-            common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text');
+            common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text2');
             common::printIcon('webhook', 'edit', "webhookID=$id", '', 'list');
             if(common::hasPriv('webhook', 'delete'))
             {
                 $deleteURL = $this->createLink('webhook', 'delete', "webhookID=$id&confirm=yes");
-                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->webhook->delete}' class='btn btn-link'");
+                echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"webhookList\",confirmDelete)", '<i class="icon-trash"></i>', '', "title='{$lang->webhook->delete}' class='btn'");
             }
             ?>
           </td>

From a516365977aea355ce81a1ea171860073aac4f35 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 23 May 2018 15:42:53 +0800
Subject: [PATCH 2/3]  * Adjust language.

---
 module/project/lang/zh-cn.php | 2 +-
 module/project/lang/zh-tw.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 96d8c91355..07da6e0908 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -200,7 +200,7 @@ $lang->project->checkedSummary  = "选中 <strong>%total%</strong> 个任务，
 $lang->project->memberHoursAB   = "<div>%s有 <strong>%s</strong> 工时</div>";
 $lang->project->memberHours     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工时</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->countSummary    = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总任务</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">进行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未开始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总消耗</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩余</div><div class="segment-value">%s</div></div></div></div>';
+$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总预计</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩余</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->groupSummaryAB  = "<div>总任务 <strong>%s</strong></div><div><span class='text-muted'>未开始</span> %s &nbsp; <span class='text-muted'>进行中</span> %s</div><div>总预计 <strong>%s</strong></div><div><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩余</span> %s</div>";
 $lang->project->wbs             = "分解任务";
 $lang->project->batchWBS        = "批量分解";
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index 306f83b5c0..c02db4d889 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -200,7 +200,7 @@ $lang->project->checkedSummary  = "選中 <strong>%total%</strong> 個任務，
 $lang->project->memberHoursAB   = "<div>%s有 <strong>%s</strong> 工時</div>";
 $lang->project->memberHours     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工時</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->countSummary    = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總任務</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">進行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未開始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總消耗</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩餘</div><div class="segment-value">%s</div></div></div></div>';
+$lang->project->timeSummary     = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">總預計</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩餘</div><div class="segment-value">%s</div></div></div></div>';
 $lang->project->groupSummaryAB  = "<div>總任務 <strong>%s</strong></div><div><span class='text-muted'>未開始</span> %s &nbsp; <span class='text-muted'>進行中</span> %s</div><div>總預計 <strong>%s</strong></div><div><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩餘</span> %s</div>";
 $lang->project->wbs             = "分解任務";
 $lang->project->batchWBS        = "批量分解";

From ad8b144d5cffd8a68fd7c73f193eb300423857e6 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Wed, 23 May 2018 15:47:53 +0800
Subject: [PATCH 3/3]  * Finish task #4309, #4310.

---
 module/testcase/view/batchedit.html.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index a665d8151c..4384fd5f61 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -42,7 +42,7 @@
   <form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>" id='batchEditForm'>
     <table class='table table-form table-fixed'>
       <thead>
-        <tr>
+        <tr class='text-center'>
           <th class='w-50px'><?php  echo $lang->idAB;?></th>
           <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->priAB;?></th>
           <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->statusAB;?></th>
@@ -51,11 +51,11 @@
           <?php endif;?>
           <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
           <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required');?>'><?php echo $lang->testcase->story;?></th>
-          <th class='required'><?php echo $lang->testcase->title;?></th>
+          <th class='text-left required'><?php echo $lang->testcase->title;?></th>
           <th class='w-120px required'><?php echo $lang->testcase->type;?></th>
           <th class='<?php echo zget($visibleFields, 'precondition', 'hidden') . zget($requiredFields, 'precondition', '', ' required');?>'><?php echo $lang->testcase->precondition;?></th>
           <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->testcase->keywords;?></th>
-          <th class='w-300px<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
+          <th class='w-250px<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
         </tr>
       </thead>
       <tbody>
@@ -112,7 +112,12 @@
         <?php endforeach;?>
       </tbody>
       <tfoot>
-        <tr><td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td></tr>
+        <tr>
+          <td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
+        </tr>
       </tfoot>
     </table>
   </form>