From 4bcc1a7980f93e374e79f7c2dcda186aeac7c73f Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 11 Oct 2016 13:34:48 +0800 Subject: [PATCH] * adjust for doc menu. --- module/common/lang/en.php | 8 ++++---- module/common/lang/menuOrder.php | 8 ++++---- module/common/lang/zh-cn.php | 8 ++++---- module/doc/js/common.js | 1 + 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 5dc24c3c2d..98f8044881 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -262,10 +262,10 @@ $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); $lang->doc->menu->list = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->browse = array('link' => 'Doc|doc|browse|libID=%s', 'alias' => 'view,create,edit'); -$lang->doc->menu->edit = 'Edit Library|doc|editLib|libID=%s'; -$lang->doc->menu->module = 'Modules|tree|browse|libID=%s&viewType=doc'; -$lang->doc->menu->delete = array('link' => 'Delete Library|doc|deleteLib|libID=%s', 'target' => 'hiddenwin'); +$lang->doc->menu->index = 'Index|doc|index|'; +$lang->doc->menu->product = array('link' => $lang->productCommon . '|doc|browse|type=product'); +$lang->doc->menu->project = array('link' => $lang->projectCommon . '|doc|browse|type=project'); +$lang->doc->menu->custom = array('link' => 'Custom|doc|browse|type=custom'); $lang->doc->menu->create = array('link' => ' New Library|doc|createLib', 'float' => 'right'); /* Report menu. */ diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 7bfb0afd16..8a8efc79ca 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -77,10 +77,10 @@ $lang->testtask->menuOrder = $lang->testcase->menuOrder; /* doc menu order. */ $lang->doc->menuOrder[5] = 'list'; -$lang->doc->menuOrder[10] = 'browse'; -$lang->doc->menuOrder[15] = 'edit'; -$lang->doc->menuOrder[20] = 'module'; -$lang->doc->menuOrder[25] = 'delete'; +$lang->doc->menuOrder[10] = 'index'; +$lang->doc->menuOrder[15] = 'product'; +$lang->doc->menuOrder[20] = 'project'; +$lang->doc->menuOrder[25] = 'custom'; $lang->doc->menuOrder[30] = 'create'; /* report menu order. */ diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 54a0d946c7..3604a3d5f0 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -262,10 +262,10 @@ $lang->doc = new stdclass(); $lang->doc->menu = new stdclass(); $lang->doc->menu->list = array('link' => '%s', 'fixed' => true); -$lang->doc->menu->browse = array('link' => '文档|doc|browse|libID=%s', 'alias' => 'view,create,edit'); -$lang->doc->menu->edit = '编辑|doc|editLib|libID=%s'; -$lang->doc->menu->module = '分类|tree|browse|libID=%s&viewType=doc'; -$lang->doc->menu->delete = array('link' => '删除|doc|deleteLib|libID=%s', 'target' => 'hiddenwin'); +$lang->doc->menu->index = '首页|doc|index|'; +$lang->doc->menu->product = array('link' => $lang->productCommon . '|doc|browse|type=product'); +$lang->doc->menu->project = array('link' => $lang->projectCommon . '|doc|browse|type=project'); +$lang->doc->menu->custom = array('link' => '自定义|doc|browse|type=custom'); $lang->doc->menu->create = array('link' => ' 添加文档库|doc|createLib', 'float' => 'right'); /* 统计视图菜单设置。*/ diff --git a/module/doc/js/common.js b/module/doc/js/common.js index 29a02096d4..cc407d63fe 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -32,4 +32,5 @@ $(document).ready(function() { $('[data-id="create"] a').modalTrigger({type: 'iframe', width: 500}); $('[data-id="edit"] a').modalTrigger({type: 'iframe', width: 500}); + if(config.currentMethod == 'browse')$('#modulemenu .nav li.active').removeClass('active'); });