From adf6fa0dd63b6c3888d1db1a29f52da37f91b1f2 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Mon, 9 Sep 2019 22:14:37 +0300 Subject: [PATCH] v3.4.4.8 --- app/templates/ajax/overivewWaf.html | 6 ++-- app/templates/ajax/overview.html | 18 +++++----- app/templates/ajax/overviewServers.html | 1 - app/templates/base.html | 8 ++--- app/templates/ovw.html | 40 +++++++++++++++------- app/templates/waf.html | 2 +- {image/pic => inc/images}/compare.png | Bin {image/pic => inc/images}/edit.png | Bin {image/pic => inc/images}/favicon.ico | Bin {image/pic => inc/images}/map.png | Bin {image/pic => inc/images}/shield-red.png | Bin {image/pic => inc/images}/shield.png | Bin {image/pic => inc/images}/show.png | Bin {image/pic => inc/images}/start.png | Bin {image/pic => inc/images}/stop.png | Bin inc/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 86 bytes inc/images/ui-icons_444444_256x240.png | Bin 0 -> 3266 bytes inc/images/ui-icons_777777_256x240.png | Bin 0 -> 3266 bytes {image/pic => inc/images}/update.png | Bin 19 files changed, 44 insertions(+), 31 deletions(-) rename {image/pic => inc/images}/compare.png (100%) rename {image/pic => inc/images}/edit.png (100%) rename {image/pic => inc/images}/favicon.ico (100%) rename {image/pic => inc/images}/map.png (100%) rename {image/pic => inc/images}/shield-red.png (100%) rename {image/pic => inc/images}/shield.png (100%) rename {image/pic => inc/images}/show.png (100%) rename {image/pic => inc/images}/start.png (100%) rename {image/pic => inc/images}/stop.png (100%) create mode 100644 inc/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 inc/images/ui-icons_444444_256x240.png create mode 100644 inc/images/ui-icons_777777_256x240.png rename {image/pic => inc/images}/update.png (100%) diff --git a/app/templates/ajax/overivewWaf.html b/app/templates/ajax/overivewWaf.html index 522be652..81744a1b 100644 --- a/app/templates/ajax/overivewWaf.html +++ b/app/templates/ajax/overivewWaf.html @@ -16,13 +16,13 @@ {% if role <= 1 %} - start + start - start + start - restart + restart {% endif %} diff --git a/app/templates/ajax/overview.html b/app/templates/ajax/overview.html index 9d03f642..521bf7e1 100644 --- a/app/templates/ajax/overview.html +++ b/app/templates/ajax/overview.html @@ -7,9 +7,9 @@ {% if service.5.0.0|int() >= 1 %} = 1 %} - src="/image/pic/shield.png" title="Auto start enabled" + src="/inc/images/shield.png" title="Auto start enabled" {% else %} - src="/image/pic/shield-red.png" title="Auto start enabled, but keep alive service does not work" + src="/inc/images/shield-red.png" title="Auto start enabled, but keep alive service does not work" {% endif %} width=18 style="padding-left: 5px; margin-bottom: -3px;"> {% endif %} @@ -26,23 +26,23 @@ {% if role <= 1 %} - start + start - start + start - restart + restart {% endif %} {% if role <= 2 %} - edit + edit - - show - {% endif %} + + show + {{ service.3 }} diff --git a/app/templates/ajax/overviewServers.html b/app/templates/ajax/overviewServers.html index 627d0d63..d464588b 100644 --- a/app/templates/ajax/overviewServers.html +++ b/app/templates/ajax/overviewServers.html @@ -25,7 +25,6 @@ Too old version HAProxy {% else %} {{ service.4 }} {% endif %} - diff --git a/app/templates/base.html b/app/templates/base.html index f7ae7e97..fb9ed0c4 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -5,7 +5,7 @@ - + @@ -115,7 +115,7 @@
- HAproxy-WI v3.4.4.7 + HAproxy-WI v3.4.4.8
Patreon
@@ -135,8 +135,8 @@ - restart Auto-refresh - + restart Auto-refresh + {% endif %} diff --git a/app/templates/ovw.html b/app/templates/ovw.html index 1627b7ba..12db6fac 100644 --- a/app/templates/ovw.html +++ b/app/templates/ovw.html @@ -23,7 +23,12 @@ {% set counter = counter + loop.index0 %} {% if counter <= 2 %} - {{ USER.1 }} + + + {{ USER.1 }} + Edit + + {{ USER.2 }} {% for group in groups %} {% if USER.5 == group.0|string() %} @@ -35,7 +40,12 @@ {% else %} - {{ USER.1 }} + + + {{ USER.1 }} + Edit + + {{ USER.2 }} {% for group in groups %} {% if group.0|string() == USER.5 %} @@ -58,31 +68,35 @@ {% if metrics_master|int() >= 1 %} - UP Metrics master + UP {% else %} - DOWN running {{metrics_master }} master processes + DOWN {% endif %} + Metrics master {% if metrics_worker|int() >= 1 %} - UP Metrics workers + UP {% else %} - DOWN Metrics workers + DOWN {% endif %} + Metrics workers {% if checker_master|int() >= 1 %} - UP Checker master + UP {% else %} - DOWN Checker master + DOWN {% endif %} + Checker master {% if checker_worker|int() >= 1 %} - UP Checker workers + UP {% else %} - DOWN Checker workers + DOWN {% endif %} + Checker workers @@ -102,7 +116,7 @@ Last edit - restart + restart @@ -122,7 +136,7 @@ WAF mode - restart + restart @@ -142,7 +156,7 @@ Front/Back-ends - restart + restart diff --git a/app/templates/waf.html b/app/templates/waf.html index b875ec2d..d1d1f86c 100644 --- a/app/templates/waf.html +++ b/app/templates/waf.html @@ -18,7 +18,7 @@ Metrics - restart + Refresh diff --git a/image/pic/compare.png b/inc/images/compare.png similarity index 100% rename from image/pic/compare.png rename to inc/images/compare.png diff --git a/image/pic/edit.png b/inc/images/edit.png similarity index 100% rename from image/pic/edit.png rename to inc/images/edit.png diff --git a/image/pic/favicon.ico b/inc/images/favicon.ico similarity index 100% rename from image/pic/favicon.ico rename to inc/images/favicon.ico diff --git a/image/pic/map.png b/inc/images/map.png similarity index 100% rename from image/pic/map.png rename to inc/images/map.png diff --git a/image/pic/shield-red.png b/inc/images/shield-red.png similarity index 100% rename from image/pic/shield-red.png rename to inc/images/shield-red.png diff --git a/image/pic/shield.png b/inc/images/shield.png similarity index 100% rename from image/pic/shield.png rename to inc/images/shield.png diff --git a/image/pic/show.png b/inc/images/show.png similarity index 100% rename from image/pic/show.png rename to inc/images/show.png diff --git a/image/pic/start.png b/inc/images/start.png similarity index 100% rename from image/pic/start.png rename to inc/images/start.png diff --git a/image/pic/stop.png b/inc/images/stop.png similarity index 100% rename from image/pic/stop.png rename to inc/images/stop.png diff --git a/inc/images/ui-bg_flat_0_aaaaaa_40x100.png b/inc/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100644 index 0000000000000000000000000000000000000000..a2e6bfc085f51b392569e58b72d454586b900f61 GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F$P6UUt$JVyq?iMILR?p^S|wQb`zMgg=jq}Y hQo)$KfKh^VF#`ir1OsEt!yO=<44$rjF6*2UngAlC6uAHZ literal 0 HcmV?d00001 diff --git a/inc/images/ui-icons_444444_256x240.png b/inc/images/ui-icons_444444_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..df4e37378517044e8d109e5682b0d411d2eff92e GIT binary patch literal 3266 zcmV;z3_bISP)Td3yaCzz@6RA`5pBdNvjp@q zWYIGRrDB;gKH6IlxP~*k3pnqVrmYYGgCgJ{ioi9re#cQEirXGzHg}*-;3D#(AZziC zu;TCz9Bk2}4gfORmH-5B2K*3m27dM_V2gMP-v33kv9YnS{wBnK6(sO?y}A`r)}_#2 z=Yc`X(6p|^6WjvwDnor_w`;f|z;4YmQND(jcR>UMg=`++T0V>ylq$m_lF6o72hP`d z;4)!Ftpm?+#?m}c<@^l1<5Tb)8yg!NF?-j?*Zz7~fIG+wDd+h-F4G)j0d6q=h;mR2 zE||sZjtr*~8NDSTPY}f8?q5Vy^!Svwf&@{1#NjBeXSfLnpOAvWxK})_q2Tyl9|cJi zLf|JwZ!yy#i(Z!0R?05OCQ&t)p>!k@EJ05MTw|JAI&NapYCZ zI;8FbP6nBmrr8QAfNvTC!tF|pEJIOPhq#UrER>J3mf)tQSjl}4$4)^69P)xC06{K* z1yX>9hi|IT_W*(a7&bOGVsRb_9}I*c|16WzC>aQ!poI?xfgzeNNQa{e$M6t^)A$sb z+#NacskoPANr9dyyUJ>X1JAht`*(O=>P3BEkwgJkrm~8LtO#g9slhW7>OZ&PP!!P# zss_L7=ZCOTas8&PJWK!vN!VRLaX+2&zrS~Nn+ICLs}Ma8n@12zVffO6tGsL;@NwOS zQ~RKdd{Fv1XuoyK5WWXR+ z+E9bE0r^o$$!`}Rr{D|{pkzD1Vn`=ox3Ums=`3o1X~+l_O+(cHldga>7zF@Q%lZMJ zttNgi;OypsVHL-GjhdBAgS0Yb$}|TwX_VUS+cbe9d_XDP2S}@ebdMoW5+fE$dsT1H zzi@zk#YL=>)4f<^wJ1~F#*@hX5}`~^Om)_C?dLIj_PAn1sBXay0N2C2E3MzBZr33l zkcGN~LqB<=TvTdLHa9mL-pH01=(_{8+bv1J88BQZ7>;QZU}a#X-EP}<>z%Kyxc6Q8 z!jKk>+nt9DEP8{*&A|Oq`@|Y?2NbVnb2Cs0n24xs4cHp6WXK_lK+zfa=AXpCg@Vxu z3MCR&1`co}1^_Ye|ByY4zGG7;Eb9cWvboDKDJ+p?5kO!Hw_7s#OcM7ijU;B!s z3B&L?1{P6%FJ<6b;0;{!9h<`g=mZK;x!?>m=g6{zl6!p}IOLd(y=qRKdu70Q1MCgt zjoUnk(A5S!Y5nlG|P1%qA zJg`PemC?h{)KLe?$=>(dPS8f z(`&z=w1OgO88%F5g-vyxj{w|}VU3=jQT9iX?)&3B8Pi{W;E*eYjTo0&_;chYo_>8d zz1}(Jeh*<_jbJe7bLx8E*&9g$S%a602)ef4dS2EUwpU5i$5Ur0ELlq?StW-j*XtW{ zpl0MchJo&wpFP{Mq^emElIM+YIOZ|1G=6`eZ<$Au+{Jp}SOP+AAh{g#+n@a8jtihX zMP!1~&SxDF@O9 z`aoSj@o>HRc|d;+_e|D_hM9Kh^n^xf(4()sGG&TtZkPcN zNXsytN(&f10O)xNc4*g4A+O7w#nHXPs%`FVkkfZc;SViClq@bH)*a7s@_j(s4re)CQ;znLK>} zK`1q_dw96!it$KZFAf<95EL!nLU}z<#}5mI@R6KT+CJGpDuGq^RT9$SM<0IpTgyFQ z$A6;|11zWKFqRlWMb|*-X2BO>`A5~$*1#5#32TkyD!Ff2dHlE{1t--PdIO#6UdJ1N zu7UEcTP040;i*Q!>LnK~x+MDDzZ`1jZ`e^qNlg2k3`3v9fvSP>y?bInbb?kz_$7M62yRup1xNKzfI%kfhp+gzm$YNrd&?d63H-p0cFZ`@s7iff#1-% zXt&}ouE3*n2|$Kr1U9l_f8{zk9ivO4%k%=e0$is_G+zvMY!23d%feuIo$sit?j+=* zq+Q8)+IhpGX*Kz?U1H~L1Z&S+x-oV`TFG@6ljP01UfkdY0 z&Oao86B3xb2#-(<>_@zB4XjB5LkUUygc_Lm>INrk1iq`GKi%*FoIDDMX%Za+E<3+^ zrE7pmH%}JROX)M00i;#X4f6} zr}U{?mhV#DvQD1lq=JgSh>n^k4N{WQmOY6_mc-aU3twJZDE zmPE#N@=p844UQSyXtx~$&sNKFYO-tgkDK-s^w)z&%0M9&$6QXhoN(E4iU|-MH>4Wo z+0uxCPN%ci9M7rgQl0Xvu3wJ+;0?^Q2p910 z7x3@ngh;oak&rzB6EiKfOb;td&i4#PY?rnoDBUJlsvkCv`GF8ThcSO?W}t{(-XEBd z+8#rww|fJlj$@E!NZ}*~)Q|3HG_|4O1WGgqOmqr{33v`01cnkx5zTO<0eMcKip>_` znl36NG^(wNk`p4;j*%itj>DRGn8|*p=ddQ8Xk@?BGp)&|TG?+BX3CW5e@_O$DL7r} zzbn+7v4NFz$E}tSCT)QEj108UN-;6SgcM=UKY{bFfpZ@Pue>s4%Ct;pA!bU+gw5Ih z4`xeCCmC2yxO6@V$OjjmT>@q~){-)SSYmB?ISF8xp^nbyEbGE4R!O zd3kqtcW`iUczAe!e}8v(cXoDmc6N4mcXxMpcXxMpcXxMoc6N7ncXoDm^wSBc0000G zbW%=J02%)eGYCz;ke@6eazJ9us8KIa000azNklTd3yaCzz@6RA`5pBdNvjp@q zWYIGRrDB;gKH6IlxP~*k3pnqVrmYYGgCgJ{ioi9re#cQEirXGzHg}*-;3D#(AZziC zu;TCz9Bk2}4gfORmH-5B2K*3m27dM_V2gMP-v33kv9YnS{wBnK6(sO?y}A`r)}_#2 z=Yc`X(6p|^6WjvwDnor_w`;f|z;4YmQND(jcR>UMg=`++T0V>ylq$m_lF6o72hP`d z;4)!Ftpm?+#?m}c<@^l1<5Tb)8yg!NF?-j?*Zz7~fIG+wDd+h-F4G)j0d6q=h;mR2 zE||sZjtr*~8NDSTPY}f8?q5Vy^!Svwf&@{1#NjBeXSfLnpOAvWxK})_q2Tyl9|cJi zLf|JwZ!yy#i(Z!0R?05OCQ&t)p>!k@EJ05MTw|JAI&NapYCZ zI;8FbP6nBmrr8QAfNvTC!tF|pEJIOPhq#UrER>J3mf)tQSjl}4$4)^69P)xC06{K* z1yX>9hi|IT_W*(a7&bOGVsRb_9}I*c|16WzC>aQ!poI?xfgzeNNQa{e$M6t^)A$sb z+#NacskoPANr9dyyUJ>X1JAht`*(O=>P3BEkwgJkrm~8LtO#g9slhW7>OZ&PP!!P# zss_L7=ZCOTas8&PJWK!vN!VRLaX+2&zrS~Nn+ICLs}Ma8n@12zVffO6tGsL;@NwOS zQ~RKdd{Fv1Xuo)61G6PIB96HUhY(@|AdDg5gji#PYcK{uMp%15BJ@qj9c;ADAuMeTfN-hzzE_v8 z`nq>^dS`m>Z2iyp&8w}d_wRpw?^V|;<1(GOg6WK7Fo8!sljZmXuQ(@B((M;>T}~Mg zHpa|-*G@A5W@2`J0+%_A^c3XS5$b_FF$g*Zu}QDDbFOF{y#c1ck(iBstX@1N0|v3u zh8m;{$d67+e!Bp<1ZR-I7ux|ALplMwm4z@1XHf%8Lq@1*8mb1ER0W*HC`e8WzdZo7 z)x_@woZUPytm62uQB#p=P^L_ov}S-NjZ(XPn;QZU}a#b-EP}<>#c7sx#O;U zZb%Ep?ao66=Doq1ArL#CS=c|@7NRyi#ma;Z0>MO3QJ^JL=o<(x=<*vy#(dRU4kp$XkW23 zVHiHcz&y(DrVLyQyn$=JV{@<%oj@Tf7o36S3|W>?a{s;x9B|CWZZ)T_y)t0D0rm#+ z#%&%%=xPI=w0dx`?+)zjF6jhbyL#uQy98J7G_`?hr_*7g3%h@QP+brMO=lpAA~DeN z29~@5BMH<|qhSO7gu6bvwoc$?q3{|jmQjXW%Z?odbBJ|cB_IYyT>|*y&`k`WDf_XX z2UbX_GI|)AI_e;~*n7So@QC8e19h_M13hJ6UII8?w+4ejlb#{7N+TtH#%sSzFR3zR zdgWJ?R!}4@!-grXu&M6z5r7RD*68^eWp5PeoDPDC z>zy<1_Yelw2nK^br|$Qi-H{}aHF&v*plkcB=VhH?YneoSJaLA?lC@-#RdRUp+S;0& zs2RDAVW2zar%yL6scPngHO zXoP{~SkfV?Y2JRvu`m1O05tx8+$)x@3NEen{~cpC1WMb=02?+wffaY6&;~Fff$h!T zTF%)79LZA>$oo%v2trLAm)vXS_x(M>ltQLa2Ht$~q~`)CB~!Z?2-XA3N-WDod(9mm z2z|Sc!C+4r2z(L-@BwkE>do8psA&VCckBZo0LB||Tz&7oU$DI2z}}ac_n%KLfzXwI zu)JlNuLqlH1LVcIh9M;xd}65S3^a_o6vllC7(vssQ1|)3`JlsIzGe-q^<7g=qz&|e zx_;x~diC>w{u=I?tP>40?@pqIA?0NJ|C8ul@(F3p(V6Knjnbe;UwdWB6xG}?1MUyM zUp$fKFnj{gvlML8j+;VWl_!hCy9ZU<++8E5AC$r$TZS@iTtuu5&vNp8LO-zVz8_V! z^Kl09)w#MQDznLCzHhmdJjO@&`!#htFZyTPWPy7dzO_)k1A4dQhlK}(5dcryaDJM zDBrqO;$#?}XcR18a?zqoqCfn{p=SPpZB>-Sw8zOX^hxZi8YthrD+WZz7*Gl}X{$kG zO5_Fj(r5&1o1ZN}47lj&N2T!lG=3g91%3P1lF&z#%c)u-8HUfHOqnijIQ$g&9i5AI zD*omQJUo{GWLQREBP;e-u9MRdx+J8b(%!8#bDd!U=6q|42IYF4!i0}LT*Zm z*PHY-*?$s6Y|1giGy673X&iX3hL{ZN&|rbU+y(N+DJ z`uE_tL6I0ZdLaXs5v!{WT&|Imx!!Os7l1NQ%)#+CwJhKb%v}GxL=(u^j#(Q>WQy+k zLjpK9fk}(-5XHcL#Cz7jiXj}$UF(7R*AQT9V-OLjjKu;UM zrU4Q762t(O#ei>i~-`Q)qs|+foYBcpMV|(U(*INPnq4suE9CTgRT*$U&G9@n1y5h?9=W&LmA$Qo z^zS-(t9|1J#|&WhemVM+H!#&AoWp;Qs$#%AW=ktDU-Y>7^W;* zji>B43AOZlf?>+C-FV7=C+3$GAy#>q$-?D$%6=#3u>5-hOTe*ixF7Q#7+A4HLZjO| zfIp5CBHeyUzU>K^m}#kHdRSR4AJ`x6sV z+hYjzc5h(Rc?{AFDV)TB`cWN?p*A#}K#696i7vq~0ncHBz)&J7q8W}dAnyruvDqSA z(M5%XMzvK@azdoqF;Yayaaa=%GuiLt9Ma?yjqG=FrZxFgEBj5rub?tz%47hXgr_R~ zcZHf$Hn5cLxYZKEqzy2ik%1Ok2~&ockRr_aCvg5XaQ>qpQ>IKWyB6sz#7rrfusPlT zgW1BuaRwF>E}TmO^1+2?n1ES~wV(_jmRMU{Oaho{4cv;=ln;K5gc8Bj6NtAb0W3^C z0SSOr0Mj1@Mg?$w^MC|!hBa`!%!2)oGM%>m2jQx9-@)k2fdBvi07*qoM6N<$f|1D_ AyZ`_I literal 0 HcmV?d00001 diff --git a/image/pic/update.png b/inc/images/update.png similarity index 100% rename from image/pic/update.png rename to inc/images/update.png