diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 0443c89762..dc83599bc9 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -207,7 +207,7 @@
| bug->confirmed;?> |
- bug->confirmedList[$bug->confirmed];?> |
+ bug->confirmedList[$bug->confirmed];?> |
| bug->lblAssignedTo;?> |
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index d557bc92ab..abe50d7f89 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -123,7 +123,7 @@
delay)):?>
project->delayed;?>
- processStatus('project', $project);?>
+ processStatus('project', $project);?>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index c2b0b04f5e..087aea52c4 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -248,7 +248,7 @@
| testcase->status;?> |
-
+ |
processStatus('testcase', $case);
if($case->version > $case->currentVersion and $from == 'testtask')
@@ -274,7 +274,7 @@
|
| app->loadLang('testtask')->testtask->lastRunResult;?> |
- lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> |
+ lastRunResult ? $lang->testcase->resultList[$case->lastRunResult] : $lang->testcase->unexecuted;?> |
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index aa5acd4049..a68640c1eb 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -113,7 +113,7 @@
| testtask->status;?> |
- processStatus('testtask', $task);?> |
+ processStatus('testtask', $task);?> |
| testtask->testreport;?> |
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index b8ad733fa1..2877352555 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -66,7 +66,7 @@
createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color' title='$task->name'");?>
task->priList, $task->pri, $task->pri);?> |
- processStatus('task', $task);?> |
+ processStatus('task', $task);?> |
createLink('execution', 'browse', "executionID=$task->executionID"), $task->executionName);?> |
deadline, 0, 4) > 0) echo '' . $task->deadline . '';?> |
estimate . $lang->execution->workHourUnit;?> |
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 6b6facc937..d91d5e36be 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -154,6 +154,18 @@ td.delayed > span {display: inline-block; height: 20px; line-height: 18px; backg
.table.has-sort-head thead > tr > th:last-child {padding-right: 8px;}
tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
+.label.label-outline.status-wait {color: #313C52; border-color: #313C52;}
+.label.label-outline.status-doing {color: #FF6F42; border-color: #FF6F42;}
+.label.label-outline.status-suspended {color: #B89664; border-color: #B89664;}
+.label.label-outline.status-closed {color: #9EA3B0; border-color: #9EA3B0;}
+.status-active .label-dot, .status-wait .label-dot {background-color: #313C52;}
+.status-draft .label-dot {background-color: #8166EE;}
+.status-closed .label-dot {background-color: #9EA3B0;}
+.status-changing .label-dot {background-color: #FB2B2B;}
+.status-doing .label-dot {background-color: #FF6F42;}
+.status-done .label-dot {background-color: #0DBB7D;}
+.status-pause .label-dot {background-color: #B89664;}
+.status-cancel .label-dot {background-color: #B89664;}
.status-wait, .status-active, .status-active.status-bug, .status-normal, .status-asked, #workflowTable td.text-center.text-warning, .result-testcase, .c-lastRunResult span, .status-unconfirmed {color: #313C52;}
.status-doing, .status-commenting, .status-checkingi, .status-confirmed {color: #FF6F42;}
.status-suspended, .status-pause, .status-blocked, .status-hangup, .result-testcase.blocked, .c-lastRunResult .result-blocked {color: #B89664;}
@@ -164,7 +176,8 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.status-changing, .status-active.status-risk, .result-testcase.fail, .c-lastRunResult .result-fail, .severity-issue.severity-1, .c-severity .severity-1, .status-changed {color: #FB2B2B;}
.severity-issue.severity-2, .c-severity .severity-2 {color: #FF9F44;}
.severity-issue.severity-4, .c-severity .severity-3 {color: #313C52;}
+.label-pri, .label-selector > .label {color: #9EA3B0; border-color: #9EA3B0;}
.label-pri-1, .label-selector > .label-pri[data-value="1"] {color: #FF4912; border-color: #FF4912;}
.label-pri-2, .label-selector > .label-pri[data-value="2"] {color: #F38F19; border-color: #F38F19;}
.label-pri-3, .label-selector > .label-pri[data-value="3"] {color: #37B2FE; border-color: #37B2FE;}
-.label-pri-4, .label-selector > .label-pri[data-value="4"] {color: #9EA3B0; border-color: #9EA3B0;}
+.label-pri-4, .label-pri-5, .label-selector > .label-pri[data-value="4"], .label-selector > .label-pri[data-value="5"] {color: #9EA3B0; border-color: #9EA3B0;}