From 11b227a8d774fbea981b2147a91cf911ee2f39b6 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 25 Jul 2023 08:43:21 +0800 Subject: [PATCH] * Fix holiday errors. --- module/holiday/config/table.php | 3 ++- module/holiday/ui/create.html.php | 5 ++--- module/holiday/ui/edit.html.php | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/module/holiday/config/table.php b/module/holiday/config/table.php index 4971fbdb94..d73923774a 100644 --- a/module/holiday/config/table.php +++ b/module/holiday/config/table.php @@ -6,12 +6,13 @@ $config->holiday->actionList['edit']['text'] = ''; $config->holiday->actionList['edit']['hint'] = $lang->holiday->edit; $config->holiday->actionList['edit']['url'] = array('module' => 'holiday', 'method' => 'edit', 'params' => 'holidayID={id}'); $config->holiday->actionList['edit']['data-toggle'] = 'modal'; +$config->holiday->actionList['edit']['data-size'] = 'sm'; $config->holiday->actionList['delete']['icon'] = 'trash'; $config->holiday->actionList['delete']['text'] = ''; $config->holiday->actionList['delete']['hint'] = $lang->holiday->delete; $config->holiday->actionList['delete']['url'] = array('module' => 'holiday', 'method' => 'delete', 'params' => 'holidayID={id}'); -$config->holiday->actionList['delete']['class'] = 'btn ghost toolbar-item text-primary square size-sm ajax-submit'; +$config->holiday->actionList['delete']['className'] = 'ajax-submit'; $config->holiday->actionList['delete']['data-confirm'] = $lang->holiday->confirmDelete; $config->holiday->dtable = new stdclass(); diff --git a/module/holiday/ui/create.html.php b/module/holiday/ui/create.html.php index e72ce8df07..fe7150b21c 100644 --- a/module/holiday/ui/create.html.php +++ b/module/holiday/ui/create.html.php @@ -10,15 +10,15 @@ declare(strict_types=1); */ namespace zin; +modalHeader(set::title($lang->holiday->create)); + formPanel ( - set::title($lang->holiday->create), set::formClass('border-0'), formRow ( formGroup ( - set::width('1'), set::label($lang->holiday->type), radioList ( @@ -65,7 +65,6 @@ formPanel ( formGroup ( - set::width('1'), set::label($lang->holiday->desc), editor ( diff --git a/module/holiday/ui/edit.html.php b/module/holiday/ui/edit.html.php index f4af724ac3..c0c5c6d1ed 100644 --- a/module/holiday/ui/edit.html.php +++ b/module/holiday/ui/edit.html.php @@ -10,15 +10,19 @@ declare(strict_types=1); */ namespace zin; -formPanel +modalHeader ( set::title($lang->holiday->edit), + set::entityID(''), +); + +formPanel +( set::formClass('border-0'), formRow ( formGroup ( - set::width('1/2'), set::label($lang->holiday->type), radioList ( @@ -65,7 +69,6 @@ formPanel ( formGroup ( - set::width('1/2'), set::label($lang->holiday->desc), editor (