From 69fe59f541707cb97da6832217f2f54958595578 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 19 May 2022 05:06:43 +0000 Subject: [PATCH 1/4] * Finish task#54469. --- module/program/css/browse.css | 9 +++++++++ module/program/view/browsebylist.html.php | 8 ++++++-- module/project/view/.browsebylist.html.php.swp | Bin 0 -> 16384 bytes 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 module/project/view/.browsebylist.html.php.swp diff --git a/module/program/css/browse.css b/module/program/css/browse.css index eb6c0dcc9f..5cb5146323 100644 --- a/module/program/css/browse.css +++ b/module/program/css/browse.css @@ -7,3 +7,12 @@ tbody.sortable > tr > td.sort-handler .table-nest-toggle:before {cursor: pointer label[for^="projectIdList"]:before {top: 1px; width:14px; height:14px;} label[for^="projectIdList"]:after {width: 14px; height:14px;} tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;} + +.has-prefix {position: relative; display: flex; align-items: center;} +.has-suffix > span, +.has-prefix > span {flex: none;} +.has-suffix > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);} +.has-prefix > a, +.has-suffix > a {max-width: calc(100% - 100px);} +.has-prefix > a {padding-left: 5px;} +.has-suffix > a {padding-right: 5px;} diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 39511dc8fe..eb797acb81 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -49,7 +49,7 @@ ?> > - ' title='name?>'> + has-prefix' title='name?>'> type == 'program') $icon = ' icon-program'; @@ -60,7 +60,11 @@ type == 'program'):?> user->view->programs},", ",$program->id,") !== false ? html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name) : $program->name;?> - createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name);?> + createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', 'class="text-ellipsis text-primary"');?> + end); + if($delay > 0) echo "{$lang->project->statusList['delay']}"; + ?> project->statusList, $program->status, '');?> diff --git a/module/project/view/.browsebylist.html.php.swp b/module/project/view/.browsebylist.html.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..c945c6104d9ba7c0e6091e7943ed197f2f0839a3 GIT binary patch literal 16384 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 Date: Thu, 19 May 2022 05:15:50 +0000 Subject: [PATCH 2/4] * Finish task#54469. --- module/program/view/browsebylist.html.php | 7 +++++-- module/project/view/.browsebylist.html.php.swp | Bin 16384 -> 0 bytes 2 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 module/project/view/.browsebylist.html.php.swp diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index eb797acb81..0d90e99bbd 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -62,8 +62,11 @@ createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', 'class="text-ellipsis text-primary"');?> end); - if($delay > 0) echo "{$lang->project->statusList['delay']}"; + if($program->status != 'done' and $program->status != 'closed' and $program->status != 'suspended') + { + $delay = helper::diffDate(helper::today(), $program->end); + if($delay > 0) echo "{$lang->project->statusList['delay']}"; + } ?> diff --git a/module/project/view/.browsebylist.html.php.swp b/module/project/view/.browsebylist.html.php.swp deleted file mode 100644 index c945c6104d9ba7c0e6091e7943ed197f2f0839a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 Date: Thu, 19 May 2022 06:53:37 +0000 Subject: [PATCH 3/4] * Adjust code. --- module/program/view/browsebylist.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 0d90e99bbd..c125b501a8 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -49,7 +49,7 @@ ?> > - has-prefix' title='name?>'> + has-prefix has-suffix' title='name?>'> type == 'program') $icon = ' icon-program'; From 4c14307de14b3eaab592fc4ba87135661689cea3 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 19 May 2022 07:44:47 +0000 Subject: [PATCH 4/4] * Adjust CSS. --- module/program/css/browse.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/module/program/css/browse.css b/module/program/css/browse.css index 5cb5146323..0dacf2c83a 100644 --- a/module/program/css/browse.css +++ b/module/program/css/browse.css @@ -9,10 +9,7 @@ label[for^="projectIdList"]:after {width: 14px; height:14px;} tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;} .has-prefix {position: relative; display: flex; align-items: center;} -.has-suffix > span, .has-prefix > span {flex: none;} -.has-suffix > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);} -.has-prefix > a, -.has-suffix > a {max-width: calc(100% - 100px);} .has-prefix > a {padding-left: 5px;} -.has-suffix > a {padding-right: 5px;} + +.has-suffix > a {max-width: calc(100% - 100px); padding-right: 5px; color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}