From e2e9b6cab804533f6240b2d3f5858bb985ed0e06 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Tue, 16 Oct 2018 10:27:12 +0800
Subject: [PATCH] * Finish task #5028.

---
 db/update10.4.sql                         |  1 +
 module/doc/view/alllibsbylist.html.php    |  2 +-
 module/doc/view/browse.html.php           |  1 +
 module/doc/view/objectlibs.html.php       | 23 ---------------------
 module/doc/view/objectlibsbylist.html.php | 25 +----------------------
 5 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/db/update10.4.sql b/db/update10.4.sql
index 5164300388..30637e9184 100644
--- a/db/update10.4.sql
+++ b/db/update10.4.sql
@@ -2,3 +2,4 @@ update zt_task set `parent` = -1 where `id` in (select `parent` from zt_task whe
 ALTER TABLE `zt_userview` CHANGE `products` `products` mediumtext COLLATE 'utf8_general_ci' NOT NULL AFTER `account`,
 CHANGE `projects` `projects` mediumtext COLLATE 'utf8_general_ci' NOT NULL AFTER `products`;
 ALTER TABLE `zt_task` ADD `finishedList` text NOT NULL AFTER `finishedDate`;
+update zt_config set `value` = 'files,customFiles' where `module` = 'doc' and `section` = 'custom' and `key` = 'objectLibs';
diff --git a/module/doc/view/alllibsbylist.html.php b/module/doc/view/alllibsbylist.html.php
index 08eca0f9f0..795f134b2b 100644
--- a/module/doc/view/alllibsbylist.html.php
+++ b/module/doc/view/alllibsbylist.html.php
@@ -29,7 +29,7 @@
             <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
             <th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
             <?php else:?>
-            <th class="c-actions-3"><?php echo $lang->actions;?></th>
+            <th class="w-120px"><?php echo $lang->actions;?></th>
             <?php endif;?>
           </tr>
         </thead>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index f4d807df7b..d4d312e16d 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -42,6 +42,7 @@ var browseType = '<?php echo $browseType;?>';
           <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>
         </nav>
       </div>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index ad1ca23575..d95a5654b5 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -29,29 +29,6 @@
             <?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>
-          <div class="dropdown">
-            <button type="button" title="<?php echo $lang->customConfig;?>" class="btn btn-icon" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
-            <div class="dropdown-menu pull-right col-lg" id="pageSetting">
-              <form class='with-padding load-indicator' id='pageSettingForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('custom', 'ajaxSaveCustomFields', 'module=doc&section=custom&key=objectLibs');?>'>
-                <div><?php echo $lang->customConfig;?></div>
-                <div class="row row-grid with-padding">
-                  <?php foreach($customObjectLibs as $libType => $libTypeName):?>
-                  <div class="col-xs-12">
-                    <?php $checked = (strpos(",$showLibs,", ",$libType,") !== false) ? " checked ='checked'" : "";?>
-                    <div class="checkbox-primary">
-                      <input type="checkbox" name="fields[]" value="<?php echo $libType;?>" <?php echo $checked;?> id="fields<?php echo $libType;?>">
-                      <label for="fields<?php echo $libType;?>"><?php echo $libTypeName;?></label>
-                    </div>
-                  </div>
-                  <?php endforeach;?>
-                </div>
-                <div>
-                  <?php echo html::submitButton($lang->save, '', 'btn btn-primary');?> &nbsp;
-                  <?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
-                </div>
-              </form>
-            </div>
-          </div>
         </nav>
       </div>
       <div class='panel-body'>
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
index 00d20916cd..b73d34ce05 100644
--- a/module/doc/view/objectlibsbylist.html.php
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -9,29 +9,6 @@
           <?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>
-        <div class="dropdown">
-          <button type="button" title="<?php echo $lang->customConfig;?>" class="btn btn-icon" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
-          <div class="dropdown-menu pull-right col-lg" id="pageSetting">
-            <form class='with-padding load-indicator' id='pageSettingForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('custom', 'ajaxSaveCustomFields', 'module=doc&section=custom&key=objectLibs');?>'>
-              <div><?php echo $lang->customConfig;?></div>
-              <div class="row row-grid with-padding">
-                <?php foreach($customObjectLibs as $libType => $libTypeName):?>
-                <div class="col-xs-12">
-                  <?php $checked = (strpos(",$showLibs,", ",$libType,") !== false) ? " checked ='checked'" : "";?>
-                  <div class="checkbox-primary">
-                    <input type="checkbox" name="fields[]" value="<?php echo $libType;?>" <?php echo $checked;?> id="fields<?php echo $libType;?>">
-                    <label for="fields<?php echo $libType;?>"><?php echo $libTypeName;?></label>
-                  </div>
-                </div>
-                <?php endforeach;?>
-              </div>
-              <div>
-                <?php echo html::submitButton($lang->save, '', 'btn btn-primary');?> &nbsp;
-                <?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
-              </div>
-            </form>
-          </div>
-        </div>
       </nav>
     </div>
     <div class='panel-body'>
@@ -40,7 +17,7 @@
           <tr>
             <th class="c-name"><?php echo $lang->doc->libName;?></th>
             <th class="c-num"><?php echo $lang->doc->num;?></th>
-            <th class="c-actions-3"><?php echo $lang->actions;?></th>
+            <th class="w-120px"><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody>