diff --git a/module/user/css/resetpassword.ui.css b/module/user/css/resetpassword.ui.css index ae26ea86be..aee50ba0ce 100644 --- a/module/user/css/resetpassword.ui.css +++ b/module/user/css/resetpassword.ui.css @@ -1,3 +1,5 @@ +#mainContent {padding-top: 0;} +#mainContent .alert-danger {color: var(--color-danger-500); background-color: var(--color-danger-50);} #mainContent .panel {max-width: 600px; margin-top: 100px;} .reset-password .form-group {padding-left: 0;} .reset-password .form-label {position: static; width: min-content; padding-left: 0;} diff --git a/module/user/lang/de.php b/module/user/lang/de.php index 9e6bceae3a..5e145f3a29 100644 --- a/module/user/lang/de.php +++ b/module/user/lang/de.php @@ -322,7 +322,7 @@ $lang->user->mkdirLinux = << EOT; -$lang->user->jumping = "This page will redirect to the previous page in 3 seconds. Redirect Now"; +$lang->user->jumping = "This page will redirect to the previous page in 3 seconds. Redirect Now"; $lang->user->zentaoapp = new stdclass(); $lang->user->zentaoapp->logout = 'Logout'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 753630d572..54fb76bf76 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -322,7 +322,7 @@ $lang->user->mkdirLinux = << EOT; -$lang->user->jumping = "This page will redirect to the previous page in 3 seconds. Redirect Now"; +$lang->user->jumping = "This page will redirect to the previous page in 3 seconds. Redirect Now"; $lang->user->zentaoapp = new stdclass(); $lang->user->zentaoapp->logout = 'Logout'; diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php index 83afe5b417..ffd8794e44 100644 --- a/module/user/lang/fr.php +++ b/module/user/lang/fr.php @@ -322,7 +322,7 @@ $lang->user->mkdirLinux = << EOT; -$lang->user->jumping = "This page will redirect to the previous page in 3 seconds. Redirect Now"; +$lang->user->jumping = "This page will redirect to the previous page in 3 seconds. Redirect Now"; $lang->user->zentaoapp = new stdclass(); $lang->user->zentaoapp->logout = 'Logout'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 7eadf7ff37..d7a7915536 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -322,7 +322,7 @@ $lang->user->mkdirLinux = << EOT; -$lang->user->jumping = "10秒钟后页面将自动跳转登录页。 立即跳转"; +$lang->user->jumping = "10秒钟后页面将自动跳转登录页。 立即跳转"; $lang->user->zentaoapp = new stdclass(); $lang->user->zentaoapp->logout = '退出登录'; diff --git a/module/user/ui/forgetpassword.html.php b/module/user/ui/forgetpassword.html.php index 9bf6016f7f..982ba8e6b7 100644 --- a/module/user/ui/forgetpassword.html.php +++ b/module/user/ui/forgetpassword.html.php @@ -10,52 +10,60 @@ declare(strict_types=1); */ namespace zin; -formPanel +set::zui(true); +div ( - to::headingActions + set::id('main'), + div ( - a + set::id('mainContent'), + formPanel ( - set::href(inlink('reset')), - $lang->user->resetTitle, - ), - ), - set::title($lang->admin->resetPWDByMail), - setClass('forget-password'), - set::actions(array()), - formRow - ( - formGroup - ( - setClass('flex-wrap'), - set::label($lang->user->account), - set::name('account'), - set::value(''), - set::required(true), - set::placeholder($lang->user->placeholder->loginAccount) - ), - ), - formRow - ( - formGroup - ( - set::label($lang->user->email), - set::name('email'), - set::value(''), - set::required(true), - set::placeholder($lang->user->placeholder->email) - ) - ), - formRow - ( - setClass('form-actions'), - toolbar - ( - btn(set(array('text' => $lang->user->submit, 'btnType' => 'submit', 'type' => 'primary', 'class' => 'mx-4'))), - btn(set(array('text' => $lang->goback, 'url' => createLink('user', 'login'), 'back' => true, 'class' => 'mx-4'))), + to::headingActions + ( + a + ( + set::href(inlink('reset')), + $lang->user->resetTitle, + ), + ), + set::title($lang->admin->resetPWDByMail), + setClass('forget-password'), + set::actions(array()), + formRow + ( + formGroup + ( + setClass('flex-wrap'), + set::label($lang->user->account), + set::name('account'), + set::value(''), + set::required(true), + set::placeholder($lang->user->placeholder->loginAccount) + ), + ), + formRow + ( + formGroup + ( + set::label($lang->user->email), + set::name('email'), + set::value(''), + set::required(true), + set::placeholder($lang->user->placeholder->email) + ) + ), + formRow + ( + setClass('form-actions'), + toolbar + ( + btn(set(array('text' => $lang->user->submit, 'btnType' => 'submit', 'type' => 'primary', 'class' => 'mx-4'))), + btn(set(array('text' => $lang->goback, 'url' => createLink('user', 'login'), 'back' => true, 'class' => 'mx-4'))), + ), + ), ), ), ); -render(); - +render('pagebase'); diff --git a/module/user/ui/resetpassword.html.php b/module/user/ui/resetpassword.html.php index 2054d656d1..11e15c7930 100644 --- a/module/user/ui/resetpassword.html.php +++ b/module/user/ui/resetpassword.html.php @@ -10,69 +10,74 @@ declare(strict_types=1); */ namespace zin; jsVar('expired', $expired); -if($expired) -{ + +$content = $expired ? div +( + setClass('alert-danger p-4 mb-6'), + $lang->user->linkExpired, + html(sprintf($lang->user->jumping, inlink('login'))), +) : formPanel +( + setClass('reset-password w-full'), + set::title($lang->user->resetPassword), + set::actions(array()), + formRow + ( + formGroup + ( + set::label($lang->user->password), + set::required(true), + password + ( + set::checkStrength(true) + ), + ), + ), + formRow + ( + formGroup + ( + set::label($lang->user->password2), + set::required(true), + set::control('password'), + set::name('password2'), + set::value(''), + ) + ), + formRow + ( + setClass('hidden'), + formGroup + ( + set::name('passwordLength'), + set::value(0), + ), + formGroup + ( + set::name('verifyRand'), + set::value($rand), + ), + ), + formRow + ( + setClass('form-actions'), + toolbar + ( + btn(set(array('text' => $lang->user->submit, 'btnType' => 'submit', 'type' => 'primary', 'class' => 'mx-4'))), + btn(set(array('text' => $lang->goback, 'url' => createLink('user', 'login'), 'back' => true, 'class' => 'mx-4'))), + ), + ), +); + +set::zui(true); +div +( + set::id('main'), div ( - setClass('alert-info p-4 mb-6'), - $lang->user->linkExpired, - html(sprintf($lang->user->jumping, inlink('login'))), - ); -} -else -{ - formPanel - ( - setClass('reset-password w-full'), - set::title($lang->user->resetPassword), - set::actions(array()), - formRow - ( - formGroup - ( - set::label($lang->user->password), - set::required(true), - password - ( - set::checkStrength(true) - ), - ), - ), - formRow - ( - formGroup - ( - set::label($lang->user->password2), - set::required(true), - set::control('password'), - set::name('password2'), - set::value(''), - ) - ), - formRow - ( - setClass('hidden'), - formGroup - ( - set::name('passwordLength'), - set::value(0), - ), - formGroup - ( - set::name('verifyRand'), - set::value($rand), - ), - ), - formRow - ( - setClass('form-actions'), - toolbar - ( - btn(set(array('text' => $lang->user->submit, 'btnType' => 'submit', 'type' => 'primary', 'class' => 'mx-4'))), - btn(set(array('text' => $lang->goback, 'url' => createLink('user', 'login'), 'back' => true, 'class' => 'mx-4'))), - ), - ), - ); -} + set::id('mainContent'), + $content, + ), +); -render(); +render('pagebase');