From fb71698273ff7f1a73fe07d35c6f8a55a8d204cf Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 18 Aug 2021 08:05:51 +0800 Subject: [PATCH] * Finish task#41230. --- module/execution/css/all.css | 4 ++++ module/execution/view/all.html.php | 4 ++-- module/project/css/browse.css | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/module/execution/css/all.css b/module/execution/css/all.css index 30df68709f..c838652fbc 100644 --- a/module/execution/css/all.css +++ b/module/execution/css/all.css @@ -1 +1,5 @@ #product_chosen .chosen-single {width: 180px;} + +td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;} +td.flex span.label-badge {margin-left: 5px; min-width: 50px;} +td.flex span.project-type-label {margin-left: 5px; min-width: 36px;} diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 0b6d22bcab..fead9655c1 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -90,12 +90,12 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp id);?> - ' title='name?>'> + flex' title='name?>'> config->maxVersion)):?> '>execution->typeList[$execution->type]?> children) ? $execution->name : html::a($this->createLink('execution', 'task', 'execution=' . $execution->id), $execution->name); + echo !empty($execution->children) ? $execution->name : html::a($this->createLink('execution', 'task', 'execution=' . $execution->id), $execution->name, '', "class='text-ellipsis'"); if(isset($execution->delay)) echo "{$lang->execution->delayed} "; ?> children)):?> diff --git a/module/project/css/browse.css b/module/project/css/browse.css index 31859731d5..3e935f6f9a 100644 --- a/module/project/css/browse.css +++ b/module/project/css/browse.css @@ -12,4 +12,5 @@ td.c-actions {overflow: visible;} .panel-actions {position: relative; padding: 0 0;} td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;} -td.flex span.label-danger {margin-left: 5px; min-width: 50px;} +td.flex span.label-badge {margin-left: 5px; min-width: 50px;} +td.flex a.text-ellipsis {min-width: 30px;}