diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css index 9be97aa3b6..04597a63a1 100644 --- a/module/testcase/css/browse.css +++ b/module/testcase/css/browse.css @@ -36,13 +36,24 @@ tbody > tr > td .icon-share {font-size: 9px;} .table-nest-icon { cursor: pointer; } .tr-moving { opacity: 0.3; } - .tr-acceptable { border: 2px solid rgba(255,0,0,0.5); } - .none-select { -webkit-user-select: none; -moz-user-select: none; -moz-user-select: none; user-select: none; } .table-nest-toggle { vertical-align: middle; } - .table-nest-title .icon-test { pointer-events: none; } -.icon-test:after { border: 0px solid!important; } +.icon-test:after,.icon-ztf:after { border: 0px solid!important; } + +#caseTableList.sortable-sorting > tr {opacity: 0.7} +#caseTableList.sortable-sorting > tr.drag-row {opacity: 1;} +#caseTableList > tr.drop-not-allowed {opacity: 0.1!important} +#caseList .c-actions {overflow: visible;} +#caseList > thead > tr > th .table-nest-toggle-global {top: 6px} +#caseList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;} +#caseTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;} +#caseTableList .icon-common:before {width: 22px; height: 22px; background: none; color: rgb(166, 170, 184); top: 0; line-height: 22px; margin-right: 2px; font-size: 14px} +#caseTableList .icon-project:before {content: '\e99c';} +#caseTableList .icon-test:before {content: '\e956';} +#caseTableList .icon-ztf:before {content: '\e9dd';} +#caseTableList .icon-waterfall:before {content: '\e9a4';} +#caseTableList .icon-kanban:before {content: '\e983';} diff --git a/module/testcase/model.php b/module/testcase/model.php index ec51f37081..8dababcbe6 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -2373,7 +2373,8 @@ class testcaseModel extends model } else { - echo ""; + $icon = $case->auto == 'auto' ? 'icon-ztf' : 'icon-test'; + echo ""; } } else @@ -2422,15 +2423,17 @@ class testcaseModel extends model $showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1; } - $autoIcon = $case->auto == 'auto' ? " " : ''; if(isset($branches[$case->branch]) and $showBranch) echo "{$branches[$case->branch]} "; if($modulePairs and $case->module and isset($modulePairs[$case->module])) echo "{$modulePairs[$case->module]} "; echo $canView ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") : "$case->title"; - $fromLink = ($fromCaseID and $canView) ? helper::createLink('testcase', 'view', "caseID=$fromCaseID") : '#'; - $title = $fromCaseID ? "[#$fromCaseID]$autoIcon" : $autoIcon; - if($case->auto == 'auto') echo html::a($fromLink, $title, '', "data-app='{$this->app->tab}'"); + if($fromCaseID and $canView) + { + $fromLink = helper::createLink('testcase', 'view', "caseID=$fromCaseID"); + $title = "[#$fromCaseID]"; + echo html::a($fromLink, $title, '', "data-app='{$this->app->tab}'"); + } } else { diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 7ec8077473..a0d1ebb77e 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -344,20 +344,6 @@ js::set('langNormal', $lang->testcase->normal); -