From 5e9c7c10ea0b9f4b092492a5925e283f75f43639 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 30 May 2019 13:41:33 +0800
Subject: [PATCH] * Finish task #5533.

---
 module/search/lang/en.php             |  2 +-
 module/search/lang/zh-cn.php          |  2 +-
 module/search/view/buildform.html.php | 21 ++++++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 883280bfea..37c426915e 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -17,7 +17,7 @@ $lang->search->group1        = 'Group 1';
 $lang->search->group2        = 'Group 2';
 $lang->search->buildForm     = 'Search Form';
 $lang->search->buildQuery    = 'Execute Query';
-$lang->search->savedQuery     = 'Saved Query';
+$lang->search->savedQuery    = 'Saved Query';
 $lang->search->deleteQuery   = 'Delete Query';
 $lang->search->setQueryTitle = 'Enter a title. Search then the query is saved.';
 $lang->search->select        = 'Story/Task Filter';
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 7a2fc64bb0..27c3c76831 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -17,7 +17,7 @@ $lang->search->group1        = '第一组';
 $lang->search->group2        = '第二组';
 $lang->search->buildForm     = '搜索表单';
 $lang->search->buildQuery    = '执行搜索';
-$lang->search->savedQuery    = '已保存的检索历史';
+$lang->search->savedQuery    = '已保存的查询条件';
 $lang->search->deleteQuery   = '删除查询';
 $lang->search->setQueryTitle = '请输入查询标题（保存之前请先查询）：';
 $lang->search->select        = '需求/任务筛选';
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index d610750fa4..1761c78b25 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -58,6 +58,8 @@ $operatorWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-90px';
 #<?php echo $formId;?> .form-actions {text-align: left; padding: 0!important; max-width: 200px; vertical-align: middle; width: 200px;}
 #queryBox.show {min-height: 66px;}
 <?php endif;?>
+#toggle-queries{position: absolute; right: 0px; top: 40px; width: 13px; background: #79cdfb; border-radius: 6px; height: 30px;cursor: pointer}
+#toggle-queries .icon{ position: absolute; top: 6px; right: -2px; color: #fff;}
 </style>
 <form method='post' action='<?php echo $this->createLink('search', 'buildQuery');?>' target='hiddenwin' id='<?php echo $formId;?>' class='search-form<?php if($style == 'simple') echo ' search-form-simple';?>'>
 <div class='hidden'>
@@ -201,7 +203,10 @@ foreach($fieldParams as $fieldName => $param)
         </table>
       </td>
       <?php if($style != 'simple'):?>
-      <td class='w-160px' rowspan='2' id='userQueries'>
+      <div id='toggle-queries'>
+      <i class='icon icon-angle-left'></i>
+      </div>
+      <td class='w-160px hidden' rowspan='2' id='userQueries'>
         <h4><?php echo $lang->search->savedQuery;?></h4>
         <ul>
           <?php foreach($queries as $queryID => $queryName):?>
@@ -262,6 +267,20 @@ $(function()
 {
     var $searchForm = $('#<?php echo $formId;?>');
     $searchForm.find('select.chosen').chosen();
+    $('#toggle-queries').click(function()
+    {
+        $('#userQueries').toggleClass('hidden');
+        if(!$('#userQueries').hasClass('hidden')) 
+        {
+            $('#toggle-queries .icon').removeClass('icon-angle-left');
+            $('#toggle-queries .icon').addClass('icon-angle-right');
+        }
+        else
+        {
+            $('#toggle-queries .icon').removeClass('icon-angle-right');
+            $('#toggle-queries .icon').addClass('icon-angle-left');
+        }
+    });
 
     /*
      * Load queries form