diff --git a/module/block/view/issueblock.html.php b/module/block/view/issueblock.html.php index 995bcad94c..017d1157ea 100644 --- a/module/block/view/issueblock.html.php +++ b/module/block/view/issueblock.html.php @@ -32,8 +32,8 @@ id);?> createLink('issue', 'view', "issueID=$issue->id", '', '', $issue->project), $issue->title)?> - issue->priList, $issue->pri)?> - issue->severityList, $issue->severity)?> + issue->priList, $issue->pri)?> + issue->severityList, $issue->severity)?> deadline == '0000-00-00' ? '' : $issue->deadline;?> processStatus('issue', $issue);?> diff --git a/module/block/view/todolist.html.php b/module/block/view/todolist.html.php index 13ab4544d2..86d61184e5 100644 --- a/module/block/view/todolist.html.php +++ b/module/block/view/todolist.html.php @@ -41,7 +41,7 @@ todo->priList, $todo->pri);?> name);?> - todo->statusList, $todo->status);?> + todo->statusList, $todo->status);?> diff --git a/module/bug/css/create.css b/module/bug/css/create.css index 557bf69e84..746ea7a8b8 100644 --- a/module/bug/css/create.css +++ b/module/bug/css/create.css @@ -56,3 +56,5 @@ html[lang='de'] #keywordsAddonLabel, .task {width: 73px;} #projectLabel {display: inline;} #openedBuildLabel {display: inline; position: relative; width: 50%; left: 14%;} #bugTypeInputGroup > .table-col {width: 40% !important;} + +.pri-text > .label-pri {padding: 1px 5px;} diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index e52cdc849d..18e51dfab5 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -20,7 +20,7 @@
doc->orderByEdit;?>
@@ -132,7 +132,7 @@
doc->myDoc;?>
@@ -170,7 +170,7 @@
doc->myCollection;?>
diff --git a/module/my/css/testcase.css b/module/my/css/testcase.css new file mode 100644 index 0000000000..80b0d560ff --- /dev/null +++ b/module/my/css/testcase.css @@ -0,0 +1,2 @@ +.c-status, .c-type {width: 70px;} +.c-user {width: 80px;} diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js index 7ef247b48c..e94cef7be2 100644 --- a/module/productplan/js/browse.js +++ b/module/productplan/js/browse.js @@ -18,7 +18,7 @@ $(function() var content = $content.find('div').html(); if(content.indexOf('= 0 || content.indexOf('= 0) { - $content.append(""); + $content.append(""); } }); @@ -192,14 +192,14 @@ $(document).on('click', 'td.content .more', function(e) $toggle.removeClass('open'); $toggle.closest('.content').find('div').css('height', '25px'); $toggle.css('padding-top', 0); - $toggle.find('i').removeClass('rotate-down'); + $toggle.find('i').addClass('rotate-down'); } else { $toggle.addClass('open'); $toggle.closest('.content').find('div').css('height', 'auto'); $toggle.css('padding-top', ($toggle.closest('.content').find('div').height() - $toggle.height()) / 2); - $toggle.find('i').addClass('rotate-down'); + $toggle.find('i').removeClass('rotate-down'); } }); diff --git a/module/story/model.php b/module/story/model.php index a3718dee88..5fc69e3f9c 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4781,7 +4781,7 @@ class storyModel extends model echo ""; break; case 'pri': - echo ""; + echo ""; echo zget($this->lang->story->priList, $story->pri, $story->pri); echo ""; break; diff --git a/module/testreport/view/blockcases.html.php b/module/testreport/view/blockcases.html.php index b8fb669709..7981ff8faa 100644 --- a/module/testreport/view/blockcases.html.php +++ b/module/testreport/view/blockcases.html.php @@ -29,7 +29,7 @@ assignedTo);?> lastRunner);?> lastRunDate, 2);?> - testcase->resultList, $case->lastRunResult);?> + testcase->resultList, $case->lastRunResult);?> processStatus('testcase', $case);?> diff --git a/module/testtask/css/browse.css b/module/testtask/css/browse.css index a2a2c4134c..dc35533db0 100644 --- a/module/testtask/css/browse.css +++ b/module/testtask/css/browse.css @@ -3,3 +3,4 @@ .c-name {width: 200px;} .c-id {width: 60px;} .c-user, .c-status {width: 80px;} +.status-blocked {left: -5px;} diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index 821c398f65..e052cb5e1b 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -116,8 +116,8 @@ openedBy);?> lastRunner);?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> - lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> - processStatus('testcase', $case);?> + lastRunResult ? $lang->testcase->resultList[$case->lastRunResult] : $lang->testcase->unexecuted;?> + processStatus('testcase', $case);?> diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php index 494c4466ac..65025df2dd 100644 --- a/module/user/view/bug.html.php +++ b/module/user/view/bug.html.php @@ -53,8 +53,8 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> - bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> - bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> + bug->severityList, $bug->severity, $bug->severity)?>' data-severity='severity;?>'>bug->severityList, $bug->severity, $bug->severity)?> + bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> bug->typeList, $bug->type, '');?> openedBy);?> resolvedBy);?> diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php index 332df1a25f..8b2006e6ad 100644 --- a/module/user/view/story.html.php +++ b/module/user/view/story.html.php @@ -65,7 +65,7 @@ createLink('story', 'view', "id=$story->id");?> id));?> - story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> + story->priList, $story->pri, $story->pri);?> productTitle;?> title);?> config->vision != 'lite'):?> diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php index d0429da5b7..fb41e71528 100755 --- a/module/user/view/testcase.html.php +++ b/module/user/view/testcase.html.php @@ -51,7 +51,7 @@ createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?> createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?> - testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> + testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> testcase->typeList[$case->type];?> processStatus('testcase', $case);?> openedBy);?> diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 594ba7278d..4012ef7baa 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -165,7 +165,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline- .status-draft {color: #8166EE;} .status-clarify {color: #8166EE;} -.status-testtask.status-blocked {left: 0;} +.status-blocked {left: 0;} .status-testcase.status-wait {color: #18A6FD;} .status-done .label-dot {background-color: #0DBB7D;} .status-reviewing, .status-noreview {color: #18A6FD;} @@ -186,7 +186,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline- .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;} .severity-issue.severity-1, .c-severity .severity-1 {color: #FB2B2B;} -.severity-issue.severity-2, .c-severity .severity-2 {color: #FF9F44;} +.severity-issue.severity-2, .c-severity .severity-2 {color: #FF9F42;} .severity-issue.severity-3, .c-severity .severity-3 {color: #18A6FD;} .severity-issue.severity-4, .c-severity .severity-3 {color: #313C52;} @@ -222,3 +222,6 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline- .flow-block .footerbar span.label-success {background-color: #0DBB7D;} .flow-block .footerbar span.label-default {background-color: #9EA3B0;} .flow-block .footerbar span.label-warning {background-color: #313C52;} + +.btn.disabled {pointer-events: auto;} +.btn.disabled i {color: #313c52;}