Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-10-24 13:51:02 +08:00
parent b2b5ed0a5e 346a928562
commit fc480d0a01
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+2 -2
View File
@@ -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);
module/doc/lang/en.php
-1
View File
@@ -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';
module/doc/lang/zh-cn.php
-1
View File
@@ -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 = '搜索';
module/doc/model.php
+2 -4
View File
@@ -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&param={$parentID}"), " {$this->lang->doc->gt} " . $moduleName->name , '', "$active");
$title .= html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=byModule&param={$parentID}"), " <i class='icon icon-chevron-right'></i> " . $moduleName->name , '');
}
return $title;
module/doc/view/browse.html.php
+1 -1
View File
@@ -87,7 +87,7 @@ var browseType = '<?php echo $browseType;?>';
<th class="c-user"><?php echo $lang->doc->addedBy;?></th>
<th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
<th class="c-datetime"><?php echo $lang->doc->editedDate;?></th>
<th class="c-actions-4"><?php echo $lang->actions;?></th>
<th class="w-90px"><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>