Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms

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;}

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";

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']  = "转任务";

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']  = "轉任務";

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)')
             )
         )