From d6480016888aecb05200af2ad158abee503390df Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Tue, 16 Mar 2021 16:47:05 +0100 Subject: [PATCH] [mod] preferences: a tooltip is shown when the mouse is over the engine names --- .../themes/oscar/css/logicodev-dark.css | 15 +++++++++ .../themes/oscar/css/logicodev-dark.min.css | Bin 16186 -> 16483 bytes .../oscar/css/logicodev-dark.min.css.map | Bin 7635 -> 7823 bytes searx/static/themes/oscar/css/logicodev.css | 20 ++++++++++++ .../static/themes/oscar/css/logicodev.min.css | Bin 12779 -> 13016 bytes .../themes/oscar/css/logicodev.min.css.map | Bin 6271 -> 6421 bytes searx/static/themes/oscar/css/pointhi.css | 15 +++++++++ searx/static/themes/oscar/css/pointhi.min.css | Bin 9047 -> 9284 bytes .../themes/oscar/css/pointhi.min.css.map | Bin 4610 -> 4761 bytes searx/static/themes/oscar/js/searx.min.js | Bin 5695 -> 5695 bytes .../oscar/src/less/logicodev-dark/oscar.less | 6 ++++ .../oscar/src/less/logicodev/preferences.less | 16 ++++++++++ .../oscar/src/less/pointhi/preferences.less | 16 ++++++++++ searx/static/themes/simple/css/searx-rtl.css | 15 +++++++++ .../themes/simple/css/searx-rtl.min.css | Bin 27528 -> 27825 bytes searx/static/themes/simple/css/searx.css | 15 +++++++++ searx/static/themes/simple/css/searx.min.css | Bin 27493 -> 27790 bytes .../themes/simple/less/preferences.less | 17 ++++++++++ searx/templates/oscar/preferences.html | 30 +++++++++++++----- searx/templates/simple/preferences.html | 13 +++++++- searx/webapp.py | 1 - 21 files changed, 169 insertions(+), 10 deletions(-) diff --git a/searx/static/themes/oscar/css/logicodev-dark.css b/searx/static/themes/oscar/css/logicodev-dark.css index b161b3904..a98858861 100644 --- a/searx/static/themes/oscar/css/logicodev-dark.css +++ b/searx/static/themes/oscar/css/logicodev-dark.css @@ -888,3 +888,18 @@ p { input.cursor-text { margin: 10px 0; } +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; +} +th:hover .engine-tooltip, +.engine-tooltip:hover { + display: inline-block; +} diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css b/searx/static/themes/oscar/css/logicodev-dark.min.css index 3718e603cf0f503ea58d2618600d04a32b577019..828ce86d984117e008d4b79b36704a36161472e8 100644 GIT binary patch delta 295 zcmZ8cOHRZv3>7POuwcb5(roD{DZ|EDa0NI*I!;<^T02TJPzLe2!(0T34dO1WxCkvH zAyHeh?B{3ez0c?G*Q2*v{j&626Z;~Iw3*@~QXgCQ04(fnl%6sPgR6RJw|PVyB5@7N ztK>Un#$r2{#t)#?l;wm}lF%nGaZuwKp;{oKt=xK3C)qN>B7|Ura4x!@b{@P zQ{7}(X>E4}G5P_F{*9-ZQfTDPr;FSi8Z}%086j>be^o2%&HIi1I60j$_h04t**|p# LO(@O&`1i_@% diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css.map b/searx/static/themes/oscar/css/logicodev-dark.min.css.map index a4b373ecf422d5cbe1bfbd0b3852c420d42b376d..adccd8b988cdd75d2b37517bdbb8ac1e1b3fd259 100644 GIT binary patch delta 187 zcmca?-EX_$fVi!ryO&P7lcTezPN1WsqmH+uv!hNhh!qTCfyI2`68<2TD}tC@$SL6h z))Ed^6AEWVf>@q#V*(xB3!Qa}og5uAoOLRJR{B7UPjt?3+I&cypG_Sk>FEY`j;jvX SE>DmVVEY3>=74Nbss#Ygcrr-< delta 28 jcmeCTy==YVfH;S5}qN~;MefsKnPXN;yoMA!OmKO~(6q3ZkI^(wi(Onf4+ySQBESK?vJuxlE3 ys#%a0u+3kbZ=AxYFO=@{cx}wh`X7WPtbA?IZhwB*RK?PqI(qgo7LfNZd-n^u*JC9B delta 11 ScmcbS`Z{^TKEuhYjdTGgw*|-m diff --git a/searx/static/themes/oscar/css/logicodev.min.css.map b/searx/static/themes/oscar/css/logicodev.min.css.map index b9299d27429372b0a447abef0d149ed80635c5c4..331d41917aca39e04c2cdaf2fd9790fa46b3b35a 100644 GIT binary patch delta 140 zcmexwFx6;7t%SXftE0P@PP&t$v!_m=qobpax1+P8PB4fS3}S)BeBl!QAeJkFm~6l$ rF}Z++)g~OSBoxky1hG8frUW{=7dq<{J2^ULIO|jbZS(<~u2c&Eff^-K delta 10 RcmbPg^xt4Ztpt-&EdUsv1Kj`s diff --git a/searx/static/themes/oscar/css/pointhi.css b/searx/static/themes/oscar/css/pointhi.css index 7c0f1d180..c648f2b60 100644 --- a/searx/static/themes/oscar/css/pointhi.css +++ b/searx/static/themes/oscar/css/pointhi.css @@ -676,3 +676,18 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not .table > tbody > tr > th { vertical-align: middle !important; } +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; +} +th:hover .engine-tooltip, +.engine-tooltip:hover { + display: inline-block; +} diff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css index 2352062c961140fbc41a5d0683d8a7090700315f..02bee6ad72f5648ec6f3653294c22b94904779e5 100644 GIT binary patch delta 267 zcmZ9HK~BR!3`Ot3YNXkrrX;9rJYtL3aEM9lBvz;PXflCNRP_*CghOx#uET^%ENV-Z z{ViMn{XBg?e{Jk}OER!fl~qIL_<=md;NL-1$VHtvvkLfj(lFT{(qOUnyR_>mjomL diff --git a/searx/static/themes/oscar/css/pointhi.min.css.map b/searx/static/themes/oscar/css/pointhi.min.css.map index 3d7ea6cc105c58e25cb1fbc232ff5ce89bcd21ab..1d18b1fd7a680d1340dbb290110a4639750e5ffb 100644 GIT binary patch delta 141 zcmZotnW?%!$U!I5$*;6Ob(a}-I+tJxkCm6&E2C=|mzHkYD5X%)oOn%2I p;Rx0e4p$QjXGMZoo^WFV9o-9^b&8!F9W$JDDuGt|fQ?tG1psTQC4&F} delta 9 QcmbQK+N82Th)Jmy01qbuxBvhE diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index 58dbd73ceaf72ead50434e89919303543591b579..b3317e0c51b66df6783720a4d2ccb1123257262c 100644 GIT binary patch delta 12 Tcmdn5vtMU|6r<5bX%#U59ghRL delta 12 Tcmdn5vtMU|6r tbody > tr > td, .table > tbody > tr > th { vertical-align: middle !important; } + +.engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; +} + +th:hover .engine-tooltip, .engine-tooltip:hover { + display: inline-block; +} diff --git a/searx/static/themes/simple/css/searx-rtl.css b/searx/static/themes/simple/css/searx-rtl.css index 526f63668..385fc7d5e 100644 --- a/searx/static/themes/simple/css/searx-rtl.css +++ b/searx/static/themes/simple/css/searx-rtl.css @@ -1425,6 +1425,21 @@ select:focus { #main_preferences div.selectable_url pre { width: 100%; } +#main_preferences .engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; +} +#main_preferences th:hover .engine-tooltip, +#main_preferences .engine-tooltip:hover { + display: inline-block; +} @media screen and (max-width: 75em) { .preferences_back { clear: both; diff --git a/searx/static/themes/simple/css/searx-rtl.min.css b/searx/static/themes/simple/css/searx-rtl.min.css index 73383a71026152b69e5c8cbfb37fa675214e00c8..1cb4a4aa26c702b432043aaa66e38f6dbd84ffd7 100644 GIT binary patch delta 330 zcmY+8F-yci5QT|?l_IE!jSvWeg$dbQPH@vmgsVggTR}FrlVma3T{nAY?hdh4OBV|Z z{S8V=@pp*-#@t;YHv#5+{ zy#oED63>aMwkl@krWlvOmIw+N)!X# zDuhzTGwgL0ls0NlR1(!TVBel@FjW$vC@73%ZMQK-ZHH1CC8U3yDKX#_J87CmGqP%* zjRB)j*7N_LG#a~%Q>ZcWXY+ivZQjwY3F6J;MP{6fA*chVB#d841t}=teW+}m&n??q W3`~p_Z#CcX-Lkm}cABH!`Q9Huf_F6l delta 78 zcmV-U0I~nE*#U^x0kDZNlVC^|lS)GzlZi1?3?p-8Ze(9`Wnpq-Xp@mM8k24^W0UDI kjI-V{Ljsd&I2@BLHIb9QM>DelHhB!Q&qI3yvtvh2CDBG6od5s; diff --git a/searx/static/themes/simple/css/searx.css b/searx/static/themes/simple/css/searx.css index 938731ff7..206c5f903 100644 --- a/searx/static/themes/simple/css/searx.css +++ b/searx/static/themes/simple/css/searx.css @@ -1425,6 +1425,21 @@ select:focus { #main_preferences div.selectable_url pre { width: 100%; } +#main_preferences .engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; +} +#main_preferences th:hover .engine-tooltip, +#main_preferences .engine-tooltip:hover { + display: inline-block; +} @media screen and (max-width: 75em) { .preferences_back { clear: both; diff --git a/searx/static/themes/simple/css/searx.min.css b/searx/static/themes/simple/css/searx.min.css index 2e8a0482826dc962cef91bfe979b54703b7dbfd3..b2eb4f528776e3fc29ad9ce646df60acd141c7f0 100644 GIT binary patch delta 330 zcmaEQjj``0_J~b~rGcQ%QBtJi=B(tD8C9}97C$Z8hFF!BUx*)$e zvm`S=&nhvgI6tSf1Spc2l9HL1Zlz~hl$xtx2qdg?6N`W*SQ#jQpb(ZJH05sG%v+UIV~;C8tk%Sjm)Z4D?^il3J4$JQtK++%)FG; z3M)ecFqq^gHhG?*>|`S+VFy$>zr55QZ=O$+6#TOK%rll68<|U^VE0knFq!jc} ZHB?V#bQ0OT*Qu6ya-osLW=l66RRD@0cS`^O delta 78 zcmV-U0I~m$*#YI&0kDZNlVC^|lS)GzlZi1?3?p-8Ze(9`Wnpq-Xp@mM8k24^W0UDI kjI-V{Ljsd&I2@BLHIb9QM>DelHhB!Q&qI3yvtvgqCE-gRvj6}9 diff --git a/searx/static/themes/simple/less/preferences.less b/searx/static/themes/simple/less/preferences.less index e1e88b51f..26c4f6ddd 100644 --- a/searx/static/themes/simple/less/preferences.less +++ b/searx/static/themes/simple/less/preferences.less @@ -93,6 +93,23 @@ width: 100%; } } + + + .engine-tooltip { + display: none; + position: absolute; + padding: 0.5rem 1rem; + margin: 0rem 0 0 2rem; + border: 1px solid #ddd; + background: white; + font-size: 14px; + font-weight: normal; + z-index: 1000000; + } + + th:hover .engine-tooltip, .engine-tooltip:hover { + display: inline-block; + } } diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index 6253b9858..6d593840a 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -1,5 +1,15 @@ {% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle, support_toggle, custom_select_class %} {% extends "oscar/base.html" %} +{% macro engine_about(search_engine, id) -%} +{% if search_engine.about is defined %} +{% set about = search_engine.about %} + +{%- endif -%} +{%- endmacro %} {% block title %}{{ _('preferences') }} - {% endblock %} {% block content %} @@ -227,11 +237,15 @@ {% if not search_engine.private %} {% if not rtl %} - - {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} - - {% if search_engine.enable_http %}{{ icon('exclamation-sign', 'No HTTPS') }}{% endif %} {{ search_engine.name }} - {{ shortcuts[search_engine.name] }} + + {{- checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) -}} + + + {%- if search_engine.enable_http %}{{ icon('exclamation-sign', 'No HTTPS') }}{% endif -%} + {{- search_engine.name -}} + {{- engine_about(search_engine, 'tooltip_' + categ + '_' + search_engine.name) -}} + + {{ shortcuts[search_engine.name] }} {{ support_toggle(stats[search_engine.name].supports_selected_language) }} {{ support_toggle(search_engine.safesearch==True) }} {{ support_toggle(search_engine.time_range_support==True) }} @@ -244,10 +258,10 @@ {{ support_toggle(search_engine.safesearch==True) }} {{ support_toggle(stats[search_engine.name].supports_selected_language) }} {{ shortcuts[search_engine.name] }} - {{ search_engine.name }} - + {% if search_engine.enable_http %}{{ icon('exclamation-sign', 'No HTTPS') }}{% endif %}{{ search_engine.name }}{{ engine_about(search_engine) }} + {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} - + {% endif %} {% endif %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index dff7ffba6..2d2529417 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -18,6 +18,17 @@ {%- endfor -%} {%- endmacro -%} +{% macro engine_about(search_engine) -%} +{% if search_engine.about is defined %} +{% set about = search_engine.about %} + +{%- endif -%} +{%- endmacro %} + {% block head %} {% endblock %} {% block content %} @@ -121,7 +132,7 @@ {% set engine_id = 'engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_') %} {{ checkbox_onoff(engine_id, (search_engine.name, categ) in disabled_engines) }} - {% if search_engine.enable_http %}{{ icon('warning', 'No HTTPS') }}{% endif %} {{ search_engine.name }} + {% if search_engine.enable_http %}{{ icon('warning', 'No HTTPS') }}{% endif %} {{ search_engine.name }} {{ engine_about(search_engine) }} {{ shortcuts[search_engine.name] }} {{ checkbox(engine_id + '_supported_languages', current_language == 'all' or current_language in search_engine.supported_languages or current_language.split('-')[0] in search_engine.supported_languages, true, true) }} {{ checkbox(engine_id + '_safesearch', search_engine.safesearch==True, true, true) }} diff --git a/searx/webapp.py b/searx/webapp.py index 6f0297a99..b4466c718 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -853,7 +853,6 @@ def preferences(): if e.timeout > settings['outgoing']['request_timeout']: stats[e.name]['warn_timeout'] = True stats[e.name]['supports_selected_language'] = _is_selected_language_supported(e, request.preferences) - engines_by_category[c].append(e) # get first element [0], the engine time,