From 6119cf2a52cd155686e292f9477556036e656e6c Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 18 Oct 2018 09:12:02 +0800
Subject: [PATCH] * Finish task #5033.

---
 module/doc/control.php        |  1 +
 module/doc/model.php          | 39 ++++++++++++++++++++---------------
 module/doc/view/side.html.php |  4 ++--
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index aec01523e5..34ad3e154e 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -42,6 +42,7 @@ class doc extends control
         $this->session->set('docList', $this->app->getURI(true));
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 5, 1);
+        $this->lang->modulePageActions = $this->doc->setFastMenu($this->lang->doc->fast);
 
         $this->view->title            = $this->lang->doc->common . $this->lang->colon . $this->lang->doc->index;
         $this->view->position[]       = $this->lang->doc->index;
diff --git a/module/doc/model.php b/module/doc/model.php
index dfd615e8f8..1bfaf8f2af 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -48,22 +48,6 @@ class docModel extends model
 
             $mainLib = isset($this->lang->doc->libTypeList[$type]) ? $this->lang->doc->libTypeList[$type] : $mainLib;
 
-            $selectHtml .= "<div class='btn-group angle-btn'>";
-            $selectHtml .= "<div class='btn-group'>";
-            $selectHtml .= "<a data-toggle='dropdown' class='btn btn-limit' title=$mainLib>" . $mainLib . " <span class='caret'></span></a>";
-            $selectHtml .= "<ul class='dropdown-menu'>";
-            foreach($this->lang->doc->fastMenuList as $key => $fastMenu)
-            {
-                $link = helper::createLink('doc', 'browse', "libID=0&browseTyp={$key}");
-                $selectHtml .= '<li>' . html::a($link, "<i class='icon {$this->lang->doc->fastMenuIconList[$key]}'></i> {$fastMenu}") . '</li>';
-            }
-            $selectHtml .= "<li class='divider'></li>";
-            foreach($this->lang->doc->libTypeList as $libType => $libName)
-            {
-                $selectHtml .= '<li>' . html::a(helper::createLink('doc', 'allLibs', "type=$libType"), "<i class='icon {$this->lang->doc->libIconList[$libType]}'></i> {$this->lang->doc->libTypeList[$libType]}") . '</li>';
-            }
-            $selectHtml .='</ul></div></div>';
-
             $currentLib = 0;
             if(strpos('product,project,custom', $type) !== false)
             {
@@ -105,7 +89,7 @@ class docModel extends model
                 }
             }
 
-            $actions  = '';
+            $actions  = $this->setFastMenu($mainLib);
             $actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : '';
             if($libID and common::hasPriv('doc', 'create')) $actions .= html::a(helper::createLink('doc', 'create', "libID=$libID"), "<i class='icon icon-plus'></i> " . $this->lang->doc->create, '', "class='btn btn-primary'");
 
@@ -1490,4 +1474,25 @@ class docModel extends model
 
         return $title;
     }
+
+    public function setFastMenu($mainLib)
+    {
+        $actions  = '';
+        $actions .= "<a data-toggle='dropdown' class='btn btn-secondary' title=$mainLib>" . $mainLib . " <span class='caret'></span></a>";
+        $actions .= "<ul class='dropdown-menu'>";
+        foreach($this->lang->doc->fastMenuList as $key => $fastMenu)
+        {
+            $link     = helper::createLink('doc', 'browse', "libID=0&browseTyp={$key}");
+            $actions .= '<li>' . html::a($link, "<i class='icon {$this->lang->doc->fastMenuIconList[$key]}'></i> {$fastMenu}") . '</li>';
+        }
+        $actions .= "<li class='divider'></li>";
+        foreach($this->lang->doc->libTypeList as $libType => $libName)
+        {
+            $actions .= '<li>' . html::a(helper::createLink('doc', 'allLibs', "type=$libType"), "<i class='icon {$this->lang->doc->libIconList[$libType]}'></i> {$this->lang->doc->libTypeList[$libType]}") . '</li>';
+        }
+        $actions .='</ul>';
+        $actions .= '<a class="btn btn-secondary querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i>' . $this->lang->doc->search . '</a>';
+
+        return $actions;
+    }
 }
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index c01089fd16..2c54a99762 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -48,7 +48,7 @@ if(!isset($type)) $type = 'product';
 
           $icon        = $tabValue == 'product' ? "<i class='icon icon-cube'></i> " : "<i class='icon icon-stack'></i> ";
           $activeClass = ($this->methodName == 'objectlibs' && $type == $tabValue && $object->id == $tabMenu->id) ? 'active' : '';
-          $activeClass = ($this->methodName == 'browse' && isset($currentLib) && $currentLib->id == $mainLibID) ? 'active' : $activeClass;
+          $activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $mainLibID) ? 'active' : $activeClass;
           ?>
           <li <?php echo "class='$activeClass'";?>>
             <?php if($customLibCount > 0):?>
@@ -115,7 +115,7 @@ if(!isset($type)) $type = 'product';
           <?php foreach($sideLibs[$tabValue] as $sideLibID => $sideLibName):?>
           <?php
           $activeClass = ($this->methodName == 'objectlibs' && $type == $tabValue && $object->id == $sideLibID) ? 'active' : '';
-          $activeClass = ($this->methodName == 'browse' && isset($currentLib) && $currentLib->id == $sideLibID) ? 'active' : $activeClass;
+          $activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $sideLibID) ? 'active' : $activeClass;
           ?>
           <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}'");?>