From 4b52f18cbfc0266e2c82e849f482e79c8c4937bf Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 19 Oct 2017 16:12:13 +0800
Subject: [PATCH] =?UTF-8?q?Finish=20task#3240=20=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=9A=82=E5=81=9C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=8F=E6=98=BE=E7=A4=BA,cost:1=20left:0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/project/css/kanban.css       | 4 +++-
 module/project/js/kanban.js         | 3 ++-
 module/project/view/kanban.html.php | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css
index 5a13b4fbe6..2e20477f54 100644
--- a/module/project/css/kanban.css
+++ b/module/project/css/kanban.css
@@ -1,4 +1,4 @@
-table th.col-closed {width:15%}
+table th.col-closed {width:12%}
 #kanbanHeader th{border: 1px solid #ddd; padding:8px;}
 #kanbanHeader .dropdown {display: inline-block; margin-left: 10px;}
 #kanbanHeader .dropdown > a {color: #036}
@@ -63,6 +63,7 @@ table th.col-closed {width:15%}
 .board {background: #ddd; color: #444; outline: 1px solid rgba(0,0,0,.1); outline-offset: -1px;}
 .board-bug-wait,.board-task-wait {color: #2b529c; background-color: #E8EAF6}
 .board-bug-doing,.board-task-doing {color: #D2322D; background-color: #FFEBEE;}
+.board-task-pause {color: #fff; background-color: #E48600;}
 .board-bug-done,.board-task-done {color: #229F24; background-color: #E8F5E9;}
 .board-bug-closed,.board-task-closed {color: #666; background-color: #ccc;}
 .board:hover {outline: 1px solid rgba(0,0,0,.3);}
@@ -79,6 +80,7 @@ table th.col-closed {width:15%}
 .board.inverse:hover {color: #fff;}
 .board-bug-cancel.inverse, .board-task-cancel.inverse {background: #333;}
 .board-bug-wait.inverse, .board-task-wait.inverse {background: #2b529c}
+.board-task-pause.inverse {background: #E48600}
 .board-bug-doing.inverse, .board-task-doing.inverse {background: #D2322D}
 .board-bug-done.inverse, .board-task-done.inverse {background: #229F24}
 .board-bug-closed.inverse, .board-task-closed.inverse {background: #777;}
diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js
index 91b0dcd287..85e1e007e5 100644
--- a/module/project/js/kanban.js
+++ b/module/project/js/kanban.js
@@ -17,7 +17,8 @@ $(function()
         task:
         {
             wait   : {doing: 'start', done: 'finish', cancel: 'cancel'},
-            doing  : {done: 'finish'},
+            doing  : {done: 'finish', pause: 'pause'},
+            pause  : {doing: 'activate', done: 'finish', cancel: 'cancel'},
             done   : {doing: 'activate', closed: 'close'},
             cancel : {doing: 'activate', closed: 'close'},
             closed : {doing: 'activate'}
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 90c02ea77b..f6f689c425 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -10,7 +10,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include './taskheader.html.php';?> 
-<?php $taskCols = array('wait', 'doing', 'done', 'cancel', 'closed'); ?>
+<?php $taskCols = array('wait', 'doing', 'pause', 'done', 'cancel', 'closed'); ?>
 <div id='kanban'>
   <table class='boards-layout table' id='kanbanHeader'>
     <thead>
@@ -47,7 +47,7 @@
         <?php if($hasStory):?>
         <th class='w-p15 col-story'> </th>
         <?php endif;?>
-        <?php foreach ($taskCols as $col):?><th class='col-<?php echo $col?>'></th><?php endforeach;?>
+        <?php foreach($taskCols as $col):?><th class='col-<?php echo $col?>'></th><?php endforeach;?>
       </tr>
     </thead>
     <tbody>