From cba3dff61f34b3faccaf4884757ec32c81772be4 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 27 Oct 2017 13:30:18 +0800
Subject: [PATCH] =?UTF-8?q?Finish=20task#3243=20=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A2=9C=E8=89=B2=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?,cost:4=20left:0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/project/css/kanban.css                 | 19 ++++++-------------
 .../project/view/ajaxkanbansetting.html.php   |  2 +-
 module/project/view/kanban.html.php           |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css
index 1d9ebc48cf..5511a1dddc 100644
--- a/module/project/css/kanban.css
+++ b/module/project/css/kanban.css
@@ -63,19 +63,12 @@ table th.col-closed {width:14%}
 
 .board {background: #333; color: #f1f1f1; outline: 1px solid rgba(0,0,0,.1); outline-offset: -1px;}
 .board:hover {outline: 1px solid rgba(0,0,0,.3); color:#fff}
-.board-bug-cancel, .board-task-cancel {background: #333;   opacity: 1;}
-.board-bug-wait, .board-task-wait     {background: #2b529c;opacity: 1;}
-.board-task-pause                     {background: #E48600;opacity: 1;}
-.board-bug-doing, .board-task-doing   {background: #D2322D;opacity: 1;}
-.board-bug-done, .board-task-done     {background: #229F24;opacity: 1;}
-.board-bug-closed, .board-task-closed {background: #777;   opacity: 1;}
-
-.board-bug-cancel.inverse, .board-task-cancel.inverse {opacity: 1;}
-.board-bug-wait.inverse, .board-task-wait.inverse {opacity: 1}
-.board-task-pause.inverse {opacity: 1}
-.board-bug-doing.inverse, .board-task-doing.inverse {opacity: 1}
-.board-bug-done.inverse, .board-task-done.inverse {opacity: 1}
-.board-bug-closed.inverse, .board-task-closed.inverse {opacity: 1}
+.board-bug-cancel, .board-task-cancel {background: #333;   }
+.board-bug-wait, .board-task-wait     {background: #2b529c;}
+.board-task-pause                     {background: #E48600;}
+.board-bug-doing, .board-task-doing   {background: #DC143C;}
+.board-bug-done, .board-task-done     {background: #229F24;}
+.board-bug-closed, .board-task-closed {background: #777;   }
 
 .board-story {color: #dd7503; background-color: #FFF3E0;}
 .board-story.stage-projected  {color:#777;}
diff --git a/module/project/view/ajaxkanbansetting.html.php b/module/project/view/ajaxkanbansetting.html.php
index 00d64aa0d9..4d9f9edddc 100644
--- a/module/project/view/ajaxkanbansetting.html.php
+++ b/module/project/view/ajaxkanbansetting.html.php
@@ -35,8 +35,8 @@
         <div class='row-table'>
           <?php foreach($colorList as $status => $color):?>
           <div class='col-table'>
+            <input type='hidden' id='color<?php echo $status?>' name="colorList[<?php echo $status?>]" data-provide='colorpicker' data-wrapper='input-group-btn' value='<?php echo $color;?>' data-colors='#333,#2B529C,#E48600,#D2323D,#229F24,#777,#D2691E,#008B8B,#2E8B57,#4169E1,#4B0082,#FA8072,#BA55D3,#2E8B57,#6B8E23'>
             <?php echo $lang->task->statusList[$status];?>
-            <input type='hidden' id='color<?php echo $status?>' name="colorList[<?php echo $status?>]" data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false'  data-update-text='#name' value='<?php echo $color;?>'>
           </div>
           <?php endforeach;?>
         </div>
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 457de5ea64..e92107ee8c 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -12,7 +12,7 @@
 <?php include './taskheader.html.php';?> 
 <style>
 <?php foreach($colorList as $status => $color):?>
-<?php echo ".board-bug-$status, .board-task-$status {background: $color;}\n"?>
+<?php echo ".board-bug-$status, .board-task-$status {background: " . ($color ? $color : '#000') . ";}\n"?>
 <?php endforeach?>
 </style>
 <?php