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

module/doc/css/common.css

@@ -71,3 +71,5 @@
 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;}

module/doc/model.php

@@ -49,7 +49,7 @@ class docModel extends model
             $mainLib = isset($this->lang->doc->libTypeList[$type]) ? $this->lang->doc->libTypeList[$type] : $mainLib;
 
             $currentLib = 0;
-            if(strpos('product,project,custom', $type) !== false)
+            if(in_array($type, array_keys($this->lang->doc->libTypeList)))
             {
                 if($type == 'product') $currentLib = $productID;
                 if($type == 'project') $currentLib = $projectID;

module/doc/view/alllibs.html.php

@@ -23,15 +23,13 @@
     <div class="panel block-files block-sm no-margin">
       <div class="panel-heading">
         <div class="panel-title font-normal">
-          <?php $panelTitle = $lang->doc->libTypeList[$type];?>
+          <?php $panelTitle = zget($lang->doclib->tabList, $type);?>
           <i class="icon icon-folder-open-o text-muted"></i> <?php echo $panelTitle;?>
-        </div>
-        <nav class="panel-actions btn-toolbar">
           <div class="btn-group">
             <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
             <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
           </div>
-        </nav>
+        </div>
       </div>
       <div class="panel-body">
         <div class="row row-grid files-grid" data-size="300">

module/doc/view/alllibsbylist.html.php

@@ -2,18 +2,13 @@
   <div class="panel block-files block-sm no-margin">
     <div class="panel-heading">
       <div class="panel-title font-normal">
-        <?php $panelTitle = '';?>
-        <?php if($type == 'custom')  $panelTitle = $lang->doc->custom;?>
-        <?php if($type == 'product') $panelTitle = $lang->productCommon;?>
-        <?php if($type == 'project') $panelTitle = $lang->projectCommon;?>
+        <?php $panelTitle = zget($lang->doclib->tabList, $type);?>
         <i class="icon icon-folder-open-o text-muted"></i> <?php echo $panelTitle;?>
-      </div>
-      <nav class="panel-actions btn-toolbar">
         <div class="btn-group">
           <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
           <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
         </div>
-      </nav>
+      </div>
     </div>
     <div class="panel-body">
       <table class="table table-borderless table-hover table-files table-fixed no-margin">

module/doc/view/browse.html.php

@@ -37,12 +37,15 @@ var browseType = '<?php echo $browseType;?>';
           <i class="icon icon-search text-muted"></i>
           <?php endif;?>
           <?php echo $breadTitle;?>
-        </div>
-        <nav class="panel-actions btn-toolbar">
+
           <div class="btn-group">
             <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
             <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
-            <?php echo html::a(helper::createLink('tree', 'browse', "libID=$libID&viewType=doc"), "<i class='icon icon-cog'></i>", '',"class='btn btn-icon'");?>
+          </div>
+        </div>
+        <nav class="panel-actions btn-toolbar">
+          <div class="btn-group">
+            <?php echo html::a(helper::createLink('tree', 'browse', "libID=$libID&viewType=doc"), "<i class='icon icon-cog'></i>" . $lang->doc->manageType, '',"class='btn btn-printLink'");?>
           </div>
         </nav>
       </div>

module/doc/view/browsebygrid.html.php

@@ -1,14 +1,15 @@
 <div class="main-col" data-min-width="400">
   <div class="panel block-files block-sm no-margin">
     <div class="panel-heading">
-      <div class="panel-title font-normal"><i class="icon icon-folder-open-o text-muted"></i> <?php echo $title;?></div>
-      <nav class="panel-actions btn-toolbar">
+      <div class="panel-title font-normal">
+        <i class="icon icon-folder-open-o text-muted"></i>
+        <?php echo $breadTitle;?>
         <div class="btn-group">
           <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
           <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
           <?php echo html::a(helper::createLink('tree', 'browse', "libID=$libID&viewType=doc"), "<i class='icon icon-cog'></i>", '',"class='btn btn-icon'");?>
         </div>
-      </nav>
+      </div>
     </div>
     <?php if(empty($docs) and empty($modules) and empty($libs) and empty($attachLibs)):?>
     <div class="table-empty-tip">

module/doc/view/objectlibs.html.php

@@ -23,13 +23,11 @@
       <div class="panel-heading">
         <div class="panel-title font-normal">
           <i class="icon icon-folder-open-o text-muted"></i> <?php echo $object->name;?>
-        </div>
-        <nav class="panel-actions btn-toolbar">
           <div class="btn-group">
             <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
             <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
           </div>
-        </nav>
+        </div>
       </div>
       <div class='panel-body'>
         <div class="row row-grid files-grid" data-size="300">

module/doc/view/objectlibsbylist.html.php

@@ -3,13 +3,11 @@
     <div class="panel-heading">
       <div class="panel-title font-normal">
         <i class="icon icon-folder-open-o text-muted"></i> <?php echo $object->name;?>
-      </div>
-      <nav class="panel-actions btn-toolbar">
         <div class="btn-group">
           <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
           <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
         </div>
-      </nav>
+      </div>
     </div>
     <div class='panel-body'>
       <table class="table table-borderless table-hover table-files table-fixed no-margin">

module/doc/view/side.html.php

@@ -1,8 +1,6 @@
 <?php
 $sideLibs = array();
-$sideLibs['product'] = $this->doc->getLimitLibs('product');
-$sideLibs['project'] = $this->doc->getLimitLibs('project');
-$sideLibs['custom']  = $this->doc->getLimitLibs('custom');
+foreach($lang->doclib->tabList as $libType => $typeName) $sideLibs[$libType] = $this->doc->getLimitLibs($libType);
 $allModules = $this->loadModel('tree')->getDocStructure();
 
 $sideSubLibs = array();
@@ -119,6 +117,10 @@ if(!isset($type)) $type = 'product';
           ?>
           <li <?php echo "class='$activeClass'";?>>
             <?php echo html::a($this->createLink('doc', 'browse', "libID=$sideLibID"), "<i class='icon icon-folder-o'></i> " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?>
+            <?php if($tabValue == 'book'):?>
+            <?php include './bookside.html.php';?>
+            <?php else:?>
+            <?php if(isset($allModules[$sideLibID])):?>
             <ul>
               <?php foreach($allModules[$sideLibID] as $module):?>
               <?php if($module->parent != 0) continue;?>
@@ -128,6 +130,8 @@ if(!isset($type)) $type = 'product';
               </li>
               <?php endforeach;?>
             </ul>
+            <?php endif;?>
+            <?php endif;?>
           </li>
           <?php endforeach;?>
           <?php endif;?>