From e3d08b74bf395a3f1ff7aef2ae3a8b0374a64026 Mon Sep 17 00:00:00 2001
From: Matthieu Leproux <leproux.matthieu@gmail.com>
Date: Fri, 16 Jul 2021 15:11:31 +0200
Subject: [PATCH] related to #1452 Changed filters inputs to search input

---
 admin/themes/default/template/tags.tpl      |  4 +--
 admin/themes/default/template/user_list.tpl | 27 +++++++++------------
 language/en_UK/admin.lang.php               |  3 ++-
 language/fr_FR/admin.lang.php               |  3 ++-
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index 1c8cf475a..7fd364fbb 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -115,9 +115,9 @@ var str_tag_found = '{'<b>%d</b> tag found'|@translate}';
 <div class='tag-header'>
   <div id='search-tag'>
     <div class='search-info'> </div>
-    <span class='icon-filter search-icon'> </span>
+    <span class='icon-search search-icon'> </span>
     <span class="icon-cancel search-cancel"></span>
-    <input class='search-input' type='text' placeholder='{'Filter'|@translate}'>
+    <input class='search-input' type='text' placeholder='{'Search'|@translate}'>
   </div>
   <form id='add-tag' class='not-in-selection-mode'>
     <span class='icon-cancel-circled'></span>
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 90bb90b1f..1126bd859 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -132,28 +132,19 @@ $(".icon-help-circled").tipTip({
           </div>
         </div>
         <div style="display:flex; width: 270px;">
-          {* <div id="advanced_filter_button">
-            <span>{'Advanced filter'|@translate}</span>
-          </div> *}
-          {* <div id='search-user'>
-            <div class='search-info'> </div>
-            <span class='icon-filter search-icon'> </span>
-            <span class="icon-cancel search-cancel"></span>
-            <input id="user_search" class='search-input' type='text' placeholder='{'Filter'|@translate}'>
-          </div> *}
         </div>
       </div>
       <div class="not-in-selection-mode" style="width: 264px; height:2px">
       </div>
     </div>
-    <div id="advanced_filter_button">
-      <span>{'Advanced filters'|@translate}</span>
+    <div id="advanced_filter_button" class="icon-filter">
+      <span>{'Filters'|@translate}</span>
     </div>
     <div id='search-user'>
         <div class='search-info'> </div>
-          <span class='icon-filter search-icon'> </span>
+          <span class='icon-search search-icon'> </span>
           <span class="icon-cancel search-cancel"></span>
-          <input id="user_search" class='search-input' type='text' placeholder='{'Filter'|@translate}'>
+          <input id="user_search" class='search-input' type='text' placeholder='{'Search'|@translate}'>
         </div>
     <div id="advanced-filter-container">
       <div class="advanced-filters-header">
@@ -997,7 +988,7 @@ $(".icon-help-circled").tipTip({
 /* filters bar */
 
 #user_search {
-    width: 100px;
+    width: 200px;
 }
 
 .advanced-filter-date {
@@ -1886,11 +1877,11 @@ Advanced filter
 
 #advanced_filter_button {
 
-  width: 100px;
+  width: 70px;
 
   position: absolute;
   z-index: 2;
-  right: 550px;
+  right: 650px;
 
 
   cursor:pointer;
@@ -1898,6 +1889,10 @@ Advanced filter
   margin-right:10px;
 }
 
+#advanced_filter_button.icon-filter::before {
+  transform: scale(1.2);
+}
+
 #search-user {
   position: absolute;
   z-index: 2;
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index b7db13b0c..892550a2a 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1229,4 +1229,5 @@ $lang['Activated'] = 'Activated';
 $lang['Deactivated'] = 'Deactivated';
 $lang['Restored'] = 'Restored';
 $lang['right now'] = 'right now';
-$lang['never calculated'] = 'never  calculated';
\ No newline at end of file
+$lang['never calculated'] = 'never  calculated';
+$lang['Filters'] = 'Filters';
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 81e7865bc..dbd5561e7 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -1231,4 +1231,5 @@ $lang['Activated'] = 'Activé';
 $lang['Deactivated'] = 'Désactivé';
 $lang['Restored'] = 'Restoré';
 $lang['right now'] = 'à l\'instant';
-$lang['never calculated'] = 'jamais calculé';
\ No newline at end of file
+$lang['never calculated'] = 'jamais calculé';
+$lang['Filters'] = 'Filtres';
\ No newline at end of file