diff --git a/module/action/lang/en.php b/module/action/lang/en.php index b82e62f4db..af2b86eb59 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -110,6 +110,7 @@ $lang->action->desc->svncommited = '$date, submitted by $actoraction->desc->gitcommited = '$date, submitted by $actor and the version is #$extra.' . "\n"; $lang->action->desc->finished = '$date, finished by $actor.' . "\n"; $lang->action->desc->paused = '$date, paused by $actor.' . "\n"; +$lang->action->desc->verified = '$date, verified by $actor.' . "\n"; $lang->action->desc->diff1 = '%s has been changed. Its value was "%s" and the new value is "%s".
' . "\n"; $lang->action->desc->diff2 = '%s has been changed. The difference is ' . "\n" . "
%s
" . "\n"; $lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n"; @@ -171,6 +172,7 @@ $lang->action->label->editestimate = 'Edited Man-Hour'; $lang->action->label->canceled = 'Cancelled'; $lang->action->label->finished = 'Finished'; $lang->action->label->paused = 'Paused'; +$lang->action->label->paused = 'Verified'; $lang->action->label->delayed = 'Delayed'; $lang->action->label->suspended = 'Suspended'; $lang->action->label->login = 'Login'; @@ -262,5 +264,6 @@ $lang->action->search->label['editestimate'] = $lang->action->label->edit $lang->action->search->label['canceled'] = $lang->action->label->canceled; $lang->action->search->label['finished'] = $lang->action->label->finished; $lang->action->search->label['paused'] = $lang->action->label->paused; +$lang->action->search->label['verified'] = $lang->action->label->verified; $lang->action->search->label['login'] = $lang->action->label->login; $lang->action->search->label['logout'] = $lang->action->label->logout; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 96e6aa1ca1..86a3f4edcf 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -112,6 +112,7 @@ $lang->action->desc->svncommited = '$date, 由 $actor 提交 $lang->action->desc->gitcommited = '$date, 由 $actor 提交代码,版本为#$extra。' . "\n"; $lang->action->desc->finished = '$date, 由 $actor 完成。' . "\n"; $lang->action->desc->paused = '$date, 由 $actor 暂停。' . "\n"; +$lang->action->desc->verified = '$date, 由 $actor 验收。' . "\n"; $lang->action->desc->diff1 = '修改了 %s,旧值为 "%s",新值为 "%s"。
' . "\n"; $lang->action->desc->diff2 = '修改了 %s,区别为:' . "\n" . "
%s
" . "\n"; $lang->action->desc->diff3 = '将文件名 %s 改为 %s 。' . "\n"; @@ -173,6 +174,7 @@ $lang->action->label->editestimate = '编辑了工时'; $lang->action->label->canceled = '取消了'; $lang->action->label->finished = '完成了'; $lang->action->label->paused = '暂停了'; +$lang->action->label->verified = '验收了'; $lang->action->label->delayed = '延期'; $lang->action->label->suspended = '挂起'; $lang->action->label->login = '登录系统'; @@ -266,5 +268,6 @@ $lang->action->search->label['editestimate'] = $lang->action->label->edit $lang->action->search->label['canceled'] = $lang->action->label->canceled; $lang->action->search->label['finished'] = $lang->action->label->finished; $lang->action->search->label['paused'] = $lang->action->label->paused; +$lang->action->search->label['verified'] = $lang->action->label->verified; $lang->action->search->label['login'] = $lang->action->label->login; $lang->action->search->label['logout'] = $lang->action->label->logout; diff --git a/module/project/css/storykanban.css b/module/project/css/storykanban.css index 2a46209874..bf48fab63b 100644 --- a/module/project/css/storykanban.css +++ b/module/project/css/storykanban.css @@ -12,7 +12,6 @@ #kanbanWrapper tbody td {vertical-align: top; padding: 6px} #kanbanWrapper tbody th {background: #f1f1f1} #kanbanWrapper .board-shadow {height: 0; opacity: 0; transition: opacity 0.2s;} -#kanbanWrapper tbody tr.dragging td.col-droppable {background: #fff4e5} #kanbanWrapper tbody tr.dragging td.col-droppable.drop-to {background: #ffeacc} #kanbanWrapper tbody tr.dragging td.col-droppable.drop-to .board-story + .board-shadow {margin-top: 6px;} #kanbanWrapper tbody tr.dragging td.col-droppable.drop-to .board-shadow {height: 28px; background: #999; background: rgba(0,0,0,0.35); opacity: 1;} @@ -56,12 +55,12 @@ .story-pri.pri-4 {background-color:#795523;} .board-story {color: #dd7503; background-color: #FFF3E0;} -.board-story.stage-projected {color:#777;} -.board-story.stage-developing {color:#D2322D; background-color: #FFEBEE;} -.board-story.stage-developed {color:#229F24; background-color: #E8F5E9;} -.board-story.stage-testing {color:#EF6C00; background-color: #FFF3E0;} -.board-story.stage-tested {color:#827717; background-color: #F9FBE7} -.board-story.stage-released {color:#9C27B0; background-color: #F3E5F5} +.board-story.board-story-projected {color:#777;} +.board-story.board-story-developing {color:#D2322D; background-color: #FFEBEE;} +.board-story.board-story-developed {color:#229F24; background-color: #E8F5E9;} +.board-story.board-story-testing {color:#EF6C00; background-color: #FFF3E0;} +.board-story.board-story-tested {color:#827717; background-color: #F9FBE7} +.board-story.board-story-released {color:#9C27B0; background-color: #F3E5F5} .affix {position:fixed; top:0px; width:95%;z-index:1030;} #kanbanHeader.affix {box-shadow: 0 3px 10px rgba(0,0,0,.1);} diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index d66a3a994a..b416ef606e 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -16,12 +16,14 @@ project->confirmUnlinkStory)?> -
-
icons['story']);?> project->story;?>
+
+
id", '', 'button', 'columns', '', '', '', '', $lang->project->kanban); common::printIcon('story', 'export', "productID=$productID&orderBy=id_desc", '', 'button', '', '', 'export'); $this->lang->story->create = $this->lang->project->createStory; diff --git a/module/project/view/storykanban.html.php b/module/project/view/storykanban.html.php index 21fe7bb2f1..969cfd34c7 100644 --- a/module/project/view/storykanban.html.php +++ b/module/project/view/storykanban.html.php @@ -10,12 +10,14 @@ ?> project->confirmUnlinkStory)?> -
-
icons['story']);?> project->story;?>
+
+
id", '', 'button', 'list', '', '', '', '', $lang->project->story); common::printIcon('story', 'export', "productID=$productID&orderBy=id_desc", '', 'button', '', '', 'export'); $this->lang->story->create = $this->lang->project->createStory; @@ -43,15 +45,12 @@ $account = $this->app->user->account - -
story->stageList[$col];?> story->stageList[$endCol];?>
- @@ -64,7 +63,7 @@ $account = $this->app->user->account
-
+
createLink('story', 'view', "story=$story->id", '', true), $story->title, '', 'class="kanbanFrame" title="' . $story->title . '"');?>
@@ -80,10 +79,10 @@ $account = $this->app->user->account
diff --git a/module/story/control.php b/module/story/control.php index f7d6a5b7e4..ae815aba81 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -933,9 +933,11 @@ class story extends control $storyIDList = array_unique($storyIDList); $allChanges = $this->story->batchChangeStage($storyIDList, $stage); if(dao::isError()) die(js::error(dao::getError())); + + $action = $stage == 'verified' ? 'Verified' : 'Edited'; foreach($allChanges as $storyID => $changes) { - $actionID = $this->action->create('story', $storyID, 'Edited'); + $actionID = $this->action->create('story', $storyID, $action); $this->action->logHistory($actionID, $changes); $this->story->sendmail($storyID, $actionID); }