From 5c71ee281d24987337018f5f35ae2aa4e2a30dca Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Thu, 18 Oct 2018 14:08:30 +0800
Subject: [PATCH] * Finish task #5026.

---
 module/doc/css/common.css       |  2 ++
 module/doc/js/browse.js         | 10 +---------
 module/doc/model.php            |  2 +-
 module/doc/view/browse.html.php |  7 ++++---
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 191bff0055..fa5bbf1ec4 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -73,3 +73,5 @@ td.c-name a:visited{color: #082999}
 .main-col .panel-heading a:visited{color: #082999}
 
 .panel-title.font-normal .btn-group{margin-left: 20px;}
+
+.querybox-opened{color: #0c64eb; background: rgba(0,0,0,.075);}
diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js
index 240dfcabf5..6daa7150cd 100644
--- a/module/doc/js/browse.js
+++ b/module/doc/js/browse.js
@@ -4,8 +4,6 @@ function browseByModule()
     $('.divider').removeClass('hidden');
     $('#bymoduleTab').addClass('active');
     $('#allTab').removeClass('active');
-    $('#bysearchTab').removeClass('active');
-    $('#queryBox').removeClass('show');
 }
 
 function browseBySearch()
@@ -13,15 +11,9 @@ function browseBySearch()
     $('.divider').addClass('hidden');
     $('#bymoduleTab').removeClass('active');
     $('#allTab').addClass('active');
-    $('#bysearchTab').addClass('active');
-    $('#queryBox').addClass('show');
 }
 
 $(function(){
+    if(browseType == 'bysearch') return;
     $('#' + browseType + 'Tab').addClass('active');
-    if(browseType == "bysearch")
-    {
-        $.toggleQueryBox(true);
-        browseBySearch();
-    }
 });
diff --git a/module/doc/model.php b/module/doc/model.php
index 4c0bac4ca0..0941178d9d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1489,6 +1489,7 @@ class docModel extends model
     public function setFastMenu($fastLib)
     {
         $actions  = '';
+        if($this->app->methodName == 'browse') $actions .= '<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i>' . $this->lang->doc->search . '</a>';
         $actions .= "<a data-toggle='dropdown' class='btn btn-secondary' title=$fastLib>" . $fastLib . " <span class='caret'></span></a>";
         $actions .= "<ul class='dropdown-menu'>";
         foreach($this->lang->doc->fastMenuList as $key => $fastMenu)
@@ -1497,7 +1498,6 @@ class docModel extends model
             $actions .= '<li>' . html::a($link, "<i class='icon {$this->lang->doc->fastMenuIconList[$key]}'></i> {$fastMenu}") . '</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/browse.html.php b/module/doc/view/browse.html.php
index baf370eece..8920cbf31f 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -28,6 +28,7 @@ var browseType = '<?php echo $browseType;?>';
   <?php include dirname(__FILE__) . '/browsebygrid.html.php';?>
   <?php else:?>
   <div class="main-col" data-min-width="400">
+    <div class="cell<?php if($browseType == 'bysearch') echo ' show';?>" id="queryBox"></div>
     <div class="panel block-files block-sm no-margin">
       <div class="panel-heading">
         <div class="panel-title font-normal">
@@ -102,11 +103,11 @@ var browseType = '<?php echo $browseType;?>';
             <?php endforeach;?>
             <?php endif;?>
             <?php if(!empty($attachLibs)):?>
-            <?php foreach($attachLibs as $libID => $attachLib):?>
+            <?php foreach($attachLibs as $libType => $attachLib):?>
             <tr>
-              <?php if($libID == 'project'):?>
+              <?php if($libType == 'project'):?>
               <td class="c-name"><?php echo html::a(inlink('allLibs', "type=project&product={$currentLib->product}"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $attachLib->name);?></td>
-              <?php elseif($libID == 'files'):?>
+              <?php elseif($libType == 'files'):?>
               <td class="c-name"><?php echo html::a(inlink('showFiles', "type=$type&objectID={$currentLib->$type}"), "<i class='icon icon-folder text-yellow'></i> &nbsp;" . $attachLib->name);?></td>
               <?php endif;?>
               <td class="c-num"></td>