From 183eb059ec19e60c5e0342713982ad6557d6ec58 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Fri, 19 Oct 2018 09:38:18 +0800 Subject: [PATCH 1/6] * Add book side html to apply to zentaobiz. --- module/doc/lang/zh-cn.php | 2 ++ module/doc/view/alllibsbylist.html.php | 10 +++++----- module/doc/view/bookside.html.php | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 7362adea90..432cfaead7 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -178,3 +178,5 @@ $lang->doclib->main['project'] = $lang->projectCommon . '主库'; $lang->doclib->tabList['product'] = $lang->productCommon; $lang->doclib->tabList['project'] = $lang->projectCommon; $lang->doclib->tabList['custom'] = '自定义'; + +$lang->doclib->nameList['custom'] = '自定义文档库名称'; diff --git a/module/doc/view/alllibsbylist.html.php b/module/doc/view/alllibsbylist.html.php index 967a2fa46e..362593aecb 100644 --- a/module/doc/view/alllibsbylist.html.php +++ b/module/doc/view/alllibsbylist.html.php @@ -17,10 +17,10 @@ product->name;?> project->name;?> - doc->libName;?> + doclib->nameList[$type];?> doc->num;?> - + doc->addedBy;?> doc->addedDate;?> @@ -30,17 +30,17 @@ - createLink('doc', 'objectLibs', "type=$type&objectID=$lib->id") : $this->createLink('doc', 'browse', "libID=$lib->id");?> + createLink('doc', 'objectLibs', "type=$type&objectID=$lib->id") : $this->createLink('doc', 'browse', "libID=$lib->id");?> name);?> - + id] . $lang->doc->item;?> id]) . $lang->doc->item;?> - + createdBy) echo zget($users, $lib->createdBy);?> createdDate != '00-00-00 00:00:00') echo formatTime($lib->createdDate, 'm-d h:i');?> diff --git a/module/doc/view/bookside.html.php b/module/doc/view/bookside.html.php index e69de29bb2..4464ca81cf 100644 --- a/module/doc/view/bookside.html.php +++ b/module/doc/view/bookside.html.php @@ -0,0 +1 @@ +getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> From 290f2fefdfa005618d1508dea9f8e581981fbedf Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Fri, 19 Oct 2018 10:05:20 +0800 Subject: [PATCH 2/6] * Adjust doclib drop menu. --- module/doc/model.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index 0941178d9d..9e94238914 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -53,9 +53,10 @@ class docModel extends model $selectHtml .= "
"; $selectHtml .= "" . $mainLib . " "; $selectHtml .= "
    "; - $selectHtml .= '
  • ' . html::a(helper::createLink('doc', 'allLibs', "type=product"), " {$this->lang->productCommon}") . '
    • '; - $selectHtml .= '
  • ' . html::a(helper::createLink('doc', 'allLibs', "type=project"), " {$this->lang->projectCommon}") . '
    • '; - $selectHtml .= '
  • ' . html::a(helper::createLink('doc', 'allLibs', "type=custom"), " {$this->lang->doc->customAB}") . '
    • '; + foreach($this->lang->doc->libTypeList as $libType => $libName) + { + $selectHtml .= '
  • ' . html::a(helper::createLink('doc', 'allLibs', "type=$libType"), " {$this->lang->doc->libTypeList[$libType]}") . '
    • '; + } $selectHtml .='
'; } From 00133df918914bf00b04bec4394144d1084e7820 Mon Sep 17 00:00:00 2001 From: reneteng Date: Fri, 19 Oct 2018 10:42:58 +0800 Subject: [PATCH 3/6] * p change --- module/todo/lang/en.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index a8ff8c85ea..1990e93e77 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -72,13 +72,13 @@ $lang->todo->statusList['closed'] = 'Closed'; //$lang->todo->statusList['postpone'] = 'Delayed'; $lang->todo->priList[3] = 'Normal'; -$lang->todo->priList[1] = 'Highest'; -$lang->todo->priList[2] = 'High'; +$lang->todo->priList[1] = 'Critical'; +$lang->todo->priList[2] = 'Important'; $lang->todo->priList[4] = 'Low'; $lang->todo->priList[0] = ''; $lang->todo->typeList['custom'] = 'Custom'; -$lang->todo->typeList['cycle'] = 'Recurrence'; +$lang->todo->typeList['cycle'] = 'Recur'; $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = $lang->projectCommon . 'Task'; $lang->todo->typeList['story'] = $lang->projectCommon . 'Story'; From 32d073bb7417d0552ca95afcd14bd65e69cb813e Mon Sep 17 00:00:00 2001 From: Yagami Date: Fri, 19 Oct 2018 13:15:24 +0800 Subject: [PATCH 4/6] * Fix drop menu position. --- module/doc/js/browse.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js index 9f2e4b34d5..1ba5d470ee 100644 --- a/module/doc/js/browse.js +++ b/module/doc/js/browse.js @@ -16,10 +16,10 @@ function browseBySearch() $(function() { if(browseType == 'bysearch') return; - $('ul.dropdown-menu').css('left', '67px'); + $('#pageActions ul.dropdown-menu').css('left', '67px'); if(browseType == 'byediteddate' || browseType == 'openedbyme' || browseType == 'collectedbyme') { - $('ul.dropdown-menu').css('left', '0px'); + $('#pageActions ul.dropdown-menu').css('left', '0px'); $('#bysearchTab').remove(); } $('#' + browseType + 'Tab').addClass('active'); From 29ae62225a6dc041474144b5b282b5ee3e980fa0 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Fri, 19 Oct 2018 13:48:50 +0800 Subject: [PATCH 5/6] * Adjust doc side page to apply to zentaobiz. --- module/doc/css/common.css | 1 - module/doc/view/alllibsbylist.html.php | 2 +- module/doc/view/browse.html.php | 2 +- module/doc/view/browsebygrid.html.php | 6 +++- module/doc/view/side.html.php | 38 ++++++++++++++------------ 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/module/doc/css/common.css b/module/doc/css/common.css index fa5bbf1ec4..82ec05b862 100644 --- a/module/doc/css/common.css +++ b/module/doc/css/common.css @@ -70,7 +70,6 @@ td.c-name a{color: #0c60e1} td.c-name a:visited{color: #082999} -.main-col .panel-heading a:visited{color: #082999} .panel-title.font-normal .btn-group{margin-left: 20px;} diff --git a/module/doc/view/alllibsbylist.html.php b/module/doc/view/alllibsbylist.html.php index 362593aecb..5dc49dc16b 100644 --- a/module/doc/view/alllibsbylist.html.php +++ b/module/doc/view/alllibsbylist.html.php @@ -50,7 +50,7 @@ id&objectType=doclib");?>" title="" class='btn btn-link ajaxCollect'> id", "", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> - id&type=doc", "", '', "title='{$lang->tree->manage}' class='btn btn-link'")?> + id&type=doc", "", '', "title='{$lang->tree->manageType}' class='btn btn-link'")?> diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 579f58cb43..99d8ba95d4 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -46,7 +46,7 @@ var browseType = ''; diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php index dc36a5cd9b..34c767d697 100644 --- a/module/doc/view/browsebygrid.html.php +++ b/module/doc/view/browsebygrid.html.php @@ -7,8 +7,12 @@
", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?> ", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?> - ", '',"class='btn btn-icon'");?>
+ diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index 5fc74d44ef..66544928ec 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -110,30 +110,32 @@ if(!isset($type)) $type = 'product'; + $sideLibName):?> - methodName == 'objectlibs' && $type == $tabValue && $object->id == $sideLibID) ? 'active' : ''; - $activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $sideLibID) ? 'active' : $activeClass; - ?> -
  • > - createLink('doc', 'browse', "libID=$sideLibID"), " " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?> - -
      - - parent != 0) continue;?> -
    • methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>> - createLink('doc', 'browse', "libID=$sideLibID&browseType=byModule¶m={$module->id}"), " " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?> - doc->printChildModule($module, $sideLibID, $this->methodName, $browseType, $moduleID);?> -
      • - -
    + methodName == 'objectlibs' && $type == $tabValue && $object->id == $sideLibID) ? 'active' : ''; + $activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $sideLibID) ? 'active' : $activeClass; + ?> +
  • > + createLink('doc', 'browse', "libID=$sideLibID"), " " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?> + +
      + + parent != 0) continue;?> +
    • methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>> + createLink('doc', 'browse', "libID=$sideLibID&browseType=byModule¶m={$module->id}"), " " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?> + doc->printChildModule($module, $sideLibID, $this->methodName, $browseType, $moduleID);?> +
      • + +
    + +
    • - - + From 99038ca227c146b77ac1b8d28fbc8d093f36b05d Mon Sep 17 00:00:00 2001 From: Yagami Date: Fri, 19 Oct 2018 14:18:45 +0800 Subject: [PATCH 6/6] * Fix project doc display. --- module/doc/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/control.php b/module/doc/control.php index 34ad3e154e..1d84bc47cb 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -153,7 +153,7 @@ class doc extends control } $attachLibs = array(); - if(!empty($lib) and (!empty($lib->product) or !empty($lib->project))) + if(!empty($lib) and (!empty($lib->product) or !empty($lib->project)) and $browseType != 'bymodule') { $count = $this->dao->select('count(*) as count')->from(TABLE_DOCLIB)->where('project')->eq($lib->project)->andWhere('product')->eq($lib->product)->fetch('count'); if($count == 1)