diff --git a/module/admin/control.php b/module/admin/control.php index f463a896d9..865695b780 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -523,6 +523,8 @@ class admin extends control { if(!empty($_POST)) { + if(!$this->post->mobile || !$this->post->code) return $this->send(array('result' => 'fail', 'message' => $this->lang->admin->register->loginFailedNoInfo)); + $apiRoot = $this->config->admin->register->apiRoot; $sessionVar = $this->config->sessionVar; $zentaosid = $_COOKIE[$sessionVar]; diff --git a/module/admin/css/register.ui.css b/module/admin/css/register.ui.css index 20daf0bcdf..bb2799ef65 100644 --- a/module/admin/css/register.ui.css +++ b/module/admin/css/register.ui.css @@ -48,5 +48,6 @@ button[type="submit"] {height: 40px; width: 120px;} .install-logo img {height: auto; max-width: 9rem;} .unbind-modal-title {font-size: 18px; font-weight: bold} .modal-dialog {width: 28rem; border-radius: 8px;} -.modal-footer button {float: right; margin-left: 0.5rem;} -.modal-footer {display: block} \ No newline at end of file +.modal-footer button {margin-left: 16.5rem;} +.modal-footer {display: block} +.skip-btn {float: right; margin-top: -4.5rem;margin-right: 1rem;z-index: 100;height: 40px;} \ No newline at end of file diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index d7cc3b942a..0c2a74a473 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -226,8 +226,10 @@ $lang->admin->ai->assistant = 'AI Assistant'; $lang->admin->register = new stdclass(); $lang->admin->register->registerTitle = 'Join ZenTao'; +$lang->admin->register->skip = 'Skip'; $lang->admin->register->uxPlanTitle = 'ZenTao User Experience Improvement Program'; $lang->admin->register->loginFailed = 'Login failed'; +$lang->admin->register->loginFailedNoInfo = 'Please fill in the registration information'; $lang->admin->register->officialWebsite = 'ZenTao Official website '; $lang->admin->register->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; $lang->admin->register->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 26a716cd5c..cd4d66767a 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -226,8 +226,10 @@ $lang->admin->ai->assistant = 'AI Assistant'; $lang->admin->register = new stdclass(); $lang->admin->register->registerTitle = 'Join ZenTao'; +$lang->admin->register->skip = 'Skip'; $lang->admin->register->uxPlanTitle = 'ZenTao User Experience Improvement Program'; $lang->admin->register->loginFailed = 'Login failed'; +$lang->admin->register->loginFailedNoInfo = 'Please fill in the registration information'; $lang->admin->register->officialWebsite = 'ZenTao Official website '; $lang->admin->register->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; $lang->admin->register->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 9768a07001..719ebb1966 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -226,8 +226,10 @@ $lang->admin->ai->assistant = 'AI Assistant'; $lang->admin->register = new stdclass(); $lang->admin->register->registerTitle = 'Join ZenTao'; +$lang->admin->register->skip = 'Skip'; $lang->admin->register->uxPlanTitle = 'ZenTao User Experience Improvement Program'; $lang->admin->register->loginFailed = 'Login failed'; +$lang->admin->register->loginFailedNoInfo = 'Please fill in the registration information'; $lang->admin->register->officialWebsite = 'ZenTao Official website '; $lang->admin->register->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; $lang->admin->register->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index b405c7e2f8..38602923f4 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -226,8 +226,10 @@ $lang->admin->ai->assistant = 'AI 助手'; $lang->admin->register = new stdclass(); $lang->admin->register->registerTitle = '加入禅道社区'; +$lang->admin->register->skip = '跳过'; $lang->admin->register->uxPlanTitle = '禅道用户体验改进计划'; $lang->admin->register->loginFailed = '登录失败'; +$lang->admin->register->loginFailedNoInfo = '请填写注册信息'; $lang->admin->register->officialWebsite = '禅道官网 '; $lang->admin->register->uxPlanWithBookTitle = '《禅道用户体验改进计划》'; $lang->admin->register->uxPlanStatusTitle = '帮助我们了解产品使用情况,您可在后台关闭此功能。'; diff --git a/module/admin/ui/register.html.php b/module/admin/ui/register.html.php index d6f28c18eb..0a8768bf52 100644 --- a/module/admin/ui/register.html.php +++ b/module/admin/ui/register.html.php @@ -22,28 +22,40 @@ $checked = $agreeUX == 'true' ? 'checked' : ''; if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) { - div - ( - setClass('install-logo'), - img(set::src('static/images/install_logo.png')) - ); + $logo = ''; } else { - div( - setClass('page-title'), - a( - icon(setClass('icon icon-back')), - setClass('btn capitalize primary'), - set::href(helper::createLink('admin')), - $lang->admin->register->goBack - ), - span($lang->admin->register->registerTitle), - ); + $logo = div( + setClass('page-title'), + a( + icon(setClass('icon icon-back')), + setClass('btn capitalize primary'), + set::href(helper::createLink('admin')), + $lang->admin->register->goBack + ), + span($lang->admin->register->registerTitle), + ); +} + +if (strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) { + $skip = div + ( + a( + setClass('btn capitalize skip-btn'), + $lang->admin->register->skip, + set::href(createLink('user', 'login')), + ) + ); +} +else +{ + $skip = ''; } if($bindCommunity) { + $logo; div ( setID('main'), @@ -160,6 +172,7 @@ if($bindCommunity) } else { + $logo; div ( setID('main'), @@ -184,6 +197,7 @@ else setClass('bg-canvas m-auto mw-auto'), set::headingClass('w-96 m-auto'), set::submitBtnText($lang->admin->register->registerTitle), + set::cancelBtnText(), div(setClass('label-text'), $lang->admin->register->mobile), formRow ( @@ -254,8 +268,9 @@ else $lang->admin->register->uxPlanStatusTitle ) ) - ) + ), ), + $skip, div( setClass('captcha-mobile-sender captcha-box'), set::style(array('display' => 'none')),