diff --git a/module/execution/css/testcase.css b/module/execution/css/testcase.css index 485a750a3d..4037191ccc 100644 --- a/module/execution/css/testcase.css +++ b/module/execution/css/testcase.css @@ -2,3 +2,4 @@ .c-result {width: 80px;} #pageNav #dropMenu .col-left {padding-bottom: 0px;} #currentBranch + #dropMenu .col-left {padding-bottom: 30px;} +.status-blocked {left: -5px;} diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index bbf7a5fb39..b93d8eb53d 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -576,7 +576,7 @@ function renderStoryItem(item, $item, col) if(scaleSize <= 2) { var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; - var priHtml = '' + item.pri + ''; + var priHtml = '' + item.pri + ''; var hoursHtml = (item.estimate && scaleSize <= 1) ? ('' + item.estimate + hourUnit + '') : ''; var avatarHtml = renderUserAvatar(item.assignedTo, 'story', item.id, '', col.type); var $infos = $item.find('.infos'); @@ -642,7 +642,7 @@ function renderBugItem(item, $item, col) { var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; var severityHtml = scaleSize <= 1 ? ('') : ''; - var priHtml = '' + item.pri + ''; + var priHtml = '' + item.pri + ''; var avatarHtml = renderUserAvatar(item.assignedTo, 'bug', item.id, '', col.type); var $infos = $item.find('.infos'); @@ -707,7 +707,7 @@ function renderTaskItem(item, $item, col) if(scaleSize <= 2) { - var priHtml = '' + item.pri + ''; + var priHtml = '' + item.pri + ''; var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('' + taskLang.leftAB + ' ' + item.left + 'h') : ('' + taskLang.estimateAB + ' ' + item.estimate + 'h'); var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id, '', col.type); diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js index a98dca7d67..0c02f13b2c 100644 --- a/module/execution/js/taskkanban.js +++ b/module/execution/js/taskkanban.js @@ -156,7 +156,7 @@ function renderStoryItem(item, $item, col) if(scaleSize <= 2) { var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; - var priHtml = '' + item.pri + ''; + var priHtml = '' + item.pri + ''; var hoursHtml = (item.estimate && scaleSize <= 1) ? ('' + item.estimate + hourUnit +'') : ''; var avatarHtml = renderUserAvatar(item.assignedTo, 'story', item.id, '', col.type); var $infos = $item.find('.infos'); @@ -221,7 +221,7 @@ function renderBugItem(item, $item, col) { var idHtml = scaleSize <= 1 ? ('#' + item.id + '') : ''; var severityHtml = scaleSize <= 1 ? ('') : ''; - var priHtml = '' + item.pri + ''; + var priHtml = '' + item.pri + ''; var avatarHtml = renderUserAvatar(item.assignedTo, 'bug', item.id, '', col.type); var $infos = $item.find('.infos'); @@ -284,7 +284,7 @@ function renderTaskItem(item, $item, col) if(scaleSize <= 2) { - var priHtml = '' + item.pri + ''; + var priHtml = '' + item.pri + ''; var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('' + taskLang.leftAB + ' ' + item.left + 'h') : ('' + taskLang.estimateAB + ' ' + item.estimate + 'h'); var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id, '', col.type); diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php index 04d1fcacdd..338e38a854 100755 --- a/module/execution/view/importbug.html.php +++ b/module/execution/view/importbug.html.php @@ -56,7 +56,7 @@ id) . html::hidden("id[$bug->id]", $bug->id);?> - bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> + bug->severityList, $bug->severity, $bug->severity)?>' data-severity="severity?>">bug->severityList, $bug->severity, $bug->severity)?> pri;?>' title='bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> id", $bug->title, '', "class='preview'", true, true);?> processStatus('bug', $bug);?> diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index 58e6974ed6..d031a2d67b 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -31,7 +31,7 @@ @@ -60,7 +60,7 @@
execution->latestDynamic;?>
@@ -84,7 +84,7 @@
execution->relatedMember;?>
@@ -130,7 +130,7 @@
execution->doclib;?>
@@ -164,7 +164,7 @@
name . $lang->execution->CFD;?>
@@ -189,7 +189,7 @@
execution->relatedMember;?>
@@ -331,7 +331,7 @@
execution->manageProducts;?> - id", '', '', "class='btn btn-link pull-right muted'");?> + id", strtoupper($lang->more), '', "class='btn btn-link pull-right muted'");?>
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 75490cdeb2..7950927243 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -373,7 +373,7 @@ function renderKanbanItem(item, $item) if(item.estimate == 0) $info.children('.estimate').hide(); $info.children('.pri') - .attr('class', 'pri label-pri label-pri-' + item.pri) + .attr('class', 'pri' + (item.pri ? ' label-pri label-pri-' + item.pri : '')) .text(item.pri); var $time = $info.children('.time'); diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index abe50d7f89..097de09cb4 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -21,7 +21,7 @@
execution->latestDynamic;?>
model != 'kanban' and common::hasPriv('project', 'dynamic')):?>
@@ -45,7 +45,7 @@
execution->relatedMember;?>
@@ -155,7 +155,7 @@
project->manageProducts;?> - id", '', '', "class='btn btn-link pull-right muted'");?> + id", strtoupper($lang->more), '', "class='btn btn-link pull-right muted'");?>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index b9ae0328d5..a4d3d9b26f 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -144,7 +144,7 @@ story->id;?> story->pri;?>>priAB;?> - story->title;?> + story->title;?> story->assignedTo;?> story->estimate;?> story->status;?> @@ -157,7 +157,8 @@ id;?> pri . "'>"; + $priClass = $child->pri ? 'label-pri label-pri-' . $child->pri : ''; + echo ""; echo $child->pri == '0' ? '' : zget($this->lang->story->priList, $child->pri, $child->pri); echo ""; ?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 47e1697c39..d2635cbcdb 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -131,9 +131,9 @@ left;?> id", $child, 'list', '', '', 'iframe showinonlybody', true); - common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); - common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('task', 'start', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); + common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe showinonlybody', true); common::printIcon('task', 'edit', "taskID=$child->id", $child, 'list'); common::printIcon('task', 'activate', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true); diff --git a/module/testreport/css/common.css b/module/testreport/css/common.css index f8fccf634f..72f07e5618 100644 --- a/module/testreport/css/common.css +++ b/module/testreport/css/common.css @@ -1,2 +1,3 @@ i.icon-help {font-size: 10px;} #refresh a.btn {border-left: none;} +.status-blocked {left: -5px;} diff --git a/www/theme/default/style.css b/www/theme/default/style.css index c979126a4c..b006c818c7 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -177,8 +177,8 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline- .status-reviewing .label-dot {background-color: #18A6FD;} .status-cancel, .status-investigate, .status-canceled {color: #838A9D;} .status-active .label-dot, .status-wait .label-dot {background-color: #313C52;} -.status-doing, .status-commenting, .status-checking, .status-confirmed, .status-issue.status-active {color: #FF6F42;} .status-closed, #workflowTable td.text-center.text-muted, .status-testtask.status-done {color: #9EA3B0;} +.status-doing, .status-commenting, .status-checking, .status-confirmed, .status-issue.status-active {color: #FF6F42;} .status-suspended, .status-pause, .status-blocked, .status-hangup, .result-testcase.blocked, .c-lastRunResult .result-blocked {color: #B89664;} .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;} @@ -211,6 +211,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline- .kanban-item-bug .label-severity[data-severity="3"], #legendBasicInfo .label-severity[data-severity="3"], .c-severity > .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 2px -65px;} .kanban-item-bug .label-severity[data-severity="4"], #legendBasicInfo .label-severity[data-severity="4"], .c-severity > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -101px;} +.pri-text > .label-pri {padding: 1px 5px;} .pri-text > .label-pri, .pri-text > .label-severity {height: 20px;} .pri-text > .label-severity {background-size: 80%; background-position: 2px -132px;} .pri-text > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px -1px;}