From a82cc215ba6a772af41ef3b7d3f0f380bcb18c83 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 25 Oct 2022 14:53:25 +0800 Subject: [PATCH] * Optimize page style. --- module/bug/view/edit.html.php | 4 ++-- module/my/view/testcase.html.php | 2 +- module/testtask/css/cases.css | 3 --- module/testtask/model.php | 5 ++--- module/user/view/story.html.php | 2 +- module/user/view/testcase.html.php | 4 ++-- module/user/view/testtask.html.php | 2 +- www/theme/default/style.css | 10 +++++----- 8 files changed, 14 insertions(+), 18 deletions(-) diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 48cd5fea48..31456e34c0 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/my/view/testcase.html.php b/module/my/view/testcase.html.php index d37a3535a3..893729bea4 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -94,7 +94,7 @@ taskName;?> testcase->typeList, $case->type);?> - processStatus('testcase', $case);?> + processStatus('testcase', $case);?> openedBy);?> lastRunner);?> lastRunDate) ? '' : substr($case->lastRunDate, 5, 11);?> 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/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/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 9b798aecd6..6b6facc937 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -161,10 +161,10 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline- .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 {color: #FB2B2B;} +.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-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-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;}