diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index 84df7b4d85..5dfb548cc3 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -1015,7 +1015,7 @@ class baseRouter
session_name($sessionName);
session_set_cookie_params(0, $this->config->webRoot, '', $this->config->cookieSecure, true);
if($this->config->customSession) session_save_path($this->getTmpRoot() . 'session');
- session_start();
+ if(!session_id()) session_start();
$this->sessionID = isset($ztSessionHandler) ? $ztSessionHandler->getSessionID() : session_id();
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 48cd5fea48..dc1ccf25d3 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -143,7 +143,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
| bug->status;?> |
-
+ |
bug->statusList, $bug->status);
echo html::hidden('status', $bug->status);
@@ -152,7 +152,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
|
| bug->confirmed;?> |
- bug->confirmedList[$bug->confirmed];?> |
+ bug->confirmedList[$bug->confirmed];?> |
| bug->assignedTo;?> |
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/execution/view/testcase.html.php b/module/execution/view/testcase.html.php
index ae80bc56c9..b33242d9bd 100644
--- a/module/execution/view/testcase.html.php
+++ b/module/execution/view/testcase.html.php
@@ -94,7 +94,7 @@
openedBy);?> |
lastRunner);?> |
lastRunDate)) echo substr($case->lastRunDate, 5, 11);?> |
- lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> |
+ lastRunResult ? $lang->testcase->resultList[$case->lastRunResult] : $lang->testcase->unexecuted;?> |
browseType = $type;
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index 8f0f14b6a3..893729bea4 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -94,11 +94,11 @@
| taskName;?> |
testcase->typeList, $case->type);?> |
- processStatus('testcase', $case);?> |
+ processStatus('testcase', $case);?> |
openedBy);?> |
lastRunner);?> |
lastRunDate) ? '' : substr($case->lastRunDate, 5, 11);?> |
- lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> |
+ lastRunResult ? $lang->testcase->resultList[$case->lastRunResult] : $lang->testcase->unexecuted;?> |
delay)):?>
project->delayed;?>
- processStatus('project', $project);?>
+ processStatus('project', $project);?>
diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css
index 8b43d91f06..e8ef272860 100644
--- a/module/testcase/css/browse.css
+++ b/module/testcase/css/browse.css
@@ -17,9 +17,6 @@ body {margin-bottom: 25px;}
.pl-5px {padding-left: 5px;}
-.fail .result-fail, .blocked .result-blocked {color: #f00;}
-.pass .result-pass {color: green;}
-
tbody > tr > td > .btn-icon {margin-right: 3px;}
tbody > tr > td .icon-share {font-size: 9px;}
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/css/cases.css b/module/testtask/css/cases.css
index c789b31aad..07ce91ae3e 100644
--- a/module/testtask/css/cases.css
+++ b/module/testtask/css/cases.css
@@ -13,7 +13,4 @@ td.c-story {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
td .warning {color: red;}
#modules .active {font-weight: bolder;}
-.fail .result-fail, .blocked .result-blocked {color: #f00;}
-.pass .result-pass {color: green;}
-
.tree li > a.active {color: #0c64eb;}
diff --git a/module/testtask/model.php b/module/testtask/model.php
index dadc66cadd..a77f443a58 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1498,7 +1498,7 @@ class testtaskModel extends model
if($id == 'status') $class .= $run->status;
if($id == 'title') $class .= ' text-left';
if($id == 'id') $class .= ' cell-id';
- if($id == 'lastRunResult') $class .= " $run->lastRunResult";
+ if($id == 'lastRunResult') $class .= "result-testcase $run->lastRunResult";
if($id == 'assignedTo' && $run->assignedTo == $account) $class .= ' red';
if($id == 'actions') $class .= 'c-actions';
@@ -1595,8 +1595,7 @@ class testtaskModel extends model
break;
case 'lastRunResult':
$lastRunResultText = $run->lastRunResult ? zget($this->lang->testcase->resultList, $run->lastRunResult, $run->lastRunResult) : $this->lang->testcase->unexecuted;
- $class = 'result-' . $run->lastRunResult;
- echo "" . $lastRunResultText . "";
+ echo $lastRunResultText;
break;
case 'story':
if($run->story and $run->storyTitle) echo html::a(helper::createLink('story', 'view', "storyID=$run->story"), $run->storyTitle);
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/issue.html.php b/module/user/view/issue.html.php
index 20d807ba20..68a06f14e7 100644
--- a/module/user/view/issue.html.php
+++ b/module/user/view/issue.html.php
@@ -51,10 +51,10 @@
id);?> |
issue->typeList, $issue->type);?> |
createLink('issue', 'view', "id=$issue->id", '', '', $issue->project), $issue->title, '', "data-group='project'");?> |
- issue->severityList, $issue->severity);?> |
+ issue->severityList, $issue->severity);?> |
pri;?> |
owner);?> |
- issue->statusList, $issue->status);?> |
+ issue->statusList, $issue->status);?> |
createdDate = substr($issue->createdDate, 0, 10)?>
createdDate;?> |
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index f04dff18f1..332df1a25f 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -73,7 +73,7 @@
openedBy);?> |
estimate . $config->hourUnit;?> |
- processStatus('story', $story);?> |
+ processStatus('story', $story);?> |
config->vision != 'lite'):?>
story->stageList[$story->stage];?> |
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/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index c0b4afbc18..d0429da5b7 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -53,11 +53,11 @@
createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?> |
testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> |
testcase->typeList[$case->type];?> |
- processStatus('testcase', $case);?> |
+ processStatus('testcase', $case);?> |
openedBy);?> |
lastRunner);?> |
lastRunDate) ? '' : substr($case->lastRunDate, 5, 11);?> |
- lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> |
+ lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> |
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php
index d24fa5298b..b470ec3e48 100755
--- a/module/user/view/testtask.html.php
+++ b/module/user/view/testtask.html.php
@@ -55,7 +55,7 @@
build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> |
begin?> |
end?> |
- processStatus('testtask', $task);?> |
+ processStatus('testtask', $task);?> |
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index f588ff7ffe..d91d5e36be 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -73,8 +73,8 @@ th.c-confirmed, th.c-confirm {text-align: center;}
.c-case-step {width: 300px;}
.c-actions-8 {width: 240px;}
-.confirmed, .confirm1 {color: #0DBB7D;}
-.unconfirmed, .confirm0 {color: gray;}
+.confirmed, .confirm1 {color: #313C52;}
+.unconfirmed, .confirm0 {color: #9EA3B0;}
#userNav>li.open>a:before, #userNav>li>a:hover:before {position: absolute; bottom: 0px; left: calc(50% - 10px); width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;}
#userNav .dropdown-menu {z-index: 2000;}
@@ -153,3 +153,31 @@ td.delayed > span {display: inline-block; height: 20px; line-height: 18px; backg
.table tbody td.has-child .icon-angle-right {color: #838a9d;}
.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;}
+.status-closed, #workflowTable td.text-center.text-muted {color: #9EA3B0;}
+.status-draft {color: #8166EE;}
+.status-cancel, .status-investigate, .status-canceled {color: #838A9D;}
+.status-done, .status-resolved, .status-replied, .status-checked, #workflowTable td.text-success, .result-testcase.pass, .c-lastRunResult .result-pass {color: #0DBB7D;}
+.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-pri-5, .label-selector > .label-pri[data-value="4"], .label-selector > .label-pri[data-value="5"] {color: #9EA3B0; border-color: #9EA3B0;}