From cf9d677ffaf46d8ff256b917f33a5412b394d7c1 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 5 Jul 2022 08:08:17 +0000
Subject: [PATCH] * Finish task#59528.

---
 module/search/lang/de.php             |  1 +
 module/search/lang/en.php             |  1 +
 module/search/lang/fr.php             |  1 +
 module/search/lang/zh-cn.php          |  1 +
 module/search/view/buildform.html.php | 14 +++++++-------
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/module/search/lang/de.php b/module/search/lang/de.php
index 21f5a94ed4..d288633203 100644
--- a/module/search/lang/de.php
+++ b/module/search/lang/de.php
@@ -30,6 +30,7 @@ $lang->search->noQuery       = 'Keine Suche gespeichert';
 $lang->search->onMenuBar     = 'In Menü anzeigen';
 $lang->search->custom        = 'Eigene';
 $lang->search->setCommon     = 'Set as public query criteria';
+$lang->search->saveCondition = 'Save search options';
 
 $lang->search->account  = 'Konto';
 $lang->search->module   = 'Module';
diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 794fb39cbf..9f98c458a8 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -30,6 +30,7 @@ $lang->search->noQuery       = 'No query is saved yet!';
 $lang->search->onMenuBar     = 'Show in Menu';
 $lang->search->custom        = 'Custom';
 $lang->search->setCommon     = 'Set as public query criteria';
+$lang->search->saveCondition = 'Save search options';
 
 $lang->search->account  = 'Account';
 $lang->search->module   = 'Module';
diff --git a/module/search/lang/fr.php b/module/search/lang/fr.php
index 220cbced6e..fe4d94d716 100644
--- a/module/search/lang/fr.php
+++ b/module/search/lang/fr.php
@@ -30,6 +30,7 @@ $lang->search->noQuery       = 'Aucune query de sauvegardée !';
 $lang->search->onMenuBar     = 'Montrer dans le Menu';
 $lang->search->custom        = 'Personnalisation';
 $lang->search->setCommon     = 'Set as public query criteria';
+$lang->search->saveCondition = 'Save search options';
 
 $lang->search->account  = 'Compte';
 $lang->search->module   = 'Module';
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 67106e3256..683212dffd 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -30,6 +30,7 @@ $lang->search->noQuery       = '还没有保存查询！';
 $lang->search->onMenuBar     = '显示在菜单栏';
 $lang->search->custom        = '自定义';
 $lang->search->setCommon     = '设为公共查询条件';
+$lang->search->saveCondition = '保存搜索条件';
 
 $lang->search->account  = '用户名';
 $lang->search->module   = '模块';
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index f8b92d3422..1b92c21ccf 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -64,6 +64,7 @@ $formId = 'searchForm-' . uniqid('');
 html[lang^='zh-'] .fieldWidth {width: 110px !important;}
 html[lang^='zh-'] .operatorWidth {width: 90px !important;}
 .table tbody tr td input {display: block !important;}
+#save-query {color: #0061f2;}
 </style>
 <?php if($style != 'simple'):?>
   <div id='toggle-queries'>
@@ -243,12 +244,9 @@ foreach($fieldParams as $fieldName => $param)
         echo html::hidden('actionURL',  $actionURL);
         echo html::hidden('groupItems', $groupItems);
         echo html::submitButton($lang->search->common, '', 'btn btn-primary') . " &nbsp; ";
-        if($style != 'simple')
-        {
-            if(common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), $lang->save, '', "class='btn-save-form btn btn-secondary iframe' id='save-query'") . "&nbsp;";
-            echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn');
-        }
+        if($style != 'simple') echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn');
         echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
+        if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<i class="icon-bug-confirmBug icon-ok"></i> ' . $lang->search->saveCondition, '', "class='btn-save-form btn btn-link iframe pull-right' id='save-query'");
         echo html::hidden('formType', zget($formSession, 'formType', 'lite'));
         ?>
       </td>
@@ -307,9 +305,11 @@ $(function()
         $select.picker(pickerOptions);
     });
 
-    $('#queryBox select, #queryBox input').change(function(){
-        $('#save-query').attr("disabled","disabled");
+    $('#queryBox select, #queryBox input').change(function()
+    {
+        $('#save-query').attr("disabled", "disabled");
     })
+
     /* Toggle user queries action. */
     $('#toggle-queries').click(function()
     {