diff --git a/module/admin/config.php b/module/admin/config.php index 9767ac4073..0c3cc75852 100755 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -24,35 +24,35 @@ $config->admin->menuModuleGroup['feature']['custom|set'] = array('todo', 'f $config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'bug', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user'); $config->admin->menuModuleGroup['template']['custom|set'] = array('baseline'); -$config->admin->plugIns[203] = new stdClass(); -$config->admin->plugIns[203]->name = '人力资源日历'; -$config->admin->plugIns[203]->desc = '禅道人力资源日历插件可以帮助项目管理者查看不同维度下的消耗工时、未完成工作量、并行工作量及负载率,同时组织维度待处理状态下实现了模拟负载的功能,帮助管理者详细了解成员的工作负载情况,更好的进行项目人力资源调度。'; -$config->admin->plugIns[203]->viewLink = 'https://www.zentao.net/extension-viewExt-203.html'; +$config->admin->plugins[203] = new stdClass(); +$config->admin->plugins[203]->name = '人力资源日历'; +$config->admin->plugins[203]->desc = '禅道人力资源日历插件可以帮助项目管理者查看不同维度下的消耗工时、未完成工作量、并行工作量及负载率,同时组织维度待处理状态下实现了模拟负载的功能,帮助管理者详细了解成员的工作负载情况,更好的进行项目人力资源调度。'; +$config->admin->plugins[203]->viewLink = 'https://www.zentao.net/extension-viewExt-203.html'; -$config->admin->plugIns[198] = new stdClass(); -$config->admin->plugIns[198]->name = '需求池插件'; -$config->admin->plugIns[198]->desc = '本插件为禅道需求池管理插件,包括:创建需求池 需求池权限管理 收集需求并向需求池录入需求 记录需求提出人信息 评审需求 拆分用户需求、研发需求 需求跟踪矩阵'; -$config->admin->plugIns[198]->viewLink = 'https://www.zentao.net/extension-viewExt-198.html'; +$config->admin->plugins[198] = new stdClass(); +$config->admin->plugins[198]->name = '需求池插件'; +$config->admin->plugins[198]->desc = '本插件为禅道需求池管理插件,包括:创建需求池 需求池权限管理 收集需求并向需求池录入需求 记录需求提出人信息 评审需求 拆分用户需求、研发需求 需求跟踪矩阵'; +$config->admin->plugins[198]->viewLink = 'https://www.zentao.net/extension-viewExt-198.html'; -$config->admin->plugIns[27] = new stdClass(); -$config->admin->plugIns[27]->name = 'Excel导出/导入'; -$config->admin->plugIns[27]->desc = '安装该插件可以支持Excel导出和任务、需求、Bug、用例导入功能。更新提示:新增任务、需求、Bug的excel导入功能。'; -$config->admin->plugIns[27]->viewLink = 'https://www.zentao.net/extension-viewExt-27.html'; +$config->admin->plugins[27] = new stdClass(); +$config->admin->plugins[27]->name = 'Excel导出/导入'; +$config->admin->plugins[27]->desc = '安装该插件可以支持Excel导出和任务、需求、Bug、用例导入功能。更新提示:新增任务、需求、Bug的excel导入功能。'; +$config->admin->plugins[27]->viewLink = 'https://www.zentao.net/extension-viewExt-27.html'; -$config->admin->plugIns[26] = new stdClass(); -$config->admin->plugIns[26]->name = '甘特图'; -$config->admin->plugIns[26]->desc = '禅道甘特图插件 运用此插件可以查看甘特图,维护任务关系。'; -$config->admin->plugIns[26]->viewLink = 'https://www.zentao.net/extension-viewExt-26.html'; +$config->admin->plugins[26] = new stdClass(); +$config->admin->plugins[26]->name = '甘特图'; +$config->admin->plugins[26]->desc = '禅道甘特图插件 运用此插件可以查看甘特图,维护任务关系。'; +$config->admin->plugins[26]->viewLink = 'https://www.zentao.net/extension-viewExt-26.html'; -$config->admin->plugIns[30] = new stdClass(); -$config->admin->plugIns[30]->name = '日志日历'; -$config->admin->plugIns[30]->desc = '运用此插件可以实现工作日志的添加、编辑、查看、删除、导出等功能,方便用户管理工作日志。'; -$config->admin->plugIns[30]->viewLink = 'https://www.zentao.net/extension-viewExt-30.html'; +$config->admin->plugins[30] = new stdClass(); +$config->admin->plugins[30]->name = '日志日历'; +$config->admin->plugins[30]->desc = '运用此插件可以实现工作日志的添加、编辑、查看、删除、导出等功能,方便用户管理工作日志。'; +$config->admin->plugins[30]->viewLink = 'https://www.zentao.net/extension-viewExt-30.html'; -$config->admin->plugIns[194] = new stdClass(); -$config->admin->plugIns[194]->name = '应用巡检报告'; -$config->admin->plugIns[194]->desc = '每日生成公司级禅道应用巡检报告,促进项目管理持续改进。'; -$config->admin->plugIns[194]->viewLink = 'https://www.zentao.net/extension-viewExt-194.html'; +$config->admin->plugins[194] = new stdClass(); +$config->admin->plugins[194]->name = '应用巡检报告'; +$config->admin->plugins[194]->desc = '每日生成公司级禅道应用巡检报告,促进项目管理持续改进。'; +$config->admin->plugins[194]->viewLink = 'https://www.zentao.net/extension-viewExt-194.html'; $config->admin->apiRoot = 'https://www.zentao.net/'; $config->admin->classURL = 'https://www.zentao.net/publicclass.html'; diff --git a/module/admin/control.php b/module/admin/control.php index 3a51082c79..c49cd97b5e 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -40,7 +40,7 @@ class admin extends control $this->view->title = $this->lang->admin->common; $this->view->position[] = $this->lang->admin->index; - $this->view->extensions = $this->admin->getExtensionsByAPI('extension', $langNotCN ? 5 : 6, $hasInternet); + $this->view->plugins = $this->admin->getExtensionsByAPI('plugin', $langNotCN ? 5 : 6, $hasInternet); $this->view->patches = $this->admin->getExtensionsByAPI('patch', 3, $hasInternet); $this->view->hasInternet = $hasInternet; $this->view->publicClass = ($hasInternet and !$langNotCN) ? $this->admin->getPublicClassByAPI(3) : array(); diff --git a/module/admin/css/index.css b/module/admin/css/index.css index 327c2efeb1..2a2e549dfc 100755 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -21,7 +21,7 @@ .settings-list.lite-setting > .setting-box {flex: 1 1 30%;} .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;} -.plugin-list > .plugin-item {flex: 1 1 26%; padding: 16px 10px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 10px; margin-bottom: 16px; width: 0px;} +.plugin-list > .plugin-item {flex: 1 1 26%; padding: 16px 10px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 10px; margin-bottom: 16px; width: 0px; cursor: pointer;} .plugin-list > .plugin-item .ext-download {float: right; padding: 6px 0px;} .plugin-list > .plugin-item > .plug-title {height: 16px; overflow: hidden;} .plugin-list > .plugin-item .extension-desc {overflow: hidden; height: 16px;} diff --git a/module/admin/js/index.js b/module/admin/js/index.js index 13f5dd6f7b..264e1b3205 100644 --- a/module/admin/js/index.js +++ b/module/admin/js/index.js @@ -6,5 +6,8 @@ $(function() }).on('click', '.setting-box a', function(e) { e.stopPropagation(); + }).on('click', '.plugin-item', function() + { + window.open($(this).data('link')); }); }); diff --git a/module/admin/model.php b/module/admin/model.php index f775975794..2b65005df5 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -399,43 +399,43 @@ class adminModel extends model /** * Get extensions from zentao.net. * - * @param string $type extension|patch + * @param string $type plugin|patch * @param int $limit * @param bool $hasInternet * @access public * @return array */ - public function getExtensionsByAPI($type = 'extension', $limit = 6, $hasInternet = true) + public function getExtensionsByAPI($type = 'plugin', $limit = 6, $hasInternet = true) { if($hasInternet) { - $searchType = $type == 'extension' ? 'byUpdatedTime' : 'byModule'; - $param = $type == 'extension' ? '' : 'MTIxOA=='; + $searchType = $type == 'plugin' ? 'byUpdatedTime' : 'byModule'; + $param = $type == 'plugin' ? '' : 'MTIxOA=='; $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit); - $extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array(); - foreach($extensions as $extension) $extension->viewLink = str_replace(array('info', 'client'), '', $extension->viewLink); + $plugins = isset($extensions->extensions) ? (array)$extensions->extensions : array(); + foreach($plugins as $plugin) $plugin->viewLink = str_replace(array('info', 'client'), '', $plugin->viewLink); } else { if($this->config->edition == 'open') { - $extensions = array( - $this->config->admin->plugIns[27], - $this->config->admin->plugIns[26], - $this->config->admin->plugIns[30] + $plugins = array( + $this->config->admin->plugins[27], + $this->config->admin->plugins[26], + $this->config->admin->plugins[30] ); } else { - $extensions = array( - $this->config->admin->plugIns[198], - $this->config->admin->plugIns[194], - $this->config->admin->plugIns[203] + $plugins = array( + $this->config->admin->plugins[198], + $this->config->admin->plugins[194], + $this->config->admin->plugins[203] ); } } - return $extensions; + return $plugins; } /** diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index 50edf29b1b..0dca43e0bb 100755 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -28,18 +28,19 @@ - +