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 3718e603c..828ce86d9 100644 Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css and b/searx/static/themes/oscar/css/logicodev-dark.min.css differ 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 a4b373ecf..adccd8b98 100644 Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css.map and b/searx/static/themes/oscar/css/logicodev-dark.min.css.map differ diff --git a/searx/static/themes/oscar/css/logicodev.css b/searx/static/themes/oscar/css/logicodev.css index eaf662b5b..51bbc98d8 100644 --- a/searx/static/themes/oscar/css/logicodev.css +++ b/searx/static/themes/oscar/css/logicodev.css @@ -861,6 +861,21 @@ 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; +} /*Global*/ body { background: #1d1f21 none !important; @@ -1084,3 +1099,8 @@ p.btn.btn-default { .highlight { background-color: transparent !important; } +/* engine tooltip */ +.engine-tooltip { + border: 1px solid #3d3f43; + background: #1d1f21; +} diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index 1f35778dc..17fd892d5 100644 Binary files a/searx/static/themes/oscar/css/logicodev.min.css and b/searx/static/themes/oscar/css/logicodev.min.css differ diff --git a/searx/static/themes/oscar/css/logicodev.min.css.map b/searx/static/themes/oscar/css/logicodev.min.css.map index b9299d274..331d41917 100644 Binary files a/searx/static/themes/oscar/css/logicodev.min.css.map and b/searx/static/themes/oscar/css/logicodev.min.css.map differ 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 2352062c9..02bee6ad7 100644 Binary files a/searx/static/themes/oscar/css/pointhi.min.css and b/searx/static/themes/oscar/css/pointhi.min.css differ diff --git a/searx/static/themes/oscar/css/pointhi.min.css.map b/searx/static/themes/oscar/css/pointhi.min.css.map index 3d7ea6cc1..1d18b1fd7 100644 Binary files a/searx/static/themes/oscar/css/pointhi.min.css.map and b/searx/static/themes/oscar/css/pointhi.min.css.map differ diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index 58dbd73ce..b3317e0c5 100644 Binary files a/searx/static/themes/oscar/js/searx.min.js and b/searx/static/themes/oscar/js/searx.min.js differ diff --git a/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less index b7feccdff..2b26c5043 100644 --- a/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less +++ b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less @@ -239,3 +239,9 @@ p.btn.btn-default{ .highlight { background-color: transparent !important; } + +/* engine tooltip */ +.engine-tooltip { + border: 1px solid #3d3f43; + background: #1d1f21 ; +} diff --git a/searx/static/themes/oscar/src/less/logicodev/preferences.less b/searx/static/themes/oscar/src/less/logicodev/preferences.less index 82ce16310..ccd0b0249 100644 --- a/searx/static/themes/oscar/src/less/logicodev/preferences.less +++ b/searx/static/themes/oscar/src/less/logicodev/preferences.less @@ -13,3 +13,19 @@ 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; +} \ No newline at end of file diff --git a/searx/static/themes/oscar/src/less/pointhi/preferences.less b/searx/static/themes/oscar/src/less/pointhi/preferences.less index 9672d5011..f3a6bee22 100644 --- a/searx/static/themes/oscar/src/less/pointhi/preferences.less +++ b/searx/static/themes/oscar/src/less/pointhi/preferences.less @@ -1,3 +1,19 @@ .table > 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 73383a710..1cb4a4aa2 100644 Binary files a/searx/static/themes/simple/css/searx-rtl.min.css and b/searx/static/themes/simple/css/searx-rtl.min.css differ 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 2e8a04828..b2eb4f528 100644 Binary files a/searx/static/themes/simple/css/searx.min.css and b/searx/static/themes/simple/css/searx.min.css differ 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,