From 816aa16bf28bdcd35ac46cb6177bfea6202ecacd Mon Sep 17 00:00:00 2001 From: liuyue Date: Mon, 8 May 2023 05:20:27 +0000 Subject: [PATCH] * Update style of assignTo page. --- module/todo/css/assignto.ui.css | 3 ++- module/todo/lang/en.php | 1 + module/todo/lang/zh-cn.php | 1 + module/todo/lang/zh-tw.php | 1 + module/todo/ui/assignto.html.php | 10 ++++++---- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/module/todo/css/assignto.ui.css b/module/todo/css/assignto.ui.css index 281271d2a6..9fe7426c0c 100644 --- a/module/todo/css/assignto.ui.css +++ b/module/todo/css/assignto.ui.css @@ -1,2 +1,3 @@ .form-row .items-center {align-items: center;} -.form-row .form-group.pl-3 {padding-left: 0.75rem;} +.form-row .form-group.pl-2 {padding-left: 0.5rem;} +.form-row .form-actions a.toolbar-item {display: none;} diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index e0ee0ffdc9..7fa034c889 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -37,6 +37,7 @@ $lang->todo->product = $lang->productCommon; $lang->todo->execution = $lang->executionCommon; $lang->todo->changeDate = "Change Date"; $lang->todo->future = 'TBD'; +$lang->todo->to = 'to'; $lang->todo->reasonList['story'] = "Convert to Story"; $lang->todo->reasonList['task'] = "Convert to Task"; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 8a9d7d30e3..e319e1ab1c 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -37,6 +37,7 @@ $lang->todo->product = "所属{$lang->productCommon}"; $lang->todo->execution = "所属{$lang->execution->common}"; $lang->todo->changeDate = "修改日期"; $lang->todo->future = '待定'; +$lang->todo->to = '至'; $lang->todo->reasonList['story'] = "转{$lang->SRCommon}"; $lang->todo->reasonList['task'] = "转任务"; diff --git a/module/todo/lang/zh-tw.php b/module/todo/lang/zh-tw.php index 87df6d1204..b633578bab 100644 --- a/module/todo/lang/zh-tw.php +++ b/module/todo/lang/zh-tw.php @@ -36,6 +36,7 @@ $lang->todo->cycleConfig = "周期設置"; $lang->todo->project = "所屬項目"; $lang->todo->product = "所屬產品"; $lang->todo->execution = "所屬{$lang->execution->common}"; +$lang->todo->to = '至'; $lang->todo->reasonList['story'] = "轉{$lang->SRCommon}"; $lang->todo->reasonList['task'] = "轉任務"; diff --git a/module/todo/ui/assignto.html.php b/module/todo/ui/assignto.html.php index a77bf61712..59d2e283cf 100755 --- a/module/todo/ui/assignto.html.php +++ b/module/todo/ui/assignto.html.php @@ -15,6 +15,7 @@ set::title($lang->todo->assignedTo); formPanel ( + set::class('bg-white', 'p-6'), formGroup ( set::name('assignedTo'), @@ -37,12 +38,12 @@ formPanel ), formGroup ( - set::class(array('items-center', 'pl-3')), + set::class(array('items-center', 'pl-2')), checkbox ( set::name('future'), set::text($lang->todo->periods['future']), - on::change('switchDateTodo(this)') + on::change('togglePending(this)') ) ) ), @@ -62,6 +63,7 @@ formPanel set::value(date('Y-m-d') != $todo->date ? key($times) : $time), on::change('selectNext') ), + span($lang->todo->to, set::class('input-group-addon')), select ( set::name('end'), @@ -72,11 +74,11 @@ formPanel ), formGroup ( - set::class(array('items-center', 'pl-3')), + set::class(array('items-center', 'pl-2')), checkbox ( set::name('lblDisableDate'), - set::text($lang->todo->lblDisableDate), + set::text($lang->todo->periods['future']), on::change('switchDateFeature(this)') ) )