diff --git a/module/execution/css/common.ui.css b/module/execution/css/common.ui.css deleted file mode 100644 index bdf512d96f..0000000000 --- a/module/execution/css/common.ui.css +++ /dev/null @@ -1,2 +0,0 @@ -.panel-form > .panel-heading.status-heading {justify-content: flex-start; padding-bottom: 0px;} -.panel-form > .panel-heading.status-heading > .panel-title {font-weight: 400; justify-content:flex-end; width: 5rem;} diff --git a/module/execution/ui/activate.html.php b/module/execution/ui/activate.html.php index 0097f0bc18..c6a2c1fb8f 100644 --- a/module/execution/ui/activate.html.php +++ b/module/execution/ui/activate.html.php @@ -10,26 +10,15 @@ declare(strict_types=1); */ namespace zin; +modalHeader +( + set::title($lang->execution->activate . $space . $lang->executionCommon), +); + $space = common::checkNotCN() ? ' ' : ''; formPanel ( - set::title($lang->execution->activate . $space . $lang->executionCommon), - set::headingClass('status-heading'), - set::titleClass('form-label .form-grid'), - set::shadow(false), - set::actions(array('submit')), set::submitBtnText($lang->execution->activate . $space . $lang->executionCommon), - to::headingActions - ( - entityLabel - ( - setClass('my-3 gap-x-3'), - set::level(1), - set::text($execution->name), - set::entityID($execution->id), - set::reverse(true), - ) - ), formRow ( formGroup @@ -76,8 +65,7 @@ formPanel ), ); -h::hr(set::class('mt-6')); - history(); + /* ====== Render page ====== */ render(); diff --git a/module/execution/ui/close.html.php b/module/execution/ui/close.html.php index 63de38e935..4dc33a674e 100644 --- a/module/execution/ui/close.html.php +++ b/module/execution/ui/close.html.php @@ -10,26 +10,15 @@ declare(strict_types=1); */ namespace zin; +modalHeader +( + set::title($lang->execution->close . $space . $lang->executionCommon), +); + $space = common::checkNotCN() ? ' ' : ''; formPanel ( - set::title($lang->execution->close . $space . $lang->executionCommon), - set::headingClass('status-heading'), - set::titleClass('form-label .form-grid'), - set::shadow(false), - set::actions(array('submit')), set::submitBtnText($lang->execution->close . $space . $lang->executionCommon), - to::headingActions - ( - entityLabel - ( - setClass('my-3 gap-x-3'), - set::level(1), - set::text($execution->name), - set::entityID($execution->id), - set::reverse(true), - ) - ), formGroup ( set::width('1/2'), @@ -49,8 +38,6 @@ formPanel ), ); -h::hr(set::class('mt-6')); - history(); /* ====== Render page ====== */ render(); diff --git a/module/execution/ui/putoff.html.php b/module/execution/ui/putoff.html.php index f90e816b1b..5c9e91beb8 100644 --- a/module/execution/ui/putoff.html.php +++ b/module/execution/ui/putoff.html.php @@ -12,26 +12,15 @@ namespace zin; jsVar('weekend', $config->execution->weekend); +modalHeader +( + set::title($lang->execution->putoff . $space . $lang->executionCommon), +); + $space = common::checkNotCN() ? ' ' : ''; formPanel ( - set::title($lang->execution->putoff . $space . $lang->executionCommon), - set::headingClass('status-heading'), - set::titleClass('form-label .form-grid'), - set::shadow(false), - set::actions(array('submit')), set::submitBtnText($lang->execution->putoff . $space . $lang->executionCommon), - to::headingActions - ( - entityLabel - ( - setClass('my-3 gap-x-3'), - set::level(1), - set::text($execution->name), - set::entityID($execution->id), - set::reverse(true), - ) - ), formRow ( formGroup @@ -100,5 +89,6 @@ formPanel ) ) ); + /* ====== Render page ====== */ render(); diff --git a/module/execution/ui/start.html.php b/module/execution/ui/start.html.php index 7dadf187fc..55fd5226c8 100644 --- a/module/execution/ui/start.html.php +++ b/module/execution/ui/start.html.php @@ -10,26 +10,15 @@ declare(strict_types=1); */ namespace zin; +modalHeader +( + set::title($lang->execution->start . $space . $lang->executionCommon), +); + $space = common::checkNotCN() ? ' ' : ''; formPanel ( - set::title($lang->execution->start . $space . $lang->executionCommon), - set::headingClass('status-heading'), - set::titleClass('form-label .form-grid'), - set::shadow(false), - set::actions(array('submit')), set::submitBtnText($lang->execution->start . $space . $lang->executionCommon), - to::headingActions - ( - entityLabel - ( - setClass('my-3 gap-x-3'), - set::level(1), - set::text($execution->name), - set::entityID($execution->id), - set::reverse(true), - ) - ), formGroup ( set::width('1/2'), @@ -49,8 +38,6 @@ formPanel ), ); -h::hr(set::class('mt-6')); - history(); /* ====== Render page ====== */ diff --git a/module/execution/ui/suspend.html.php b/module/execution/ui/suspend.html.php index 27a3dad886..c81fe60581 100644 --- a/module/execution/ui/suspend.html.php +++ b/module/execution/ui/suspend.html.php @@ -10,26 +10,15 @@ declare(strict_types=1); */ namespace zin; +modalHeader +( + set::title($lang->execution->suspend . $space . $lang->executionCommon), +); + $space = common::checkNotCN() ? ' ' : ''; formPanel ( - set::title($lang->execution->suspend . $space . $lang->executionCommon), - set::headingClass('status-heading'), - set::titleClass('form-label .form-grid'), - set::shadow(false), - set::actions(array('submit')), set::submitBtnText($lang->execution->suspend . $space . $lang->executionCommon), - to::headingActions - ( - entityLabel - ( - setClass('my-3 gap-x-3'), - set::level(1), - set::text($execution->name), - set::entityID($execution->id), - set::reverse(true), - ) - ), formGroup ( set::label($lang->comment), @@ -41,8 +30,6 @@ formPanel ), ); -h::hr(set::class('mt-6')); - history(); /* ====== Render page ====== */