From 47ee15f5cee81ac1c68c07592349caecd2bf137a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Fri, 6 Oct 2017 21:50:59 +0200 Subject: [PATCH] preferences: make supported/not supported labels Also, Time range support display was missing from RTL locales. Now it is fixed. Closes #558 --- .../static/themes/oscar/css/logicodev.min.css | Bin 9783 -> 9709 bytes searx/static/themes/oscar/css/pointhi.min.css | Bin 7013 -> 6907 bytes searx/static/themes/oscar/js/searx.min.js | Bin 4585 -> 4585 bytes .../themes/oscar/less/logicodev/oscar.less | 2 ++ .../oscar/less/logicodev/preferences.less | 3 ++ .../themes/oscar/less/pointhi/oscar.less | 2 ++ .../oscar/less/pointhi/preferences.less | 3 ++ searx/templates/oscar/macros.html | 12 +++++++ searx/templates/oscar/preferences.html | 31 ++++++++++-------- 9 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 searx/static/themes/oscar/less/logicodev/preferences.less create mode 100644 searx/static/themes/oscar/less/pointhi/preferences.less diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index 78dfc4483eec894be8c730b87b23b456319d0e67..2f679b9710650e24a2767bd0a09add29ab05b717 100644 GIT binary patch delta 1668 zcmbVNOK2NM7-lV5I4>#KvSrzNtRx$1rBYV1ym~kmCbX%OC^)oWT1p_ZJ2SH4l~!J_ z?YgQ7y)^hzYX4B$Lg}TUr$CDiIV2?H5(p*-Ut*FR(m)Qr_z-eUA-gN@nw5Mi%QCa` z{g3be{+ZdkrTxo4g&DlbUU6hOZgcSqXN*$1`6TbaSq$Aw1HNa9e!MQoc&$O@nwp@f zT9MWYpUZ-*%J71j9?(4u0~R$zS(24PjLV75OxH#iJaPt`ubdtR-gciiLh`O@WAPW) z4Tizs=$Yusi7?eO=b}8#Qv|>E{Gd~5#*W1qwzamNRLIh@q$Vm=R3=LeD#=JKNQA1* z+VOjgla5c2X5ysC^rMXaObSR`C@b=E4Hr0;gFC0LgWHXu?&jey_pF)ey?f($q*ATR zii&C~>_olrr)S0xp!wFb%{Vd~2j|=&XAENu&jvq*c<*C}K7ZFc2HRb|!1V?7F()B` zNM`Nn{CFyZCk?SyNu@lm7PNXM1zEvFNocC6a#d3(r3?I9-_P9!XQ+Bd;481k`nqKB zfcxGXb{ez&w_vxw1S10_Sk&GJ+IzxRf-ilg=51e32kBjd@ZbJaw}Nm*hCTnpXU6PW zL7XSz0>NkgH~aF?9$XzBgKvlDU}ty+0)e`VQj||q*b0p4U4(~$0Vhu75j+pfI0Z3_ zU^KYOAox9a&Y=(t{{{!VHMFwUE*H2%e$DKoQ1Iq@a$XZr(uHJ`<@$llM>*LowSA)R z*TWXr;pKxs^<||lk@ozDwx{*1s@YsFgW+{3Zq()px5lY(Jgn7v=%RTnm^@GqHda)e;YHX954NP*4-ZX=9~r!u zzR;e~7Hieaqa6@L>?Eod38RQe)ZdbD#0Aydu$nD5#V zkyfmNTB_TEt(47RM}bx;2mL}LzLvt@jl6N_cj?0DS!29Cx^*F`B0(ZWRsT5@Ri&un dk2{v;8!JRnDGv~iqHrL9t&EOFhmLUZF-6YbQANkc+H;3UqU*71vM zckNV_4TOMANUZxL&Rn?dmIJDgcAXFhwgU)|7(#GBh~7DH;Q6ICbrV8oOP}8J_y70% zp5Ni>7i;&UNZMzv`U+Sp?KiIbx2rWvg~Q(9{xh~mT9BXz?IH%=L9c|Ry#g-X+AU+< zN|cp)O}mwyehn9}g{R?Lba|Y*QX59uEn*ED**M1uLN3>wJ9GC8E6XwytJNFWuoT@| zDqy3e8VN%w)waxRhHLCF&8NO01V8!nH1oy4<t*%s5bGNKv#mZ`G*+B`bY5^5}5CnO|oB5N;x>Zc9C^2ijtG&1DwUOi&{-pI!3ON7wqhiCvk z8(kyvPb!5A_WFG)pHLYIk}u6_u%e`?~=Ewt|Ok7wevreX+Yh%L`u~KtFa-2x)y-GKqAP8_c5gPli zm@qyWS#K-1vgHI9PE(5ISaV!DO-AkZvek=Kfv;=H)uH|+u z8hl+!^SOnTr>nYSZiC449-Zmv1U`4^grDyIM9A(MwJi zQB0*|*;9e;60%62?)2%Z9SZI+L2|}U42xcN((p-9&Ywu5IZBZe;VF}7L55;Skk7}0 z>yn(~c&{7YcHL;{-K%qr$#EC+a6dNYql5b}7J8!tE_Ju{PReeGngypU!W%@{2+F}S zySmoKp-J(wFM^d7o=>H^*Kbyjhy8{PZxAOz_#dYo$BE8I#>1{@xJnwzt4umdyNj#w z@j#0KsKSm>z@?WGW$M8!$*rMj|_-|*A-zmRNz3kbKUVQKmXUmgH diff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css index 0f1e518451d157cf6684b6e0a03b64bbbb7d5cde..53c472de5af457b78d0605645bea803324248b3d 100644 GIT binary patch delta 1462 zcma)6OK%cU6wUypZPWrC9>WL~LtOYM3|I!ihDe)`vhc^WE?J&N=tYAGVwN_}&Hw zws7ar<|5$8o+s8J>bPSZJ#)My>}iI9pmW=ZZD*?U!AaWS>l}hB^K55({x@M?(Ge$e zOE9~z0SD(!UwvMLPv^sWh)9SNr5#?86g3-V80L0Sk+tQPSSgjYY>)V4js*I`H zyWk;aR3uasxa3O3jju;pzAW-pQMf)8-CNf&?6|MOJ9iv@xRrHP6n0}}T~X?(Mq<^z zpOPwyvegiVR7~dpo(%`brx6@`S_Fazi>t^=TPpX_GHSLb(v~VFFT)_cDVSzyAi7Tm zz2mqbL57TBY>|F{{fSzaM5`R^k<{LbrEGrcx~szUQ28wAW^cY&Y1R5L7Eh_esgZIX zdjkXqFT6`B>{g?HDaxT_BALK)GBT5C0e*Vv8Drf0zM!WtLLc){1&deNY(W$yi#YLM zdYMdSgzB~LTG(2*Tr{mPOc8$h0(Qh8==wsdBUW%FZDLa%`a^jhyP&j8p?q>O^#BN8 z{9!oq)6n(PH!-r>;32Xsi)9*|DZ?SS8@OoGLp89uH)aYA(S)wCNo%ukQgeOA4YM)m z`5JrcEE>|-?#9#Mrok2!uyHKZD5~f3ITg8&w~RacO*YMii6%0MbQ-_cESZJbe?uzw$i4-}8H(=S_aczA>*h zEjFI#gRp4{5W%f?mPrEMTQfG4P9vafXS$6w+e5-8s&Wp7?N?eG$sWU~Cw7;GK=5){ zz_Vk7A8vT4cZPRfFqmv6VgqKxU53aX;d*YhQ*s3)6}-dMfxXY6hNm|HvJK4K`O z3AvIQf?pG{Q|NCUwHG zEDNulKI$M&`0k`v8DkC&4}Lq?Uqt_c0cC&%{% zR=RqK5PWg_>>L-3@;vOi{q95}(F2DW&)kWgUMdAc1`dj&g5vR7ImE#|51k%BMyCP? zTyyyBp@}r?dZ=(yUXLtOQR;>mQ50dB48SEkDtO!{19VSyMZ-JA!8Uo+f|pO^xyCZ* zrNb$PiAMW}s}{Q$Dqfnz7?$n9z=oGx{?~1(c5X|mi8SR>jdYR!@CI=eCMdGg=2?nf zN}B*{k^zV$BJub>W9Nfz8DX9BTN{6iiq8cvsO?c*6O`%=LCY&Teit^KpZeBXe{S0U F_%De%2JQd= diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index 9bc4aae87a6a5575fee225fd59f95f7cbb83f165..d714149f66aca5d23ca1258c870cd64c767a3565 100644 GIT binary patch delta 21 ccmaE<{8D*>B$t7iuAzahk%6K4M&)CI08CN_VgLXD delta 21 ccmaE<{8D*>B$tt?u7SC(k%6JvM&)CI08Ez#XaE2J diff --git a/searx/static/themes/oscar/less/logicodev/oscar.less b/searx/static/themes/oscar/less/logicodev/oscar.less index 55181cb9c..da80d1e94 100644 --- a/searx/static/themes/oscar/less/logicodev/oscar.less +++ b/searx/static/themes/oscar/less/logicodev/oscar.less @@ -19,3 +19,5 @@ @import "cursor.less"; @import "code.less"; + +@import "preferences.less"; diff --git a/searx/static/themes/oscar/less/logicodev/preferences.less b/searx/static/themes/oscar/less/logicodev/preferences.less new file mode 100644 index 000000000..9672d5011 --- /dev/null +++ b/searx/static/themes/oscar/less/logicodev/preferences.less @@ -0,0 +1,3 @@ +.table > tbody > tr > td, .table > tbody > tr > th { + vertical-align: middle !important; +} diff --git a/searx/static/themes/oscar/less/pointhi/oscar.less b/searx/static/themes/oscar/less/pointhi/oscar.less index 4e2fee129..fc1c525ff 100644 --- a/searx/static/themes/oscar/less/pointhi/oscar.less +++ b/searx/static/themes/oscar/less/pointhi/oscar.less @@ -17,3 +17,5 @@ @import "code.less"; @import "navbar.less"; + +@import "preferences.less"; diff --git a/searx/static/themes/oscar/less/pointhi/preferences.less b/searx/static/themes/oscar/less/pointhi/preferences.less new file mode 100644 index 000000000..9672d5011 --- /dev/null +++ b/searx/static/themes/oscar/less/pointhi/preferences.less @@ -0,0 +1,3 @@ +.table > tbody > tr > td, .table > tbody > tr > th { + vertical-align: middle !important; +} diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index c35a19158..6235bcc62 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -85,3 +85,15 @@ {%- endmacro %} + +{% macro support_toggle(supports) -%} + {% if supports %} + + {{ _("supported") }} + + {% else %} + + {{ _("not supported") }} + + {% endif %} +{%- endmacro %} diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index afb389e44..64706b06b 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -1,7 +1,8 @@ -{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle %} +{% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle, support_toggle %} {% extends "oscar/base.html" %} {% block title %}{{ _('preferences') }} - {% endblock %} {% block content %} +

{{ _('Preferences') }}

@@ -148,7 +149,7 @@ {{ _("Allow") }} {{ _("Engine name") }} {{ _("Shortcut") }} - {{ _("Supports selected language") }} + {{ _("Selected language") }} {{ _("SafeSearch") }} {{ _("Time range") }} {{ _("Avg. time") }} @@ -156,8 +157,9 @@ {% else %} {{ _("Max time") }} {{ _("Avg. time") }} + {{ _("Time range") }} {{ _("SafeSearch") }} - {{ _("Supports selected language") }} + {{ _("Selected language") }} {{ _("Shortcut") }} {{ _("Engine name") }} {{ _("Allow") }} @@ -172,17 +174,18 @@ {{ search_engine.name }} {{ shortcuts[search_engine.name] }} - - - - {{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }} - {{ search_engine.timeout }} - {% else %} - {{ search_engine.timeout }} - {{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }} - - - {{ shortcuts[search_engine.name] }} + {{ support_toggle(current_language == 'all' or current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages) }} + {{ support_toggle(search_engine.safesearch==True) }} + {{ support_toggle(search_engine.time_range_support==True) }} + {{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }} + {{ search_engine.timeout }} + {% else %} + {{ search_engine.timeout }} + {{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }} + {{ support_toggle(search_engine.time_range_support==True) }} + {{ support_toggle(search_engine.safesearch==True) }} + {{ support_toggle(current_language == 'all' or current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages) }} + {{ shortcuts[search_engine.name] }} {{ search_engine.name }} {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}