Finish task#3240 看板增加任务的暂停状态栏显示,cost:1 left:0

This commit is contained in:
wangyidong
2017-10-19 16:12:13 +08:00
parent b965b706a8
commit 4b52f18cbf
3 changed files with 7 additions and 4 deletions
+3 -1
View File
@@ -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;}
+2 -1
View File
@@ -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'}
+2 -2
View File
@@ -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>