From 4bbf35bed180e5abb5ec403aff4e6cbf240b8ca1 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 20 Jun 2025 14:06:28 +0800 Subject: [PATCH 1/4] * Adjust admin register to community. --- module/admin/control.php | 10 ++--- module/admin/lang/de.php | 70 ++++++++++++++--------------- module/admin/lang/en.php | 70 ++++++++++++++--------------- module/admin/lang/fr.php | 70 ++++++++++++++--------------- module/admin/lang/zh-cn.php | 72 +++++++++++++++--------------- module/admin/ui/planmodal.html.php | 2 +- module/admin/ui/register.html.php | 70 ++++++++++++++--------------- 7 files changed, 182 insertions(+), 182 deletions(-) diff --git a/module/admin/control.php b/module/admin/control.php index 865695b780..71fd223caf 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -523,7 +523,7 @@ 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)); + if(!$this->post->mobile || !$this->post->code) return $this->send(array('result' => 'fail', 'message' => $this->lang->admin->community->loginFailedNoInfo)); $apiRoot = $this->config->admin->register->apiRoot; $sessionVar = $this->config->sessionVar; @@ -553,11 +553,11 @@ class admin extends control return $this->send(array('result' => 'success', 'load' => inlink('register'))); } - return $this->send(array('result' => 'fail', 'message' => isset($response['message']) ? $response['message'] : $this->lang->admin->register->loginFailed)); + return $this->send(array('result' => 'fail', 'message' => isset($response['message']) ? $response['message'] : $this->lang->admin->community->loginFailed)); } } - $this->view->title = $this->lang->admin->register->registerTitle; + $this->view->title = $this->lang->admin->community->registerTitle; $this->display(); } @@ -576,7 +576,7 @@ class admin extends control $this->config->admin->register->bindCommunity = 'false'; $this->config->admin->register->bindCommunityMobile = ''; $this->config->admin->register->agreeUX = 'false'; - return $this->send(array('result' => 'success', 'message' => $this->lang->admin->register->unBind->success, 'load' => inlink('register'))); + return $this->send(array('result' => 'success', 'message' => $this->lang->admin->community->unBind->success, 'load' => inlink('register'))); } /** @@ -591,7 +591,7 @@ class admin extends control $agreeUX = $this->post->agreeUX; $this->loadModel('setting')->setItem('system.admin.register.agreeUX', $agreeUX); $this->config->admin->register->agreeUX = $agreeUX; - $message = $agreeUX == 'true' ? $this->lang->admin->register->uxPlan->agree : $this->lang->admin->register->uxPlan->cancel; + $message = $agreeUX == 'true' ? $this->lang->admin->community->uxPlan->agree : $this->lang->admin->community->uxPlan->cancel; return $this->send(array('result' => 'success', 'message' => $message)); } diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index 0c2a74a473..2500f334b4 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -225,42 +225,42 @@ $lang->admin->ai->prompt = 'AI Prompts'; $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.'; -$lang->admin->register->mobile = 'phone number'; -$lang->admin->register->smsCode = 'Verification code'; -$lang->admin->register->sendCode = 'send code'; -$lang->admin->register->join = 'join the'; -$lang->admin->register->joinDesc = 'and help us understand the usage of the product'; -$lang->admin->register->captchaTip = 'verification code'; -$lang->admin->register->sure = 'send'; -$lang->admin->register->unBindText = 'unbind'; -$lang->admin->register->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; -$lang->admin->register->advantage1 = 'PM Gift Pack'; -$lang->admin->register->advantage2 = 'Support Services'; -$lang->admin->register->advantage3 = 'Experience Demo'; -$lang->admin->register->advantage4 = 'ZenTao Manual'; -$lang->admin->register->goCommunity = 'Jump To'; -$lang->admin->register->enterMobile = 'Please enter your phone number'; -$lang->admin->register->enterCode = 'Please enter the verification code'; -$lang->admin->register->goBack = 'back'; -$lang->admin->register->reSend = 'resend'; -$lang->admin->register->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; -$lang->admin->register->unbindContent = 'After unbinding, you will not be able to log in directly to the ZenTao official website through the ZenTao software'; -$lang->admin->register->cancelButton = 'cancel'; -$lang->admin->register->unbindButton = 'yes'; +$lang->admin->community->registerTitle = 'Join ZenTao'; +$lang->admin->community->skip = 'Skip'; +$lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program'; +$lang->admin->community->loginFailed = 'Login failed'; +$lang->admin->community->loginFailedNoInfo = 'Please fill in the registration information'; +$lang->admin->community->officialWebsite = 'ZenTao Official website '; +$lang->admin->community->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; +$lang->admin->community->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; +$lang->admin->community->mobile = 'phone number'; +$lang->admin->community->smsCode = 'Verification code'; +$lang->admin->community->sendCode = 'send code'; +$lang->admin->community->join = 'join the'; +$lang->admin->community->joinDesc = 'and help us understand the usage of the product'; +$lang->admin->community->captchaTip = 'verification code'; +$lang->admin->community->sure = 'send'; +$lang->admin->community->unBindText = 'unbind'; +$lang->admin->community->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; +$lang->admin->community->advantage1 = 'PM Gift Pack'; +$lang->admin->community->advantage2 = 'Support Services'; +$lang->admin->community->advantage3 = 'Experience Demo'; +$lang->admin->community->advantage4 = 'ZenTao Manual'; +$lang->admin->community->goCommunity = 'Jump To'; +$lang->admin->community->enterMobile = 'Please enter your phone number'; +$lang->admin->community->enterCode = 'Please enter the verification code'; +$lang->admin->community->goBack = 'back'; +$lang->admin->community->reSend = 'resend'; +$lang->admin->community->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; +$lang->admin->community->unbindContent = 'After unbinding, you will not be able to log in directly to the ZenTao official website through the ZenTao software'; +$lang->admin->community->cancelButton = 'cancel'; +$lang->admin->community->unbindButton = 'yes'; -$lang->admin->register->uxPlan = new stdclass(); -$lang->admin->register->uxPlan->agree = 'Agreed'; -$lang->admin->register->uxPlan->cancel = 'Canceled'; +$lang->admin->community->uxPlan = new stdclass(); +$lang->admin->community->uxPlan->agree = 'Agreed'; +$lang->admin->community->uxPlan->cancel = 'Canceled'; -$lang->admin->register->unBind = new stdclass(); -$lang->admin->register->unBind->success = 'Unbound'; +$lang->admin->community->unBind = new stdclass(); +$lang->admin->community->unBind->success = 'Unbound'; include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index cd4d66767a..49686ce849 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -225,42 +225,42 @@ $lang->admin->ai->prompt = 'AI Prompts'; $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.'; -$lang->admin->register->mobile = 'phone number'; -$lang->admin->register->smsCode = 'Verification code'; -$lang->admin->register->sendCode = 'send code'; -$lang->admin->register->join = 'join the'; -$lang->admin->register->joinDesc = 'and help us understand the usage of the product'; -$lang->admin->register->captchaTip = 'verification code'; -$lang->admin->register->sure = 'send'; -$lang->admin->register->unBindText = 'unbind'; -$lang->admin->register->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; -$lang->admin->register->advantage1 = 'PM Gift Pack'; -$lang->admin->register->advantage2 = 'Support Services'; -$lang->admin->register->advantage3 = 'Experience Demo'; -$lang->admin->register->advantage4 = 'ZenTao Manual'; -$lang->admin->register->goCommunity = 'Jump To'; -$lang->admin->register->enterMobile = 'Please enter your phone number'; -$lang->admin->register->enterCode = 'Please enter the verification code'; -$lang->admin->register->goBack = 'back'; -$lang->admin->register->reSend = 'resend'; -$lang->admin->register->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; -$lang->admin->register->unbindContent = 'After unbinding, you will not be able to log in directly to the ZenTao official website through the ZenTao software'; -$lang->admin->register->cancelButton = 'cancel'; -$lang->admin->register->unbindButton = 'yes'; +$lang->admin->community->registerTitle = 'Join ZenTao'; +$lang->admin->community->skip = 'Skip'; +$lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program'; +$lang->admin->community->loginFailed = 'Login failed'; +$lang->admin->community->loginFailedNoInfo = 'Please fill in the registration information'; +$lang->admin->community->officialWebsite = 'ZenTao Official website '; +$lang->admin->community->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; +$lang->admin->community->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; +$lang->admin->community->mobile = 'phone number'; +$lang->admin->community->smsCode = 'Verification code'; +$lang->admin->community->sendCode = 'send code'; +$lang->admin->community->join = 'join the'; +$lang->admin->community->joinDesc = 'and help us understand the usage of the product'; +$lang->admin->community->captchaTip = 'verification code'; +$lang->admin->community->sure = 'send'; +$lang->admin->community->unBindText = 'unbind'; +$lang->admin->community->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; +$lang->admin->community->advantage1 = 'PM Gift Pack'; +$lang->admin->community->advantage2 = 'Support Services'; +$lang->admin->community->advantage3 = 'Experience Demo'; +$lang->admin->community->advantage4 = 'ZenTao Manual'; +$lang->admin->community->goCommunity = 'Jump To'; +$lang->admin->community->enterMobile = 'Please enter your phone number'; +$lang->admin->community->enterCode = 'Please enter the verification code'; +$lang->admin->community->goBack = 'back'; +$lang->admin->community->reSend = 'resend'; +$lang->admin->community->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; +$lang->admin->community->unbindContent = 'After unbinding, you will not be able to log in directly to the ZenTao official website through the ZenTao software'; +$lang->admin->community->cancelButton = 'cancel'; +$lang->admin->community->unbindButton = 'yes'; -$lang->admin->register->uxPlan = new stdclass(); -$lang->admin->register->uxPlan->agree = 'Agreed'; -$lang->admin->register->uxPlan->cancel = 'Canceled'; +$lang->admin->community->uxPlan = new stdclass(); +$lang->admin->community->uxPlan->agree = 'Agreed'; +$lang->admin->community->uxPlan->cancel = 'Canceled'; -$lang->admin->register->unBind = new stdclass(); -$lang->admin->register->unBind->success = 'Unbound'; +$lang->admin->community->unBind = new stdclass(); +$lang->admin->community->unBind->success = 'Unbound'; include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 719ebb1966..6b49496117 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -225,42 +225,42 @@ $lang->admin->ai->prompt = 'AI Prompts'; $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.'; -$lang->admin->register->mobile = 'phone number'; -$lang->admin->register->smsCode = 'Verification code'; -$lang->admin->register->sendCode = 'send code'; -$lang->admin->register->join = 'join the'; -$lang->admin->register->joinDesc = 'and help us understand the usage of the product'; -$lang->admin->register->captchaTip = 'verification code'; -$lang->admin->register->sure = 'send'; -$lang->admin->register->unBindText = 'unbind'; -$lang->admin->register->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; -$lang->admin->register->advantage1 = 'PM Gift Pack'; -$lang->admin->register->advantage2 = 'Support Services'; -$lang->admin->register->advantage3 = 'Experience Demo'; -$lang->admin->register->advantage4 = 'ZenTao Manual'; -$lang->admin->register->goCommunity = 'Jump To'; -$lang->admin->register->enterMobile = 'Please enter your phone number'; -$lang->admin->register->enterCode = 'Please enter the verification code'; -$lang->admin->register->goBack = 'back'; -$lang->admin->register->reSend = 'resend'; -$lang->admin->register->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; -$lang->admin->register->unbindContent = 'After unbinding, you will not be able to log in directly to the ZenTao official website through the ZenTao software'; -$lang->admin->register->cancelButton = 'cancel'; -$lang->admin->register->unbindButton = 'yes'; +$lang->admin->community->registerTitle = 'Join ZenTao'; +$lang->admin->community->skip = 'Skip'; +$lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program'; +$lang->admin->community->loginFailed = 'Login failed'; +$lang->admin->community->loginFailedNoInfo = 'Please fill in the registration information'; +$lang->admin->community->officialWebsite = 'ZenTao Official website '; +$lang->admin->community->uxPlanWithBookTitle = ' "ZenTao User Experience Improvement Program" '; +$lang->admin->community->uxPlanStatusTitle = 'Help us understand the usage of the product, you can turn off this feature in the background.'; +$lang->admin->community->mobile = 'phone number'; +$lang->admin->community->smsCode = 'Verification code'; +$lang->admin->community->sendCode = 'send code'; +$lang->admin->community->join = 'join the'; +$lang->admin->community->joinDesc = 'and help us understand the usage of the product'; +$lang->admin->community->captchaTip = 'verification code'; +$lang->admin->community->sure = 'send'; +$lang->admin->community->unBindText = 'unbind'; +$lang->admin->community->welcome = 'Welcome to join the ZenTao community. Here, you can obtain:'; +$lang->admin->community->advantage1 = 'PM Gift Pack'; +$lang->admin->community->advantage2 = 'Support Services'; +$lang->admin->community->advantage3 = 'Experience Demo'; +$lang->admin->community->advantage4 = 'ZenTao Manual'; +$lang->admin->community->goCommunity = 'Jump To'; +$lang->admin->community->enterMobile = 'Please enter your phone number'; +$lang->admin->community->enterCode = 'Please enter the verification code'; +$lang->admin->community->goBack = 'back'; +$lang->admin->community->reSend = 'resend'; +$lang->admin->community->unbindTitle = 'Are you sure you want to unbind from the ZenTao'; +$lang->admin->community->unbindContent = 'After unbinding, you will not be able to log in directly to the ZenTao official website through the ZenTao software'; +$lang->admin->community->cancelButton = 'cancel'; +$lang->admin->community->unbindButton = 'yes'; -$lang->admin->register->uxPlan = new stdclass(); -$lang->admin->register->uxPlan->agree = 'Agreed'; -$lang->admin->register->uxPlan->cancel = 'Canceled'; +$lang->admin->community->uxPlan = new stdclass(); +$lang->admin->community->uxPlan->agree = 'Agreed'; +$lang->admin->community->uxPlan->cancel = 'Canceled'; -$lang->admin->register->unBind = new stdclass(); -$lang->admin->register->unBind->success = 'Unbound'; +$lang->admin->community->unBind = new stdclass(); +$lang->admin->community->unBind->success = 'Unbound'; include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 38602923f4..9fbc1ba5f6 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -224,43 +224,43 @@ $lang->admin->ai->miniPrograms = 'AI 小程序'; $lang->admin->ai->prompt = 'AI 提词'; $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 = '帮助我们了解产品使用情况,您可在后台关闭此功能。'; -$lang->admin->register->mobile = '手机号'; -$lang->admin->register->smsCode = '验证码'; -$lang->admin->register->sendCode = '获取验证码'; -$lang->admin->register->join = '加入'; -$lang->admin->register->joinDesc = '帮助我们了解产品使用情况。'; -$lang->admin->register->captchaTip = '请输入图形验证码'; -$lang->admin->register->sure = '确定'; -$lang->admin->register->unBindText = '解绑'; -$lang->admin->register->welcome = '欢迎您加入禅道社区。在这里,您可以获得:'; -$lang->admin->register->advantage1 = '项目管理大礼包'; -$lang->admin->register->advantage2 = '技术支持服务'; -$lang->admin->register->advantage3 = '体验各版本Demo'; -$lang->admin->register->advantage4 = '禅道软件手册'; -$lang->admin->register->goCommunity = '前往社区'; -$lang->admin->register->enterMobile = '请输入手机号'; -$lang->admin->register->enterCode = '请输入验证码'; -$lang->admin->register->goBack = '返回'; -$lang->admin->register->reSend = '重新发送'; -$lang->admin->register->unbindTitle = '确认与禅道解绑吗'; -$lang->admin->register->unbindContent = '解绑后将无法通过禅道软件直接登录禅道官网'; -$lang->admin->register->cancelButton = '取消'; -$lang->admin->register->unbindButton = '解绑'; +$lang->admin->community = new stdclass(); +$lang->admin->community->registerTitle = '加入禅道社区'; +$lang->admin->community->skip = '跳过'; +$lang->admin->community->uxPlanTitle = '禅道用户体验改进计划'; +$lang->admin->community->loginFailed = '登录失败'; +$lang->admin->community->loginFailedNoInfo = '请填写注册信息'; +$lang->admin->community->officialWebsite = '禅道官网 '; +$lang->admin->community->uxPlanWithBookTitle = '《禅道用户体验改进计划》'; +$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->sure = '确定'; +$lang->admin->community->unBindText = '解绑'; +$lang->admin->community->welcome = '欢迎您加入禅道社区。在这里,您可以获得:'; +$lang->admin->community->advantage1 = '项目管理大礼包'; +$lang->admin->community->advantage2 = '技术支持服务'; +$lang->admin->community->advantage3 = '体验各版本Demo'; +$lang->admin->community->advantage4 = '禅道软件手册'; +$lang->admin->community->goCommunity = '前往社区'; +$lang->admin->community->enterMobile = '请输入手机号'; +$lang->admin->community->enterCode = '请输入验证码'; +$lang->admin->community->goBack = '返回'; +$lang->admin->community->reSend = '重新发送'; +$lang->admin->community->unbindTitle = '确认与禅道解绑吗'; +$lang->admin->community->unbindContent = '解绑后将无法通过禅道软件直接登录禅道官网'; +$lang->admin->community->cancelButton = '取消'; +$lang->admin->community->unbindButton = '解绑'; -$lang->admin->register->uxPlan = new stdclass(); -$lang->admin->register->uxPlan->agree = '已同意'; -$lang->admin->register->uxPlan->cancel = '已取消'; +$lang->admin->community->uxPlan = new stdclass(); +$lang->admin->community->uxPlan->agree = '已同意'; +$lang->admin->community->uxPlan->cancel = '已取消'; -$lang->admin->register->unBind = new stdclass(); -$lang->admin->register->unBind->success = '已解绑'; +$lang->admin->community->unBind = new stdclass(); +$lang->admin->community->unBind->success = '已解绑'; include dirname(__FILE__) . '/menu.php'; diff --git a/module/admin/ui/planmodal.html.php b/module/admin/ui/planmodal.html.php index 2db55721d6..ffe002313b 100644 --- a/module/admin/ui/planmodal.html.php +++ b/module/admin/ui/planmodal.html.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace zin; -modalHeader(set::title($this->lang->admin->register->uxPlanTitle)); +modalHeader(set::title($this->lang->admin->community->uxPlanTitle)); $uxPlan = ''; $uxPlanFile = $this->app->getAppRoot() . 'www/uxplan.html'; diff --git a/module/admin/ui/register.html.php b/module/admin/ui/register.html.php index 078ebe0930..abe480a4a4 100644 --- a/module/admin/ui/register.html.php +++ b/module/admin/ui/register.html.php @@ -12,7 +12,7 @@ namespace zin; global $app; $app->loadLang('admin'); -jsVar('reSendText', $lang->admin->register->reSend); +jsVar('reSendText', $lang->admin->community->reSend); use function Symfony\Component\String\b; @@ -32,9 +32,9 @@ else icon(setClass('icon icon-back')), setClass('btn capitalize primary'), set::href(helper::createLink('admin')), - $lang->admin->register->goBack + $lang->admin->community->goBack ), - span($lang->admin->register->registerTitle), + span($lang->admin->community->registerTitle), ); } @@ -43,7 +43,7 @@ if (strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) { ( a( setClass('btn capitalize skip-btn'), - $lang->admin->register->skip, + $lang->admin->community->skip, set::href(createLink('user', 'login')), ) ); @@ -68,11 +68,11 @@ if($bindCommunity) setClass('panel panel-form pt-4 size-sm is-lite'), div( setClass('max-w-7xl h-32 form-title'), - div(setClass('main-title text-xl'),$lang->admin->register->welcome), - div(setClass('sub-title'), icon(setClass('icon icon-diamond')), $lang->admin->register->advantage1), - div(setClass('sub-title'), icon(setClass('icon icon-team')), $lang->admin->register->advantage2), - div(setClass('sub-title'), icon(setClass('icon icon-statistic')), $lang->admin->register->advantage3), - div(setClass('sub-title'), icon(setClass('icon icon-manual')), $lang->admin->register->advantage4), + div(setClass('main-title text-xl'),$lang->admin->community->welcome), + 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), ), div( setClass('z-box-container'), @@ -82,7 +82,7 @@ if($bindCommunity) setClass('z-bind-info-image'), img(set::src('static/images/register-logo.png')), div( - div(setClass('z-bind-info-website'),html(nl2br($lang->admin->register->officialWebsite))), + div(setClass('z-bind-info-website'),html(nl2br($lang->admin->community->officialWebsite))), div(setClass('z-bind-info-mobile'),$bindCommunityMobile) ), button( @@ -93,7 +93,7 @@ if($bindCommunity) setData(array('position' => 'center', 'toggle' => 'modal', 'target' => '#positionModal')), setClass('btn btn-primary z-unbind-btn'), setID('unBind'), - $lang->admin->register->unBindText, + $lang->admin->community->unBindText, ), div( setID('positionModal'), @@ -104,8 +104,8 @@ if($bindCommunity) setClass('modal-content'), div( setClass('modal-body'), - p(setClass('unbind-modal-title'), $lang->admin->register->unbindTitle), - p(setClass('unbind-modal-content'),$lang->admin->register->unbindContent) + p(setClass('unbind-modal-title'), $lang->admin->community->unbindTitle), + p(setClass('unbind-modal-content'),$lang->admin->community->unbindContent) ), div( setClass('modal-footer'), @@ -113,12 +113,12 @@ if($bindCommunity) setClass('btn'), set::type('button'), setData(array('dismiss' => 'modal')), - $lang->admin->register->cancelButton + $lang->admin->community->cancelButton ), button( setClass('btn primary'), set::type('button'), - $lang->admin->register->unbindButton, + $lang->admin->community->unbindButton, on::click()->call('unBind') ) ) @@ -133,16 +133,16 @@ if($bindCommunity) setClass('z-plan-info-box'), div( setClass('z-plan-info-box-text'), - span($lang->admin->register->join), + span($lang->admin->community->join), a ( setID('experience-plan-show'), set('data-size', 'sm'), - $lang->admin->register->uxPlanWithBookTitle, + $lang->admin->community->uxPlanWithBookTitle, set::href(createLink('admin', 'planModal')), set('data-toggle', 'modal') ), - span($lang->admin->register->joinDesc) + span($lang->admin->community->joinDesc) ), div( setClass('z-switch'), @@ -161,7 +161,7 @@ if($bindCommunity) setClass('z-footer-btn'), button( setClass('btn capitalize primary'), - $lang->admin->register->goCommunity, + $lang->admin->community->goCommunity, on::click()->call('goCommunity', $config->admin->register->community), ) ) @@ -185,20 +185,20 @@ else setClass('panel panel-form pt-4 size-sm is-lite'), div( setClass('max-w-7xl h-32 form-title'), - div(setClass('main-title text-xl'), $lang->admin->register->welcome), - div(setClass('sub-title'), icon(setClass('icon icon-diamond')), $lang->admin->register->advantage1), - div(setClass('sub-title'), icon(setClass('icon icon-team')), $lang->admin->register->advantage2), - div(setClass('sub-title'), icon(setClass('icon icon-statistic')), $lang->admin->register->advantage3), - div(setClass('sub-title'), icon(setClass('icon icon-manual')), $lang->admin->register->advantage4), + div(setClass('main-title text-xl'), $lang->admin->community->welcome), + 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), ), formPanel ( set::formID('joinForm'), setClass('bg-canvas m-auto mw-auto'), set::headingClass('w-96 m-auto'), - set::submitBtnText($lang->admin->register->registerTitle), + set::submitBtnText($lang->admin->community->registerTitle), set::cancelBtnText(), - div(setClass('label-text'), $lang->admin->register->mobile), + div(setClass('label-text'), $lang->admin->community->mobile), formRow ( setClass('m-auto no-label-mobile'), @@ -210,7 +210,7 @@ else setClass('no-label-input'), set::name('mobile'), setID('mobile-captcha'), - set::placeholder($lang->admin->register->enterMobile) + set::placeholder($lang->admin->community->enterMobile) ) ) ), @@ -219,7 +219,7 @@ else div( setID('captchaImageLabel'), setClass('label-text'), - $lang->admin->register->smsCode, + $lang->admin->community->smsCode, ), formRow ( @@ -231,7 +231,7 @@ else ( setClass('no-label-input'), set::name('code'), - set::placeholder($lang->admin->register->enterCode) + set::placeholder($lang->admin->community->enterCode) ) ), a @@ -239,7 +239,7 @@ else setID('captcha-btn'), setClass('captcha-btn-class'), set('href', 'javascript:;'), - $lang->admin->register->sendCode, + $lang->admin->community->sendCode, on::click()->call('showCaptcha'), ) ), @@ -256,16 +256,16 @@ else span ( setClass('form-agree-ux-text'), - $lang->admin->register->join, + $lang->admin->community->join, a ( setID('experience-plan-show'), set('data-size', 'lg'), - $lang->admin->register->uxPlanWithBookTitle, + $lang->admin->community->uxPlanWithBookTitle, set::href(createLink('admin', 'planModal')), set('data-toggle', 'modal') ), - $lang->admin->register->uxPlanStatusTitle + $lang->admin->community->uxPlanStatusTitle ) ) ) @@ -296,14 +296,14 @@ else input ( set::name('captchaImage'), - set::placeholder($lang->admin->register->captchaTip) + set::placeholder($lang->admin->community->captchaTip) ), div ( setID('checkMobileSenderID'), setClass('px-4'), set::type('primary'), - $lang->admin->register->sure, + $lang->admin->community->sure, on::click()->call('checkMobileSender', '#checkMobileSenderID'), ) From c348d571df36b60fde66743660a9d801fbf83e4a Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 20 Jun 2025 14:13:59 +0800 Subject: [PATCH 2/4] * Optimize code. --- module/admin/ui/register.html.php | 39 +++++++++++++++++-------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/module/admin/ui/register.html.php b/module/admin/ui/register.html.php index abe480a4a4..7098b73cf6 100644 --- a/module/admin/ui/register.html.php +++ b/module/admin/ui/register.html.php @@ -26,27 +26,30 @@ if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) } else { - $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), - ); + $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), + ); } -if (strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) { +if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) +{ $skip = div + ( + a ( - a( - setClass('btn capitalize skip-btn'), - $lang->admin->community->skip, - set::href(createLink('user', 'login')), - ) - ); + setClass('btn capitalize skip-btn'), + $lang->admin->community->skip, + set::href(createLink('user', 'login')), + ) + ); } else { @@ -315,4 +318,4 @@ else if (strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) { render('pagebase'); } -} \ No newline at end of file +} From f11e0ce47943628bfab1d5e9bd58e96982ba8320 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 20 Jun 2025 14:21:40 +0800 Subject: [PATCH 3/4] * Optimize code. --- module/admin/lang/de.php | 2 +- module/admin/lang/en.php | 2 +- module/admin/lang/fr.php | 2 +- module/admin/ui/register.html.php | 92 +++++++++++++++++++------------ 4 files changed, 59 insertions(+), 39 deletions(-) diff --git a/module/admin/lang/de.php b/module/admin/lang/de.php index 2500f334b4..76c407b362 100755 --- a/module/admin/lang/de.php +++ b/module/admin/lang/de.php @@ -224,7 +224,7 @@ $lang->admin->ai->miniPrograms = 'AI Mini Programs'; $lang->admin->ai->prompt = 'AI Prompts'; $lang->admin->ai->assistant = 'AI Assistant'; -$lang->admin->register = new stdclass(); +$lang->admin->community = new stdclass(); $lang->admin->community->registerTitle = 'Join ZenTao'; $lang->admin->community->skip = 'Skip'; $lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program'; diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index 49686ce849..2616c26d07 100755 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -224,7 +224,7 @@ $lang->admin->ai->miniPrograms = 'AI Mini Programs'; $lang->admin->ai->prompt = 'AI Prompts'; $lang->admin->ai->assistant = 'AI Assistant'; -$lang->admin->register = new stdclass(); +$lang->admin->community = new stdclass(); $lang->admin->community->registerTitle = 'Join ZenTao'; $lang->admin->community->skip = 'Skip'; $lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program'; diff --git a/module/admin/lang/fr.php b/module/admin/lang/fr.php index 6b49496117..c8fec440bc 100755 --- a/module/admin/lang/fr.php +++ b/module/admin/lang/fr.php @@ -224,7 +224,7 @@ $lang->admin->ai->miniPrograms = 'AI Mini Programs'; $lang->admin->ai->prompt = 'AI Prompts'; $lang->admin->ai->assistant = 'AI Assistant'; -$lang->admin->register = new stdclass(); +$lang->admin->community = new stdclass(); $lang->admin->community->registerTitle = 'Join ZenTao'; $lang->admin->community->skip = 'Skip'; $lang->admin->community->uxPlanTitle = 'ZenTao User Experience Improvement Program'; diff --git a/module/admin/ui/register.html.php b/module/admin/ui/register.html.php index 7098b73cf6..443fdd9b8e 100644 --- a/module/admin/ui/register.html.php +++ b/module/admin/ui/register.html.php @@ -67,28 +67,34 @@ if($bindCommunity) ( setID('mainContent'), setClass('px-1 mt-2 w-full max-w-7xl'), - div( + div + ( setClass('panel panel-form pt-4 size-sm is-lite'), - div( + div + ( setClass('max-w-7xl h-32 form-title'), - div(setClass('main-title text-xl'),$lang->admin->community->welcome), - 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('main-title text-xl'), $lang->admin->community->welcome), + 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), + div(setClass('sub-title'), icon(setClass('icon icon-manual')), $lang->admin->community->advantage4), ), - div( + div + ( setClass('z-box-container'), - div( + div + ( setClass('z-bind-info'), - div( + div + ( setClass('z-bind-info-image'), img(set::src('static/images/register-logo.png')), div( - div(setClass('z-bind-info-website'),html(nl2br($lang->admin->community->officialWebsite))), - div(setClass('z-bind-info-mobile'),$bindCommunityMobile) + div(setClass('z-bind-info-website'), html(nl2br($lang->admin->community->officialWebsite))), + div(setClass('z-bind-info-mobile'), $bindCommunityMobile) ), - button( + button + ( icon ( setClass('icon icon-rocket') @@ -98,27 +104,34 @@ if($bindCommunity) setID('unBind'), $lang->admin->community->unBindText, ), - div( + div + ( setID('positionModal'), setClass('modal'), - div( + div + ( setClass('modal-dialog shadow'), - div( + div + ( setClass('modal-content'), - div( + div + ( setClass('modal-body'), - p(setClass('unbind-modal-title'), $lang->admin->community->unbindTitle), - p(setClass('unbind-modal-content'),$lang->admin->community->unbindContent) + p(setClass('unbind-modal-title'), $lang->admin->community->unbindTitle), + p(setClass('unbind-modal-content'), $lang->admin->community->unbindContent) ), - div( + div + ( setClass('modal-footer'), - button( + button + ( setClass('btn'), set::type('button'), setData(array('dismiss' => 'modal')), $lang->admin->community->cancelButton ), - button( + button + ( setClass('btn primary'), set::type('button'), $lang->admin->community->unbindButton, @@ -130,11 +143,14 @@ if($bindCommunity) ) ) ), - div( + div + ( setClass('z-plan-info'), - div( + div + ( setClass('z-plan-info-box'), - div( + div + ( setClass('z-plan-info-box-text'), span($lang->admin->community->join), a @@ -147,7 +163,8 @@ if($bindCommunity) ), span($lang->admin->community->joinDesc) ), - div( + div + ( setClass('z-switch'), switcher ( @@ -162,7 +179,8 @@ if($bindCommunity) div ( setClass('z-footer-btn'), - button( + button + ( setClass('btn capitalize primary'), $lang->admin->community->goCommunity, on::click()->call('goCommunity', $config->admin->register->community), @@ -184,15 +202,17 @@ else ( setID('mainContent'), setClass('px-1 mt-2 w-full max-w-7xl'), - div( + div + ( setClass('panel panel-form pt-4 size-sm is-lite'), - div( + div + ( setClass('max-w-7xl h-32 form-title'), div(setClass('main-title text-xl'), $lang->admin->community->welcome), - 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-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), + div(setClass('sub-title'), icon(setClass('icon icon-manual')), $lang->admin->community->advantage4), ), formPanel ( @@ -219,7 +239,8 @@ else ), p(setID('captchaImageError')), p(setID('captchaMobileError')), - div( + div + ( setID('captchaImageLabel'), setClass('label-text'), $lang->admin->community->smsCode, @@ -274,7 +295,8 @@ else ) ), $skip, - div( + div + ( setClass('captcha-mobile-sender captcha-box'), set::style(array('display' => 'none')), div @@ -315,7 +337,5 @@ else ) ) ); - if (strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) { - render('pagebase'); - } + if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) render('pagebase'); } From 885d0e9eadd3073ebc7224265166b16e1330ad01 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Fri, 20 Jun 2025 14:41:18 +0800 Subject: [PATCH 4/4] * Optimize code. --- module/admin/ui/register.html.php | 37 ++++++++++--------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/module/admin/ui/register.html.php b/module/admin/ui/register.html.php index 443fdd9b8e..1e8c2a654c 100644 --- a/module/admin/ui/register.html.php +++ b/module/admin/ui/register.html.php @@ -10,16 +10,9 @@ declare(strict_types=1); */ namespace zin; -global $app; -$app->loadLang('admin'); jsVar('reSendText', $lang->admin->community->reSend); -use function Symfony\Component\String\b; - -set::zui(true); - $checked = $agreeUX == 'true' ? 'checked' : ''; - if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false) { $backBtn = ''; @@ -56,6 +49,16 @@ else $skip = ''; } +$header[] = div +( + setClass('max-w-7xl h-32 form-title'), + div(setClass('main-title text-xl'), $lang->admin->community->welcome), + 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; @@ -70,15 +73,7 @@ if($bindCommunity) div ( setClass('panel panel-form pt-4 size-sm is-lite'), - div - ( - setClass('max-w-7xl h-32 form-title'), - div(setClass('main-title text-xl'), $lang->admin->community->welcome), - 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), - ), + $header, div ( setClass('z-box-container'), @@ -205,15 +200,7 @@ else div ( setClass('panel panel-form pt-4 size-sm is-lite'), - div - ( - setClass('max-w-7xl h-32 form-title'), - div(setClass('main-title text-xl'), $lang->admin->community->welcome), - 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), - ), + $header, formPanel ( set::formID('joinForm'),