From b2697ff06369026f724594aa75f7878e697d10cd Mon Sep 17 00:00:00 2001 From: zhangjialiang Date: Thu, 26 Jun 2025 11:06:26 +0800 Subject: [PATCH] * Modify page style. --- module/admin/control.php | 2 +- module/admin/css/register.ui.css | 51 +++--- module/admin/js/register.ui.js | 7 + module/admin/lang/de.php | 6 +- module/admin/lang/en.php | 6 +- module/admin/lang/fr.php | 6 +- module/admin/lang/zh-cn.php | 8 +- module/admin/ui/register.html.php | 290 +++++++++++++----------------- 8 files changed, 176 insertions(+), 200 deletions(-) diff --git a/module/admin/control.php b/module/admin/control.php index 4af83e8c47..f9bf373922 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -552,7 +552,7 @@ class admin extends control $this->loadModel('setting')->setItem('system.admin.register.agreeUX', $agreeUX); $this->config->admin->agreeUX = $agreeUX; - return $this->send(array('result' => 'success', 'load' => inlink('register'))); + return $this->send(array('result' => 'success', 'message' => $this->lang->admin->community->joinSuccess, 'callback' => 'loadToRegister()')); } return $this->send(array('result' => 'fail', 'message' => isset($response['message']) ? $response['message'] : $this->lang->admin->community->loginFailed)); } diff --git a/module/admin/css/register.ui.css b/module/admin/css/register.ui.css index e2e41f3c91..c9a9662eb1 100644 --- a/module/admin/css/register.ui.css +++ b/module/admin/css/register.ui.css @@ -1,57 +1,64 @@ #main {min-height: 94%;} +.panel-form-div {margin: 0 auto; margin-top: 15%;} +.z-panel-form-div {margin: 0 auto;} .page-title {position: absolute; top: 1rem; float: left;} .page-title span {margin-left: 1rem;} .panel-form {padding: 0; max-width: 36rem;} -.form-title {background: linear-gradient(98.73deg, #28A5FF 1.4%, #0084FF 100%); display: block; color: #ffffff; margin: 0 auto; margin-top: 5%; max-width: 36rem; padding-left: 12px;} -.form-title .main-title {padding-top: 26px; padding-left: 12px;} -.form-title .sub-title {width: 24%; display: inline-block; color: #ffffff; margin-top: 28px; text-align: center;} +.form-title {display: block; margin: 0 auto; margin-top: 15%; max-width: 36rem;} +.form-title .main-title {padding-top: 26px; padding-left: 4.8rem;} +.form-title .sub-title {width: 20%; display: inline-block; margin-top: 28px; text-align: center;} .form-title .sub-title .icon {margin-right: 4px;} -.label-text {font-size: 16px; margin-left: 10px;} +.label-text {margin-left: 10px; float: left; line-height: 2.5rem;} .label-text:before { content: '* '; color: rgba(var(--color-danger-500-rgb), var(--tw-text-opacity));} -.no-label-mobile {width: 32rem;} -.no-label-code {width: 32rem; margin-left: 0.9rem;} -.no-label-input {height: 40px;} -#captchaImageLabel {margin-top: -1.5rem;} +.no-label-mobile {width: 70%; margin-left: 1.5rem; float: left;} +.no-label-code {width: 75%; margin-left: 1.5rem; float: left;} +.no-label-input {height: 2.5rem} +.label-text-mobile {margin-top: 0.1rem; margin-left: 3rem;} +.label-text-code {margin-top: 0.1rem; margin-left: 3rem;} +#captchaImageLabel {margin-top: 0;} #captchaImage {width: 7rem; margin-left: 0.8rem; display: inline;} #checkMobileSenderID {display: inline; cursor: pointer;} -#captcha-btn {width: 7rem; line-height: 40px; padding-left: 2rem; font-size: 15px; color: #0084FF;} -.form-agree-ux {color: #5A6D88;} -.form-agree-ux-text {max-width: 90%;} +#captcha-btn {width: 7rem; line-height: 40px; padding-left: 1rem; color: #0084FF;} +.form-agree-ux {color: #5A6D88; margin-left: 3.5rem; margin-top: 0.6rem;} +.form-agree-ux-text {max-width: 90%; font-size: 12px; line-height: 20px;} #experience-plan-show {color: #0084FF;} .form-actions .open-url{display: none;} -.captcha-mobile-sender {width: 204px; height: 124px; position: absolute; margin-left: 562px; box-shadow: 0px 2px 24px 3px #1F232914; background-color: #fff; margin-top: -16rem;} +.captcha-mobile-sender {width: 204px; height: 124px; position: absolute; margin-left: 32rem; box-shadow: 0px 2px 24px 3px #1F232914; background-color: #fff; margin-top: -17rem;} .captcha-wrapper {height:68px; margin-bottom: 12px;} .captcha-wrapper img, .image-box {width: 100%;height: 100%;} #checkMobileSender {height: 36px; line-height: 36px; color: #007AFF; background: #fff; padding:0;} #checkMobileSender:hover,#checkMobileSender:active,#checkMobileSender:focus {box-shadow: none;} button[type="submit"] {height: 40px; width: 120px;} -.panel-form {padding: 0; max-width: 36rem;} .z-box-container {width: 100%; margin: 0 auto; background: white; border-radius: 8px; padding: 24px; box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);} .z-bind-info-image {display: flex; align-items: center; margin-top: 0.4rem; margin-left: 0.4rem;} .z-bind-info-image img {width: 44px; height: 44px; margin-right: 12px;} -.z-bind-info-website {font-size: 18px; color: #666; margin-bottom: 4px; width: 10rem; display: flex;} +.z-bind-info-website {color: #666; margin-bottom: 4px; width: 10rem; display: flex;} .z-bind-info-website span {width: 10rem; display: flex;} -.z-bind-info-mobile {font-size: 15px;} -.z-unbind-btn {border: 1px solid #E6ECF8; color: #0084FF; border-radius: 16px; padding: 6px 16px; margin-left: 11rem; font-size: 15px; line-height: 15px; width: 7rem;} +.z-unbind-btn {border: 1px solid #E6ECF8; color: #0084FF; border-radius: 16px; padding: 6px 16px; margin-left: 11rem; line-height: 15px; width: 7rem;} .z-plan-info {margin-top: 20px; padding-top: 20px;} -.z-plan-info-box {margin-top: -2px; margin-left: 12px;} +.z-plan-info-box {margin-top: 1.3rem; margin-left: 30px;} .z-plan-info-box a {color: #0084FF; text-decoration: none;} .z-plan-info-box span {color: #666;} .z-plan-info-box-text {float: left; width: 80%;} -.z-switch {float: left; display: inline-block; margin-left: 2.6rem;} +.z-switch {display: inline-block; float: left;} .switch {min-height: 16px;} .z-switch-toggle {height: 24px; background: #0084FF; border-radius: 12px; position: relative;} -.z-footer-btn {margin-top: 24px; display: flex; justify-content: center; align-items: center; height: 40px;} -.z-footer-btn button {height: 40px; width: 146px; font-size: 16px;} +.z-footer-btn {margin-top: 68px; display: block; justify-content: center; align-items: center; height: 40px; margin-left: 2rem;} +.z-footer-btn button {width: 86px;} +.z-footer-btn .z-show-gift {margin-left: 2rem; width: 106px;} .z-bind-info {border: 1px solid #f0f0f0; border-radius: 5px;height: 4.4rem;} .z-plan-info {border: 1px solid #f0f0f0; border-radius: 5px;height: 3.6rem;} .install-logo {position: relative; top: 3rem; left: 3rem; float: left; margin-right: -12rem;} .install-logo img {height: auto; max-width: 9rem;} -.unbind-modal-title {font-size: 18px; font-weight: bold;} +/*.unbind-modal-title {font-weight: bold;}*/ .modal-dialog {width: 28rem; border-radius: 8px;} .modal-footer button {float: right;} .modal-footer .primary {margin-right: 1rem;} .modal-footer {display: block;} .modal-footer .toolbar {display: block;} .modal-footer .toolbar .primary {float: right;} -.skip-btn {float: right; margin-top: -4.5rem;margin-right: 1rem;z-index: 100;height: 40px;} \ No newline at end of file +.skip-btn {float: right; margin-top: -4.5rem; margin-right: 1rem; z-index: 70; height: 40px; width: 5rem;} +#unBind {color: #0084FF; margin-left: 1rem;} +.z-main-title {margin-left: 2rem;} +.load-indicator:before{background-color: rgb(248 249 250); height: 35rem;} +.unbind-modal-content{font-size: 14px} \ No newline at end of file diff --git a/module/admin/js/register.ui.js b/module/admin/js/register.ui.js index a4211ebc64..8314a9cc66 100644 --- a/module/admin/js/register.ui.js +++ b/module/admin/js/register.ui.js @@ -77,4 +77,11 @@ window.setSmsSenderTime = function() window.goCommunity = function(link) { window.open(link) +} + +window.loadToRegister = function() +{ + setTimeout(function() { + location.href = $.createLink('admin', 'register'); + }, 2000); } \ No newline at end of file diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index 718de6cc2b..5b0075d13a 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -233,7 +233,7 @@ $lang->admin->community->loginFailedMobile = 'Please provide your phone number $lang->admin->community->loginFailedCode = 'Please fill in the verification code'; $lang->admin->community->officialWebsite = 'ZenTao Official website '; $lang->admin->community->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program '; -$lang->admin->community->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.'; +$lang->admin->community->uxPlanStatusTitle = 'to help us improve.'; $lang->admin->community->mobile = 'phone number'; $lang->admin->community->smsCode = 'Verification code'; $lang->admin->community->sendCode = 'Get code'; @@ -242,8 +242,8 @@ $lang->admin->community->joinDesc = 'and help us understand the usage $lang->admin->community->captchaTip = 'verification code'; $lang->admin->community->sure = 'Confirm'; $lang->admin->community->unBindText = 'Disconnect'; -$lang->admin->community->welcome = 'Welcome to the ZenTao community! Here you can explore:'; -$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. Here you can access:"; +$lang->admin->community->welcome = 'Join Us'; +$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. your account:"; $lang->admin->community->advantage1 = 'PM resources'; $lang->admin->community->advantage2 = 'Technical support'; $lang->admin->community->advantage3 = 'Demos'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 5b3760db87..a1d1cb9c80 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -233,7 +233,7 @@ $lang->admin->community->loginFailedMobile = 'Please provide your phone number $lang->admin->community->loginFailedCode = 'Please fill in the verification code'; $lang->admin->community->officialWebsite = 'ZenTao Official website '; $lang->admin->community->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program '; -$lang->admin->community->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.'; +$lang->admin->community->uxPlanStatusTitle = 'to help us improve.'; $lang->admin->community->mobile = 'phone number'; $lang->admin->community->smsCode = 'Verification code'; $lang->admin->community->sendCode = 'Get code'; @@ -242,8 +242,8 @@ $lang->admin->community->joinDesc = 'and help us understand the usage $lang->admin->community->captchaTip = 'verification code'; $lang->admin->community->sure = 'Confirm'; $lang->admin->community->unBindText = 'Disconnect'; -$lang->admin->community->welcome = 'Welcome to the ZenTao community! Here you can explore:'; -$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. Here you can access:"; +$lang->admin->community->welcome = 'Join Us'; +$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. your account:"; $lang->admin->community->advantage1 = 'PM resources'; $lang->admin->community->advantage2 = 'Technical support'; $lang->admin->community->advantage3 = 'Demos'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 1196c2e4af..2c117b2f08 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -233,7 +233,7 @@ $lang->admin->community->loginFailedMobile = 'Please provide your phone number $lang->admin->community->loginFailedCode = 'Please fill in the verification code'; $lang->admin->community->officialWebsite = 'ZenTao Official website '; $lang->admin->community->uxPlanWithBookTitle = ' ZenTao User Experience Improvement Program '; -$lang->admin->community->uxPlanStatusTitle = 'to help us improve. You can disable this in settings.'; +$lang->admin->community->uxPlanStatusTitle = 'to help us improve.'; $lang->admin->community->mobile = 'phone number'; $lang->admin->community->smsCode = 'Verification code'; $lang->admin->community->sendCode = 'Get code'; @@ -242,8 +242,8 @@ $lang->admin->community->joinDesc = 'and help us understand the usage $lang->admin->community->captchaTip = 'verification code'; $lang->admin->community->sure = 'Confirm'; $lang->admin->community->unBindText = 'Disconnect'; -$lang->admin->community->welcome = 'Welcome to the ZenTao community! Here you can explore:'; -$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. Here you can access:"; +$lang->admin->community->welcome = 'Join Us'; +$lang->admin->community->welcomeForBound = "You're joined the ZenTao community. your account:"; $lang->admin->community->advantage1 = 'PM resources'; $lang->admin->community->advantage2 = 'Technical support'; $lang->admin->community->advantage3 = 'Demos'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index c71443b177..890d914262 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -233,17 +233,17 @@ $lang->admin->community->loginFailedMobile = '请填写手机号'; $lang->admin->community->loginFailedCode = '请填写验证码'; $lang->admin->community->officialWebsite = '禅道官网 '; $lang->admin->community->uxPlanWithBookTitle = '《禅道用户体验改进计划》'; -$lang->admin->community->uxPlanStatusTitle = '帮助我们了解产品使用情况，您可在后台关闭此功能。'; +$lang->admin->community->uxPlanStatusTitle = '帮助我们了解产品使用情况。'; $lang->admin->community->mobile = '手机号'; $lang->admin->community->smsCode = '验证码'; $lang->admin->community->sendCode = '获取验证码'; $lang->admin->community->join = '加入'; $lang->admin->community->joinDesc = '帮助我们了解产品使用情况。'; -$lang->admin->community->captchaTip = '请输入图形验证码'; +$lang->admin->community->captchaTip = '请输入验证码'; $lang->admin->community->sure = '  确定'; $lang->admin->community->unBindText = '解绑'; -$lang->admin->community->welcome = '欢迎您加入禅道社区。在这里，您可以获得：'; -$lang->admin->community->welcomeForBound = '您已加入禅道社区。在这里，您可以获得:'; +$lang->admin->community->welcome = '加入禅道社区'; +$lang->admin->community->welcomeForBound = '您已加入禅道社区，您的账号为：'; $lang->admin->community->advantage1 = '项目管理大礼包'; $lang->admin->community->advantage2 = '技术支持服务'; $lang->admin->community->advantage3 = '体验各版本Demo'; diff --git a/module/admin/ui/register.html.php b/module/admin/ui/register.html.php index 9871cfcb4a..c2dd77f210 100644 --- a/module/admin/ui/register.html.php +++ b/module/admin/ui/register.html.php @@ -21,173 +21,126 @@ if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) ( a ( - setClass('btn capitalize skip-btn'), + setClass('btn capitalize skip-btn font-normal'), $lang->admin->community->skip, set::href(createLink('index')), ) ); - $backBtn = ''; } else { $skip = ''; - $backBtn = div - ( - setClass('page-title'), - a - ( - icon(setClass('icon icon-back')), - setClass('btn capitalize primary'), - set::href(helper::createLink('admin')), - $lang->admin->community->goBack - ), - span($lang->admin->community->registerTitle), - ); } $welcomeText = $bindCommunity ? $lang->admin->community->welcomeForBound : $lang->admin->community->welcome; -$header[] = div -( - setClass('max-w-7xl h-32 form-title'), - div(setClass('main-title text-xl'), $welcomeText), - div(setClass('sub-title'), icon(setClass('icon icon-diamond')), $lang->admin->community->advantage1), - div(setClass('sub-title'), icon(setClass('icon icon-team')), $lang->admin->community->advantage2), - div(setClass('sub-title'), icon(setClass('icon icon-statistic')), $lang->admin->community->advantage3), - div(setClass('sub-title'), icon(setClass('icon icon-manual')), $lang->admin->community->advantage4), -); - if($bindCommunity) { - $backBtn; div ( - setID('main'), - setClass('flex justify-center'), div ( - setID('mainContent'), - setClass('px-1 mt-2 w-full max-w-7xl'), + setClass('panel pt-4 size-sm is-lite z-box-container'), div ( - setClass('panel panel-form pt-4 size-sm is-lite'), - $header, + setClass('main-title text-lg z-main-title'), + $welcomeText . $bindCommunityMobile, + button + ( + setData(array('position' => 'center', 'toggle' => 'modal', 'target' => '#positionModal')), + setID('unBind'), + $lang->admin->community->unBindText, + ), div ( - setClass('z-box-container'), + setID('positionModal'), + setClass('modal'), div ( - setClass('z-bind-info'), + setClass('modal-dialog shadow'), div ( - setClass('z-bind-info-image'), - img(set::src('static/images/register-logo.png')), + setClass('modal-content'), div ( - div(setClass('z-bind-info-website'), html(nl2br($lang->admin->community->officialWebsite))), - div(setClass('z-bind-info-mobile'), $bindCommunityMobile) + setClass('modal-body'), + p(setClass('unbind-modal-title'), $lang->admin->community->unbindTitle), + p(setClass('unbind-modal-content'), $lang->admin->community->unbindContent) ), - button + div ( - icon + setClass('modal-footer'), + button ( - setClass('icon icon-unlink') + setClass('btn'), + set::type('button'), + setData(array('dismiss' => 'modal')), + $lang->admin->community->cancelButton ), - setData(array('position' => 'center', 'toggle' => 'modal', 'target' => '#positionModal')), - setClass('btn btn-primary z-unbind-btn'), - setID('unBind'), - $lang->admin->community->unBindText, - ), - div - ( - setID('positionModal'), - setClass('modal'), - div + button ( - setClass('modal-dialog shadow'), - div - ( - setClass('modal-content'), - div - ( - setClass('modal-body'), - p(setClass('unbind-modal-title'), $lang->admin->community->unbindTitle), - p(setClass('unbind-modal-content'), $lang->admin->community->unbindContent) - ), - div - ( - setClass('modal-footer'), - button - ( - setClass('btn'), - set::type('button'), - setData(array('dismiss' => 'modal')), - $lang->admin->community->cancelButton - ), - button - ( - setClass('btn primary'), - set::type('button'), - $lang->admin->community->unbindButton, - on::click()->call('unBind') - ) - ) - ) + setClass('btn primary'), + set::type('button'), + $lang->admin->community->unbindButton, + on::click()->call('unBind') ) ) ) - ), - div - ( - setClass('z-plan-info'), - div - ( - setClass('z-plan-info-box'), - div - ( - setClass('z-plan-info-box-text'), - span($lang->admin->community->join), - a - ( - setID('experience-plan-show'), - set('data-size', 'lg'), - $lang->admin->community->uxPlanWithBookTitle, - set::href(createLink('admin', 'planModal')), - set('data-toggle', 'modal') - ), - span($lang->admin->community->joinDesc) - ), - div - ( - setClass('z-switch'), - switcher - ( - setClass('z-switch-toggle'), - setID('agreeUX'), - set('checked', $checked), - on::change()->call('changeAgreeUX', '#agreeUX'), - ) - ) - ), - ), - div - ( - setClass('z-footer-btn'), - button - ( - setClass('btn capitalize primary'), - $lang->admin->community->goCommunity, - on::click()->call('goCommunity', $config->admin->register->community), - ) ) ) + ), + div + ( + setClass('z-plan-info-box'), + div + ( + setClass('z-switch'), + checkbox + ( + setClass('z-switch-toggle'), + setID('agreeUX'), + set('checked', $checked), + on::change()->call('changeAgreeUX', '#agreeUX'), + ) + ), + div + ( + setClass('z-plan-info-box-text'), + span($lang->admin->community->join), + a + ( + setID('experience-plan-show'), + set('data-size', 'lg'), + $lang->admin->community->uxPlanWithBookTitle, + set::href(createLink('admin', 'planModal')), + set('data-toggle', 'modal') + ), + span($lang->admin->community->joinDesc) + ) + ), + div + ( + setClass('z-footer-btn'), + button + ( + setClass('btn capitalize primary'), + $lang->admin->community->goCommunity, + on::click()->call('goCommunity', $config->admin->register->community), + ), + a + ( + setClass('btn capitalize z-show-gift'), + set('data-size', 'sm'), + $lang->admin->community->giftPackage, + set::href(createLink('admin', 'giftPackage')), + set('data-toggle', 'modal') + ), ) ) ); } else { - $backBtn; div ( setID('main'), @@ -198,64 +151,73 @@ else setClass('px-1 mt-2 w-full max-w-7xl'), div ( - setClass('panel panel-form pt-4 size-sm is-lite'), - $header, + setClass('panel panel-form pt-4 size-sm is-lite panel-form-div'), + setClass('max-w-7xl h-16 form-title bg-canvas'), + div + (setClass('main-title text-lg'), $welcomeText), formPanel ( set::formID('joinForm'), - setClass('bg-canvas m-auto mw-auto'), + setClass('bg-canvas m-auto mw-auto font-normal'), set::headingClass('w-96 m-auto'), set::submitBtnText($lang->admin->community->registerTitle), set::cancelBtnText(), - div(setClass('label-text'), $lang->admin->community->mobile), - formRow - ( - setClass('m-auto no-label-mobile'), - formGroup + div( + setClass('label-text-mobile'), + div( + setClass('label-text font-normal'), + $lang->admin->community->mobile + ), + formRow ( - setClass('no-label'), - input + setClass('no-label-mobile font-normal'), + formGroup ( - setClass('no-label-input'), - set::name('mobile'), - setID('mobile-captcha'), - set::placeholder($lang->admin->community->enterMobile) + setClass('no-label'), + input + ( + setClass('no-label-input'), + set::name('mobile'), + setID('mobile-captcha'), + set::placeholder($lang->admin->community->enterMobile) + ) ) ) ), - p(setID('captchaImageError')), - p(setID('captchaMobileError')), div ( - setID('captchaImageLabel'), - setClass('label-text'), - $lang->admin->community->smsCode, - ), - formRow - ( - setClass('m-auto no-label-code'), - formGroup - ( - setClass('no-label'), - input - ( - setClass('no-label-input'), - set::name('code'), - set::placeholder($lang->admin->community->enterCode) - ) + setClass('label-text-code'), + div( + setID('captchaImageLabel'), + setClass('label-text font-normal'), + $lang->admin->community->smsCode ), - a + formRow ( - setID('captcha-btn'), - setClass('captcha-btn-class'), - set('href', 'javascript:;'), - $lang->admin->community->sendCode, - on::click()->call('showCaptcha'), + setClass('no-label-code font-normal'), + formGroup + ( + setClass('no-label'), + input + ( + setClass('no-label-input'), + set::name('code'), + set::placeholder($lang->admin->community->enterCode) + ) + ), + a + ( + setID('captcha-btn'), + setClass('captcha-btn-class'), + set('href', 'javascript:;'), + $lang->admin->community->sendCode, + on::click()->call('showCaptcha'), + ) ) ), formRow ( - setClass('m-auto form-agree-ux'), + setClass('form-agree-ux'), formGroup ( checkbox @@ -265,7 +227,7 @@ else ), span ( - setClass('form-agree-ux-text'), + setClass('form-agree-ux-text font-normal'), $lang->admin->community->join, a ( @@ -303,7 +265,7 @@ else ), div ( - setClass('w-96 m-auto'), + setClass('w-96 m-auto font-normal'), input ( set::name('captchaImage'),