From 342d4978e998e04794934c63fb00bf09bce9bb12 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 13 Nov 2023 14:06:26 +0800 Subject: [PATCH] * Remove `,` at the end of row in the lastest children in admin. --- module/admin/ui/checkweak.html.php | 10 +++--- module/admin/ui/index.html.php | 10 +++--- module/admin/ui/log.html.php | 2 +- module/admin/ui/resetpwdsetting.html.php | 12 +++---- module/admin/ui/safe.html.php | 42 ++++++++++++------------ module/admin/ui/setmodule.html.php | 6 ++-- module/admin/ui/sso.html.php | 14 ++++---- 7 files changed, 48 insertions(+), 48 deletions(-) diff --git a/module/admin/ui/checkweak.html.php b/module/admin/ui/checkweak.html.php index e44c633cd9..48c2a75959 100644 --- a/module/admin/ui/checkweak.html.php +++ b/module/admin/ui/checkweak.html.php @@ -19,7 +19,7 @@ if(common::hasPriv('admin', 'safe')) a ( set::href(createLink('admin', 'safe')), - $lang->admin->safe->set, + $lang->admin->safe->set ) ); } @@ -32,7 +32,7 @@ if(common::hasPriv('admin', 'checkWeak')) ( setClass('active'), set::href(createLink('admin', 'checkWeak')), - $lang->admin->safe->checkWeak, + $lang->admin->safe->checkWeak ) ); } @@ -44,7 +44,7 @@ if(common::hasPriv('admin', 'resetPWDSetting')) a ( set::href(createLink('admin', 'resetPWDSetting')), - $lang->admin->resetPWDSetting, + $lang->admin->resetPWDSetting ) ); } @@ -67,8 +67,8 @@ div dtable ( set::cols($config->admin->checkWeak->dtable->fieldList), - set::data($weakUsers), - ), + set::data($weakUsers) + ) ); diff --git a/module/admin/ui/index.html.php b/module/admin/ui/index.html.php index ca6066a654..076d26002e 100755 --- a/module/admin/ui/index.html.php +++ b/module/admin/ui/index.html.php @@ -51,7 +51,7 @@ $buildPluginHeader = function($name, $url): h div ( setClass('panel-title py-2.5'), - $name, + $name ), a ( @@ -109,9 +109,9 @@ foreach($lang->admin->menuList as $menuKey => $menu) set::href($config->admin->helpURL[$menuKey]), set::title($lang->help), set::target('_blank'), - icon('help'), + icon('help') ) - ), + ) ), p ( @@ -303,7 +303,7 @@ div set::href(inlink('register')), $lang->admin->registerNotice->submitHere ), - substr($lang->admin->notice->register, strpos($lang->admin->notice->register, '%s') + 2), + substr($lang->admin->notice->register, strpos($lang->admin->notice->register, '%s') + 2) ) : null ), div @@ -344,7 +344,7 @@ div ( setClass('border rounded-md mb-4'), $buildHeader($lang->admin->updateDynamics, $config->admin->dynamicURL), - $dynamicItems, + $dynamicItems ), div ( diff --git a/module/admin/ui/log.html.php b/module/admin/ui/log.html.php index 171500ce6a..8bcc68e55a 100644 --- a/module/admin/ui/log.html.php +++ b/module/admin/ui/log.html.php @@ -22,7 +22,7 @@ formPanel input ( set::name('days'), - set::value($config->admin->log->saveDays), + set::value($config->admin->log->saveDays) ) ), formGroup diff --git a/module/admin/ui/resetpwdsetting.html.php b/module/admin/ui/resetpwdsetting.html.php index cf4e0526ec..e8ad970b6c 100644 --- a/module/admin/ui/resetpwdsetting.html.php +++ b/module/admin/ui/resetpwdsetting.html.php @@ -19,7 +19,7 @@ if(common::hasPriv('admin', 'safe')) a ( set::href(createLink('admin', 'safe')), - $lang->admin->safe->set, + $lang->admin->safe->set ) ); } @@ -31,7 +31,7 @@ if(common::hasPriv('admin', 'checkWeak')) a ( set::href(createLink('admin', 'checkWeak')), - $lang->admin->safe->checkWeak, + $lang->admin->safe->checkWeak ) ); } @@ -44,7 +44,7 @@ if(common::hasPriv('admin', 'resetPWDSetting')) ( setClass('active'), set::href(createLink('admin', 'resetPWDSetting')), - $lang->admin->resetPWDSetting, + $lang->admin->resetPWDSetting ) ); } @@ -76,10 +76,10 @@ div set::name('resetPWDByMail'), set::control('radioListInline'), set::items($lang->admin->safe->resetPWDList), - set::value(isset($config->resetPWDByMail) ? $config->resetPWDByMail : 0), + set::value(isset($config->resetPWDByMail) ? $config->resetPWDByMail : 0) ) - ), - ), + ) + ) ); diff --git a/module/admin/ui/safe.html.php b/module/admin/ui/safe.html.php index 07134ee738..bf2b862e94 100644 --- a/module/admin/ui/safe.html.php +++ b/module/admin/ui/safe.html.php @@ -22,7 +22,7 @@ if(common::hasPriv('admin', 'safe')) ( setClass('active'), set::href(createLink('admin', 'safe')), - $lang->admin->safe->set, + $lang->admin->safe->set ) ); } @@ -34,7 +34,7 @@ if(common::hasPriv('admin', 'checkWeak')) a ( set::href(createLink('admin', 'checkWeak')), - $lang->admin->safe->checkWeak, + $lang->admin->safe->checkWeak ) ); } @@ -46,7 +46,7 @@ if(common::hasPriv('admin', 'resetPWDSetting')) a ( set::href(createLink('admin', 'resetPWDSetting')), - $lang->admin->resetPWDSetting, + $lang->admin->resetPWDSetting ) ); } @@ -91,14 +91,14 @@ div icon ( setClass('text-warning mr-1'), - 'help', + 'help' ), span ( !empty($config->safe->changeWeak) ? $lang->admin->safe->noticeWeakMode : $lang->admin->safe->noticeMode ) - ), - ), + ) + ) ) ), formRow @@ -113,10 +113,10 @@ div icon ( setClass('text-warning mr-1'), - 'help', + 'help' ), - $lang->admin->safe->modeRuleList[1] . $lang->admin->safe->noticeStrong, - ), + $lang->admin->safe->modeRuleList[1] . $lang->admin->safe->noticeStrong + ) ) ), formRow @@ -131,10 +131,10 @@ div icon ( setClass('text-warning mr-1'), - 'help', + 'help' ), - $lang->admin->safe->modeRuleList[2] . $lang->admin->safe->noticeStrong, - ), + $lang->admin->safe->modeRuleList[2] . $lang->admin->safe->noticeStrong + ) ) ), formRow @@ -146,8 +146,8 @@ div ( set::name('weak'), set::value($config->safe->weak), - set::rows('5'), - ), + set::rows('5') + ) ) ), formRow @@ -159,7 +159,7 @@ div set::name('changeWeak'), set::control('radioListInline'), set::items($lang->admin->safe->modifyPasswordList), - set::value(isset($config->safe->changeWeak) ? $config->safe->changeWeak : 0,), + set::value(isset($config->safe->changeWeak) ? $config->safe->changeWeak : 0,) ) ), formRow @@ -170,7 +170,7 @@ div set::name('modifyPasswordFirstLogin'), set::control('radioListInline'), set::items($lang->admin->safe->modifyPasswordList), - set::value(isset($config->safe->modifyPasswordFirstLogin) ? $config->safe->modifyPasswordFirstLogin : 0,), + set::value(isset($config->safe->modifyPasswordFirstLogin) ? $config->safe->modifyPasswordFirstLogin : 0,) ) ), formRow @@ -186,7 +186,7 @@ div set::items($lang->admin->safe->loginCaptchaList), set::value(isset($config->safe->loginCaptcha) ? $config->safe->loginCaptcha : 0,), set::inline(true), - set::disabled(!extension_loaded('gd')), + set::disabled(!extension_loaded('gd')) ), !extension_loaded('gd') ? span ( @@ -194,13 +194,13 @@ div icon ( setClass('text-warning mr-1'), - 'help', + 'help' ), $lang->admin->safe->noticeGd - ) : null, - ), + ) : null + ) ) - ), + ) ) ); diff --git a/module/admin/ui/setmodule.html.php b/module/admin/ui/setmodule.html.php index 4216ceacb1..2be4ebba45 100644 --- a/module/admin/ui/setmodule.html.php +++ b/module/admin/ui/setmodule.html.php @@ -56,7 +56,7 @@ foreach($config->featureGroup as $group => $features) set::type('hidden'), set::id("module{$code}"), set::name("module[{$code}]"), - set::value($value), + set::value($value) ); } $rows[] = h::tr @@ -104,7 +104,7 @@ formPanel setClass('text-md p-2.5 border-l'), $lang->admin->setModule->optional ) - ), + ) ), h::tbody ( @@ -140,7 +140,7 @@ formPanel ) ) ) - ), + ) ); render(); diff --git a/module/admin/ui/sso.html.php b/module/admin/ui/sso.html.php index 74af331af7..c1f7a52caa 100644 --- a/module/admin/ui/sso.html.php +++ b/module/admin/ui/sso.html.php @@ -24,7 +24,7 @@ formPanel set::name('turnon'), set::items($lang->sso->turnonList), set::inline(true), - set::value($turnon), + set::value($turnon) ) ) ), @@ -38,7 +38,7 @@ formPanel set::name('redirect'), set::items($lang->sso->turnonList), set::inline(true), - set::value($redirect), + set::value($redirect) ) ) ), @@ -64,7 +64,7 @@ formPanel div ( icon('help text-warning mr-1'), - html($lang->sso->help->addr), + html($lang->sso->help->addr) ) ) ), @@ -76,7 +76,7 @@ formPanel input ( set::name('code'), - set::value($code), + set::value($code) ) ) ), @@ -88,7 +88,7 @@ formPanel div ( icon('help text-warning mr-1'), - html($lang->sso->help->code), + html($lang->sso->help->code) ) ) ), @@ -100,7 +100,7 @@ formPanel input ( set::name('key'), - set::value($key), + set::value($key) ) ) ), @@ -112,7 +112,7 @@ formPanel div ( icon('help text-warning mr-1'), - html($lang->sso->help->key), + html($lang->sso->help->key) ) ) )