diff --git a/config/zentaopms.php b/config/zentaopms.php index 3a5dd9c34d..ad13b06eb5 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -223,7 +223,7 @@ $config->openMethods[] = 'user.login'; $config->openMethods[] = 'user.refreshrandom'; $config->openMethods[] = 'user.reset'; $config->openMethods[] = 'user.resetpassword'; -$config->openMethods[] = 'officialwebsite.index'; +$config->openMethods[] = 'admin.register'; /* 登录用户可以使用的方法。The methods that can be used by the logged users. */ $config->logonMethods = array(); diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index c5f3d464fb..3118ad4f39 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -210,10 +210,10 @@ if($config->edition != 'open') { $lang->admin->menuList->ai['menuOrder']['20'] = 'assistants'; } -$lang->admin->menuList->officialwebsite['name'] = $lang->admin->menuSetting['officialwebsite']['name']; -$lang->admin->menuList->officialwebsite['desc'] = $lang->admin->menuSetting['officialwebsite']['desc']; -$lang->admin->menuList->officialwebsite['link'] = 'officialwebsite|community'; -$lang->admin->menuList->officialwebsite['order'] = 61; +$lang->admin->menuList->adminregister['name'] = $lang->admin->menuSetting['adminregister']['name']; +$lang->admin->menuList->adminregister['desc'] = $lang->admin->menuSetting['adminregister']['desc']; +$lang->admin->menuList->adminregister['link'] = 'admin|register'; +$lang->admin->menuList->adminregister['order'] = 61; if($config->edition != 'max' and $config->edition != 'ipd') { diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index d9adb855a2..b657ee931a 100755 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -165,30 +165,30 @@ $lang->admin->safe->noticeWeakMode = '系统会在登录、创建和修改用户 $lang->admin->safe->noticeStrong = '密码长度越长,含有大写字母或数字或特殊符号越多,密码字母越不重复,安全度越强!'; $lang->admin->safe->noticeGd = '系统检测到您的服务器未安装GD模块或未启用FreeType支持,无法使用验证码功能,请安装后使用。'; -$lang->admin->menuSetting['system']['name'] = '系统设置'; -$lang->admin->menuSetting['system']['desc'] = '备份、聊天、安全等系统各要素配置。'; -$lang->admin->menuSetting['user']['name'] = '人员管理'; -$lang->admin->menuSetting['user']['desc'] = '维护部门、添加人员、分组配置权限。'; -$lang->admin->menuSetting['switch']['name'] = '功能开关'; -$lang->admin->menuSetting['switch']['desc'] = '打开、关闭系统部分功能。'; -$lang->admin->menuSetting['model']['name'] = '项目模型配置'; -$lang->admin->menuSetting['model']['desc'] = '不同项目管理模型和项目通用要素配置。'; -$lang->admin->menuSetting['feature']['name'] = '功能配置'; -$lang->admin->menuSetting['feature']['desc'] = '按照功能菜单进行系统的要素配置。'; -$lang->admin->menuSetting['template']['name'] = '文档模板'; -$lang->admin->menuSetting['template']['desc'] = '配置文档的模板类型和模板内容。'; -$lang->admin->menuSetting['message']['name'] = '通知设置'; -$lang->admin->menuSetting['message']['desc'] = '配置通知路径,自定义需要通知的动作。'; -$lang->admin->menuSetting['extension']['name'] = '插件管理'; -$lang->admin->menuSetting['extension']['desc'] = '浏览、安装插件。'; -$lang->admin->menuSetting['dev']['name'] = '二次开发'; -$lang->admin->menuSetting['dev']['desc'] = '支持对系统进行二次开发。'; -$lang->admin->menuSetting['convert']['name'] = '数据导入'; -$lang->admin->menuSetting['convert']['desc'] = '第三方系统的数据导入。'; -$lang->admin->menuSetting['ai']['name'] = 'AI 配置'; -$lang->admin->menuSetting['ai']['desc'] = '支持配置与管理AI提词、AI小程序及大语言模型。'; -$lang->admin->menuSetting['officialwebsite']['name'] = '加入禅道社区'; -$lang->admin->menuSetting['officialwebsite']['desc'] = '获取项目管理大礼包、技术支持服务、体验个版本Demo。'; +$lang->admin->menuSetting['system']['name'] = '系统设置'; +$lang->admin->menuSetting['system']['desc'] = '备份、聊天、安全等系统各要素配置。'; +$lang->admin->menuSetting['user']['name'] = '人员管理'; +$lang->admin->menuSetting['user']['desc'] = '维护部门、添加人员、分组配置权限。'; +$lang->admin->menuSetting['switch']['name'] = '功能开关'; +$lang->admin->menuSetting['switch']['desc'] = '打开、关闭系统部分功能。'; +$lang->admin->menuSetting['model']['name'] = '项目模型配置'; +$lang->admin->menuSetting['model']['desc'] = '不同项目管理模型和项目通用要素配置。'; +$lang->admin->menuSetting['feature']['name'] = '功能配置'; +$lang->admin->menuSetting['feature']['desc'] = '按照功能菜单进行系统的要素配置。'; +$lang->admin->menuSetting['template']['name'] = '文档模板'; +$lang->admin->menuSetting['template']['desc'] = '配置文档的模板类型和模板内容。'; +$lang->admin->menuSetting['message']['name'] = '通知设置'; +$lang->admin->menuSetting['message']['desc'] = '配置通知路径,自定义需要通知的动作。'; +$lang->admin->menuSetting['extension']['name'] = '插件管理'; +$lang->admin->menuSetting['extension']['desc'] = '浏览、安装插件。'; +$lang->admin->menuSetting['dev']['name'] = '二次开发'; +$lang->admin->menuSetting['dev']['desc'] = '支持对系统进行二次开发。'; +$lang->admin->menuSetting['convert']['name'] = '数据导入'; +$lang->admin->menuSetting['convert']['desc'] = '第三方系统的数据导入。'; +$lang->admin->menuSetting['ai']['name'] = 'AI 配置'; +$lang->admin->menuSetting['ai']['desc'] = '支持配置与管理AI提词、AI小程序及大语言模型。'; +$lang->admin->menuSetting['adminregister']['name'] = '加入禅道社区'; +$lang->admin->menuSetting['adminregister']['desc'] = '获取项目管理大礼包、技术支持服务、体验个版本Demo。'; $lang->admin->updateDynamics = '更新动态'; $lang->admin->updatePatch = '补丁更新'; diff --git a/module/common/lang/common.php b/module/common/lang/common.php index 77d4eb270e..1c242060ad 100644 --- a/module/common/lang/common.php +++ b/module/common/lang/common.php @@ -114,8 +114,6 @@ $lang->executionDeliverable = new stdclass(); $lang->ai = new stdclass(); $lang->aiapp = new stdclass(); -$lang->officialwebsite = new stdclass(); - $lang->serverroom = new stdclass(); $lang->programstakeholder = new stdclass(); $lang->researchplan = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d3bbe1cf5f..2c56680738 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -324,8 +324,6 @@ $lang->deliverable->common = '交付物'; $lang->projectDeliverable->common = '项目交付物'; $lang->executionDeliverable->common = '执行交付物'; -$lang->officialwebsite->common = '禅道社区'; - $lang->personnel->common = '人员'; $lang->personnel->invest = '投入人员'; $lang->personnel->accessible = '可访问人员'; @@ -454,6 +452,7 @@ $lang->admin->data = '数据'; $lang->admin->cron = '定时'; $lang->admin->buildIndex = '重建索引'; $lang->admin->tableEngine = '表引擎'; +$lang->admin->register = '禅道社区'; $lang->convert->importJira = '导入Jira数据'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 46b4724dba..9d005d006f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -2160,10 +2160,6 @@ $lang->editor->methodOrder[20] = 'newPage'; $lang->editor->methodOrder[25] = 'save'; $lang->editor->methodOrder[30] = 'delete'; -/* officialwebsite methods. */ -$lang->resource->officialwebsite = new stdclass(); -$lang->resource->officialwebsite->community = 'community'; - $lang->resource->contact = new stdclass(); $lang->resource->programstakeholder = new stdclass(); $lang->resource->researchplan = new stdclass(); diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index b6cdaddaa9..79ce056f20 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -623,6 +623,6 @@ $lang->group->package->browseRule = '浏览规则'; $lang->group->package->manageRule = '创建维护规则'; $lang->group->package->executionDeliverable = '交付物'; $lang->group->package->projectDeliverable = '交付物'; -$lang->group->package->officialwebsite = '禅道社区'; +$lang->group->package->adminregister = '禅道社区'; include (dirname(__FILE__) . '/resource.php'); diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index 75f367d3a6..1c3190f60f 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -4255,10 +4255,3 @@ $config->group->package->manageThinkRun->privs['thinkrun-create'] = array('e $config->group->package->manageThinkRun->privs['thinkrun-answer'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 10, 'depend' => array('thinkrun-browse')); $config->group->package->manageThinkRun->privs['thinkrun-conclusion'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 15, 'depend' => array('thinkrun-browse', 'thinkrun-result')); $config->group->package->manageThinkRun->privs['thinkrun-export'] = array('edition' => 'ipd', 'vision' => 'or', 'order' => 20, 'depend' => array('thinkrun-browse', 'thinkrun-result')); - -$config->group->package->officialwebsite = new stdclass(); -$config->group->package->officialwebsite->order = 2860; -$config->group->package->officialwebsite->subset = 'officialwebsite'; -$config->group->package->officialwebsite->privs = array(); -$config->group->package->officialwebsite->privs['officialwebsite-community'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 5, 'depend' => array('officialwebsite-community'), 'recommend' => array('officialwebsite-community')); - diff --git a/module/install/control.php b/module/install/control.php index d8618719ea..ab4b99ed29 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -446,7 +446,7 @@ class install extends control if($oldRequestType == 'GET') $sendEventLink = str_replace('install.php', 'index.php', $sendEventLink); } - $officialLoginLink = helper::createLink('officialwebsite') . '&_single=1';; + $officialLoginLink = helper::createLink('admin', 'register') . '&_single=1';; $this->view->officialLoginLink = str_replace('install.php', 'index.php', $officialLoginLink); $this->view->installFileDeleted = $installFileDeleted; diff --git a/module/officialwebsite/js/index.ui.js b/module/officialwebsite/js/index.ui.js index 4e10242a6a..2453e59c2a 100644 --- a/module/officialwebsite/js/index.ui.js +++ b/module/officialwebsite/js/index.ui.js @@ -1,6 +1,6 @@ $('#agreeUX').on('change', function(e) { - $.post($.createLink('officialwebsite', 'changeAgreeUX'),{agreeUX:e.target.checked},function(response) + $.post($.createLink('admin', 'changeAgreeUX'),{agreeUX:e.target.checked},function(response) { response = JSON.parse(response); zui.Messager.show(response.message); @@ -9,7 +9,7 @@ $('#agreeUX').on('change', function(e) $('#unBind').on('click', function(e) { - $.post($.createLink('officialwebsite', 'unBindCommunity'),{},function(response) + $.post($.createLink('admin', 'unBindCommunity'),{},function(response) { response = JSON.parse(response); zui.Messager.show(response.message); @@ -33,7 +33,7 @@ $('.image-box').on('click', function() function getCaptchaContent($ele) { - $.get($.createLink('officialwebsite', 'getCaptcha'), function(response) + $.get($.createLink('admin', 'getCaptcha'), function(response) { response = JSON.parse(response); if(response.result == 'success') $ele.html(response.captchaContent); @@ -50,7 +50,7 @@ $('#checkMobileSender').on('click', function(e) e.preventDefault(); $('#captchaImageError').html(''); $('#captchaMobileError').html(''); - $.post($.createLink('officialwebsite', 'sendcode'),{mobile:$('#mobile-captcha').val(), captchaContent: $('#captchaImage').val()},function(response) + $.post($.createLink('admin', 'sendcode'),{mobile:$('#mobile-captcha').val(), captchaContent: $('#captchaImage').val()},function(response) { response = JSON.parse(response); if(response.result == 'success') diff --git a/module/officialwebsite/ui/index.html.php b/module/officialwebsite/ui/index.html.php index c5e7ae8dbb..091215f64b 100644 --- a/module/officialwebsite/ui/index.html.php +++ b/module/officialwebsite/ui/index.html.php @@ -42,7 +42,7 @@ if($bindCommunity) setID('experience-plan-show'), set('data-size', 'sm'), '《用户体验计划》', - set::href(createLink('officialwebsite', 'planModal')), + set::href(createLink('admin', 'planModal')), set('data-toggle', 'modal') ), '情况', @@ -129,7 +129,7 @@ else { setID('experience-plan-show'), set('data-size', 'sm'), '《用户体验计划》', - set::href(createLink('officialwebsite', 'planModal')), + set::href(createLink('admin', 'planModal')), set('data-toggle', 'modal') ), '帮助我们...' diff --git a/www/static/svg/admin-officialwebsite.svg b/www/static/svg/admin-register.svg similarity index 100% rename from www/static/svg/admin-officialwebsite.svg rename to www/static/svg/admin-register.svg