diff --git a/module/holiday/ui/browse.html.php b/module/holiday/ui/browse.html.php index 43c96bc6ee..9480a318f1 100644 --- a/module/holiday/ui/browse.html.php +++ b/module/holiday/ui/browse.html.php @@ -50,7 +50,7 @@ sidebar ), ), ), - ), + ) ); $tableData = initTableData($holidays, $this->config->holiday->dtable->fieldList, $this->holiday); @@ -75,8 +75,8 @@ panel set::value($currentYear), set::items($yearList), on::change('changeYear'), - ), - ), + ) + ) ), toolbar ( @@ -88,14 +88,14 @@ panel set('data-toggle', 'modal'), set('data-size', 'sm'), $lang->holiday->create - ), - ), + ) + ) ), dtable ( set::cols($this->config->holiday->dtable->fieldList), set::data($tableData), - set::footer(), + set::footer() ), center ( @@ -108,6 +108,5 @@ panel ) ); - render(); diff --git a/module/holiday/ui/create.html.php b/module/holiday/ui/create.html.php index 6714e87c7f..f1ad92b979 100644 --- a/module/holiday/ui/create.html.php +++ b/module/holiday/ui/create.html.php @@ -25,9 +25,9 @@ formPanel set::inline(true), set::name('type'), set::items($lang->holiday->typeList), - set::value('holiday'), - ), - ), + set::value('holiday') + ) + ) ), formRow ( @@ -39,7 +39,7 @@ formPanel set::name('begin'), set::value(''), set::required('true') - ), + ) ), formRow ( @@ -51,7 +51,7 @@ formPanel set::name('end'), set::value(''), set::required('true') - ), + ) ), formRow ( @@ -62,7 +62,7 @@ formPanel set::name('name'), set::value(''), set::required('true') - ), + ) ), formRow ( @@ -72,12 +72,11 @@ formPanel textarea ( set::name('desc'), - set::rows('2'), + set::rows('2') ) - ), - ), + ) + ) ); - render(); diff --git a/module/holiday/ui/edit.html.php b/module/holiday/ui/edit.html.php index a7ca17a525..8d66b2c11f 100644 --- a/module/holiday/ui/edit.html.php +++ b/module/holiday/ui/edit.html.php @@ -29,9 +29,9 @@ formPanel set::inline(true), set::name('type'), set::items($lang->holiday->typeList), - set::value($holiday->type), - ), - ), + set::value($holiday->type) + ) + ) ), formRow ( @@ -43,7 +43,7 @@ formPanel set::name('begin'), set::value($holiday->begin), set::required('true') - ), + ) ), formRow ( @@ -55,7 +55,7 @@ formPanel set::name('end'), set::value($holiday->end), set::required('true') - ), + ) ), formRow ( @@ -66,7 +66,7 @@ formPanel set::name('name'), set::value($holiday->name), set::required('true') - ), + ) ), formRow ( @@ -77,12 +77,11 @@ formPanel ( set::name('desc'), set::rows('2'), - set::value($holiday->desc), + set::value($holiday->desc) ) - ), - ), + ) + ) ); - render(); diff --git a/module/holiday/ui/import.html.php b/module/holiday/ui/import.html.php index 12bb2b86b2..76535ac5c5 100644 --- a/module/holiday/ui/import.html.php +++ b/module/holiday/ui/import.html.php @@ -17,7 +17,7 @@ formPanel dtable ( set::cols($this->config->holiday->dtable->import->fieldList), - set::data($holidays), + set::data($holidays) ), formRow ( @@ -27,11 +27,10 @@ formPanel set::label(''), set::name('submit'), set::control('hidden'), - set::value(''), - ), - ), + set::value('') + ) + ) ); - render();