From 44eada08884994196740b2159469a6cc4300b0fc Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Thu, 18 Feb 2021 14:27:41 -0800
Subject: [PATCH] Added search clear button.

---
 public/images/x16.png    | Bin 0 -> 601 bytes
 public/images/x32.png    | Bin 0 -> 1167 bytes
 translate/translate.json |   8 ++++----
 views/default.handlebars |   3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 public/images/x16.png
 create mode 100644 public/images/x32.png

diff --git a/public/images/x16.png b/public/images/x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..4561bddb445d4045e84f7226d64cefa28a463de9
GIT binary patch
literal 601
zcmV-f0;c_mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0q#jeK~y+TjgviS
zT2U0o|1U)+iBLpzu$iQbTgAaGi{dVVqag?iY1e{FibxU=2N#Eg;2;tRE}1kIS3z8K
z5hQtnRwTL=iv<bhoa6Q7qZaamKj+-@?m6#%oU7pt?RNV!nM2Y(X^-?sx+nc4oqN6B
zUt|r80+eVbb4vP3`oOU*{3ZP$ol&6`2c&>Xz99v9{0=Tjhg@W5J(fR9a<y7Txm?C{
zI_04-7z`xVY&KN{2c#o*cGRAE*@C8N$mMd#X0tM0tyV~<)5z!Zu-R-9Q=}>PBd>rD
z%-C}<7=+*NN2Ad|tJOliUPrgvMJyJB+wE4fgk4fpqbhB3zDP(hnM@FgMBs9{uvjc$
zHk(l@m0&WN)C_|Pui(?#f5z!_A|8*U-|u5I8X=WRZA)hMxPV;8TgKzD@_=5ir@Vi7
z<N|kV|CvswgG!}>a5xNy!+}DffZ1%OzP>`|0^DH+%jFW8Oa>N<1&Krg$z&4q`CM*h
z3%6Y0oWva_6pKaZx-O?~wOSDhh2Zgc<ThUP0rNn*-gM%3GAHcUYBgC!AP|t#XNJR}
zT&3M^htKDe7!jpTyxJ6CdqLt3dk@Ey%x?m`1*nI?4fT!mn`8fhm(72cWX5=n8@N5m
nL`g57vrf7tT~qQOvI^h{jKHa`62Fv?00000NkvXXu0mjf06Pc0

literal 0
HcmV?d00001

diff --git a/public/images/x32.png b/public/images/x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..6816a42380acf8cdb6b6001893eaf947c4b5e3ab
GIT binary patch
literal 1167
zcmV;A1aSL_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1SCmBK~z{rwU<vw
zTvrsvkAIK`6tzgZ${@IMAtDNf+K5>ggeV470t$jfL@E&#6%k1xpn?lA#zYV#xKK#4
z(1j5VgSZhaSPd?UpcOX-MI%KN33kSO-@W(EIGOim-UR)@mv_&7hI8KibIzGKamo7n
zdLkb8p%N$;x(odX{SSSH{(=62yafdXTX?!6Y5;Kj6CQ2QZ_v-2bHU%xOXv-P`J!eV
za0~#B6Y%JOo<Yf+`wsS@rwC$Ro8j070O$PD_Yjx-CU_0CA&^UL1_=uQ&a?3FLYZpf
z=J*IbMi3X;)Pw|JzI+Y3Y3CLnph^Vc)22wgd0KnUWxp-w<Pr2-4>f@mKmc8M3~4LK
z*w~mXE-o5Nq_(zJ$&S9hKH1#dG?vJ~z<}iD^2UbXhkn5-{7FNt0G#ux@wA6gS63$&
z7Z-AHaG*3kJ}yT`N9JviwY4=B=;7g^QeIx3opVB;FW@s^5Z-g!tCpUgE^Tdmtzj@D
zBO}Jr_<X*QIsTu{&Q4?5QV2cdARdu0!!gM?QeIvzSTbXYEG;d`#>R%RL}q7aWp{Vi
zSR&os-IA7;W-LdV_zzd$S14kJi;Ihs-rinGN=h;_BE!SO;`jUI{QO)dCML`*@^ndw
zl$MqnD<Y5Z@pl-&18qmf<MBviW23P|wzs!sVPQdLW@hB%<V4LSCnrl!PmdbA;0Nd)
z1F$_QcGTC`OI8;1l!ga#dV1Pe$lDzql97>NELY?*09G|uBqk=RtHv!MJnd&^XKGwn
zSSS@06>1y<9tM!E$L`3<$&t#+N@E4#*IR+bKpF#JVsOpn<)v(Gg_ryJdB=hm2_FME
z)?;@}O-;$(-k!07@G$P|>=?^6pBVr<8CUG@@5|)mq_ISro0|hylgVgsa8O;%7}#R~
zY@?!bb#*2E{rzeSNM>fHG&D3wRaKR;3Abi$Zq8V)SZ4sN{ZV1IyIyEoTU#X|AwlJa
zl#~=RtBaSF7oxy|@+lrEmM4lmoFm7_$1*xPYAlib{Cp`cE>`2z)KqC|Qdw1TdU_gG
zD;#(a-+rzDVFT&N(9lrezVoVGFHWSUrbcav1v8{o?Hu4idBuShz#E7SWEd+eE3&-2
zY%GzovNFle&Nh~Y397xl-B=nPNb9`V@D^XMR$T=EgRS#Zj<3TL?e%)ql2fdREiEnP
zZ74-WMN(Z|9r#<O<ki(x^EQP4AT~dWZ+k*6%kSE{HJ;!@-kEV=3oN*~>|Sq+Kdw6`
zApzheH|;UR?)9dj^N@y=e7gb+f_*!y%>WcrT62JV&SejCP9l~soC)@BFCac+g~7jt
zy5Rg@HDg26`f2Vn8%Smw_Vw&!BEbyD-xsgoIAVe$F%@w3aCqE<*hP6DcAor|!=L9Y
hk&N~e9J|~)k*|k4Qa_x9ec=EA002ovPDHLkV1kyx5uyM9

literal 0
HcmV?d00001

diff --git a/translate/translate.json b/translate/translate.json
index 8de936e2..c4e8a3ea 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -27860,7 +27860,7 @@
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p2->xdevicesBar->1->5",
         "default.handlebars->31->578",
-        "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->9->1"
+        "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->11->1"
       ]
     },
     {
@@ -28044,7 +28044,7 @@
       "zh-cht": "線上",
       "xloc": [
         "default-mobile.handlebars->container->page_content->column_l->p2->xdevicesBar->1->7",
-        "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->11->1",
+        "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->13->1",
         "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->DevFilterSelect->3"
       ]
     },
@@ -28107,7 +28107,7 @@
       "zh-chs": "仅显示在线设备",
       "zh-cht": "只顯示在線裝置",
       "xloc": [
-        "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->11"
+        "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->13"
       ]
     },
     {
@@ -35798,7 +35798,7 @@
       "zh-chs": "显示设备操作系统名称",
       "zh-cht": "顯示裝置操作系統名稱",
       "xloc": [
-        "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->9"
+        "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->devListToolbar->11"
       ]
     },
     {
diff --git a/views/default.handlebars b/views/default.handlebars
index 570c6b43..6e4484b4 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -248,7 +248,7 @@
                             &nbsp;&nbsp;<input type="button" id="SelectAllButton" onclick="selectallButtonFunction();" value="Select All" />&nbsp;
                             <input type=button id=GroupActionButton disabled="disabled" value="Group Action" onclick=groupActionFunction() />&nbsp;
                             <input id=SearchInput type=search autocomplete=off placeholder=Filter onchange=onDeviceSearchChanged(event) onkeyup=onDeviceSearchChanged(event) onfocus=onSearchFocus(1) onblur=onSearchFocus(0) />&nbsp;
-
+                            <span id=SearchInputClearButton style="display:none;position:relative"><img src="images/x16.png" type="button" onclick="clearDeviceSearch()" style="position:absolute;cursor:pointer;left:-18px;top:-8px" srcset="images/x32.png 2x"/></span>
                             <select id=DevFilterSelect onchange=onOnlineCheckBox(event) title="Device Filter">
                                 <option value=0>All</option>
                                 <option value=1>Online</option>
@@ -4819,6 +4819,7 @@
 
         function onSearchInputChanged() {
             var x = Q('SearchInput').value.toLowerCase().trim(); putstore('_search', Q('SearchInput').value);
+            QV('SearchInputClearButton', x != '');
             var userSearch = null, ipSearch = null, groupSearch = null, tagSearch = null, agentTagSearch = null, wscSearch = null;
             if (x.startsWith("user:".toLowerCase())) { userSearch = x.substring("user:".length); }
             else if (x.startsWith("u:".toLowerCase())) { userSearch = x.substring("u:".length); }