From 91596ab288584e288ac11b20396af5801f53f2cc Mon Sep 17 00:00:00 2001 From: Yagami Date: Wed, 24 Oct 2018 13:19:42 +0800 Subject: [PATCH 1/3] * Finish task #5047. --- module/doc/control.php | 4 ++-- module/doc/model.php | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index c07f637a93..cb4d6908b0 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -134,9 +134,9 @@ class doc extends control $title = ''; $module = $moduleID ? $this->loadModel('tree')->getByID($moduleID) : ''; if($module) $title = $module->name; - if($libID) $title = $this->libs[$libID]; + if($libID) $title = html::a(helper::createLink('doc', 'browse', "libID=$libID"), $this->libs[$libID], ''); if(in_array($browseType, array_keys($this->lang->doc->fastMenuList))) $title = $this->lang->doc->fastMenuList[$browseType]; - if($param != 0) $title = $this->doc->buildBreadTitle($libID, $param, $title); + if($param != 0) $title = $this->doc->buildCrumbTitle($libID, $param, $title); if($browseType == 'fastsearch') { if($this->post->searchDoc) $this->session->set('searchDoc', $this->post->searchDoc); diff --git a/module/doc/model.php b/module/doc/model.php index 371a858b97..8851b66bc2 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1473,7 +1473,7 @@ class docModel extends model * @access public * @return string */ - public function buildBreadTitle($libID = 0, $param = 0, $title = '') + public function buildCrumbTitle($libID = 0, $param = 0, $title = '') { $path = $this->dao->select('path')->from(TABLE_MODULE)->where('id')->eq($param)->fetch('path'); @@ -1484,9 +1484,7 @@ class docModel extends model foreach($parantMoudles as $parentID => $moduleName) { - $active = ''; - if($param == $parentID) $active = "class='active'"; - $title .= html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=byModule¶m={$parentID}"), " {$this->lang->doc->gt} " . $moduleName->name , '', "$active"); + $title .= html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=byModule¶m={$parentID}"), " " . $moduleName->name , ''); } return $title; From 3b03bc1547d57989a78904a96b5a580a63f16e4b Mon Sep 17 00:00:00 2001 From: Yagami Date: Wed, 24 Oct 2018 13:25:26 +0800 Subject: [PATCH 2/3] * Delete doc gt lang. --- module/doc/lang/en.php | 1 - module/doc/lang/zh-cn.php | 1 - 2 files changed, 2 deletions(-) diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index bb8ac29d95..1e87b1f309 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -46,7 +46,6 @@ $lang->doc->users = 'Users'; $lang->doc->item = ' Items'; $lang->doc->num = 'Docs'; $lang->doc->searchResult = 'Search Result'; -$lang->doc->gt = '>'; $lang->doc->moduleDoc = 'By Module'; $lang->doc->searchDoc = 'Search'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index d2bf22f74b..ef0daae99d 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -46,7 +46,6 @@ $lang->doc->users = '用户'; $lang->doc->item = '项'; $lang->doc->num = '文档数量'; $lang->doc->searchResult = '搜索结果'; -$lang->doc->gt = '>'; $lang->doc->moduleDoc = '按模块浏览'; $lang->doc->searchDoc = '搜索'; From 346a9285622c52ef29ee6fb2c3a37b9af025c5d3 Mon Sep 17 00:00:00 2001 From: Yagami Date: Wed, 24 Oct 2018 13:29:20 +0800 Subject: [PATCH 3/3] * Finish task #5043. --- module/doc/view/browse.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 948518eec6..f50c2afc97 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -87,7 +87,7 @@ var browseType = ''; doc->addedBy;?> doc->addedDate;?> doc->editedDate;?> - actions;?> + actions;?>