Merge pull request #2661 from dalf/pref-engine-tooltip
[mod] preferences: a tooltip is shown when the mouse is over the engine names
This commit is contained in:
		
						commit
						5f7056cf37
					
				| @ -888,3 +888,18 @@ p { | |||||||
| input.cursor-text { | input.cursor-text { | ||||||
|   margin: 10px 0; |   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; | ||||||
|  | } | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								searx/static/themes/oscar/css/logicodev-dark.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								searx/static/themes/oscar/css/logicodev-dark.min.css
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -861,6 +861,21 @@ p { | |||||||
| input.cursor-text { | input.cursor-text { | ||||||
|   margin: 10px 0; |   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*/ | /*Global*/ | ||||||
| body { | body { | ||||||
|   background: #1d1f21 none !important; |   background: #1d1f21 none !important; | ||||||
| @ -1084,3 +1099,8 @@ p.btn.btn-default { | |||||||
| .highlight { | .highlight { | ||||||
|   background-color: transparent !important; |   background-color: transparent !important; | ||||||
| } | } | ||||||
|  | /* engine tooltip */ | ||||||
|  | .engine-tooltip { | ||||||
|  |   border: 1px solid #3d3f43; | ||||||
|  |   background: #1d1f21; | ||||||
|  | } | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								searx/static/themes/oscar/css/logicodev.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								searx/static/themes/oscar/css/logicodev.min.css
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -676,3 +676,18 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not | |||||||
| .table > tbody > tr > th { | .table > tbody > tr > th { | ||||||
|   vertical-align: middle !important; |   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; | ||||||
|  | } | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								searx/static/themes/oscar/css/pointhi.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								searx/static/themes/oscar/css/pointhi.min.css
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								searx/static/themes/oscar/js/searx.min.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								searx/static/themes/oscar/js/searx.min.js
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -239,3 +239,9 @@ p.btn.btn-default{ | |||||||
| .highlight { | .highlight { | ||||||
|   background-color: transparent !important; |   background-color: transparent !important; | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  | /* engine tooltip */ | ||||||
|  | .engine-tooltip { | ||||||
|  |   border: 1px solid #3d3f43; | ||||||
|  |   background: #1d1f21 ; | ||||||
|  | } | ||||||
|  | |||||||
| @ -13,3 +13,19 @@ p { | |||||||
| input.cursor-text { | input.cursor-text { | ||||||
|     margin: 10px 0; |     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; | ||||||
|  | } | ||||||
| @ -1,3 +1,19 @@ | |||||||
| .table > tbody > tr > td, .table > tbody > tr > th { | .table > tbody > tr > td, .table > tbody > tr > th { | ||||||
|     vertical-align: middle !important; |     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; | ||||||
|  | } | ||||||
|  | |||||||
| @ -1425,6 +1425,21 @@ select:focus { | |||||||
| #main_preferences div.selectable_url pre { | #main_preferences div.selectable_url pre { | ||||||
|   width: 100%; |   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) { | @media screen and (max-width: 75em) { | ||||||
|   .preferences_back { |   .preferences_back { | ||||||
|     clear: both; |     clear: both; | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								searx/static/themes/simple/css/searx-rtl.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								searx/static/themes/simple/css/searx-rtl.min.css
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -1425,6 +1425,21 @@ select:focus { | |||||||
| #main_preferences div.selectable_url pre { | #main_preferences div.selectable_url pre { | ||||||
|   width: 100%; |   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) { | @media screen and (max-width: 75em) { | ||||||
|   .preferences_back { |   .preferences_back { | ||||||
|     clear: both; |     clear: both; | ||||||
|  | |||||||
							
								
								
									
										
											BIN
										
									
								
								searx/static/themes/simple/css/searx.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								searx/static/themes/simple/css/searx.min.css
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -94,6 +94,23 @@ | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
|  |   .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; | ||||||
|  |   } | ||||||
|  |    | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @media screen and (max-width: 75em) { | @media screen and (max-width: 75em) { | ||||||
|  | |||||||
| @ -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 %} | {% 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" %} | {% extends "oscar/base.html" %} | ||||||
|  | {% macro engine_about(search_engine, id) -%} | ||||||
|  | {% if search_engine.about is defined %} | ||||||
|  | {% set about = search_engine.about %} | ||||||
|  | <div class="engine-tooltip" role="tooltip" id="{{ id }}">{{- "" -}} | ||||||
|  |     <h5><a href="{{about.website}}" rel="noreferrer">{{about.website}}</a></h5> | ||||||
|  |     {%- if about.wikidata_id -%}<p><a href="https://www.wikidata.org/wiki/{{about.wikidata_id}}" rel="noreferrer">wikidata.org/wiki/{{about.wikidata_id}}</a></p>{%- endif -%} | ||||||
|  |     {%- if search_engine.enable_http %}<p>{{ icon('exclamation-sign', 'No HTTPS') }}{{ _('No HTTPS')}}</p>{% endif -%} | ||||||
|  | </div> | ||||||
|  | {%- endif -%} | ||||||
|  | {%- endmacro %} | ||||||
| {% block title %}{{ _('preferences') }} - {% endblock %} | {% block title %}{{ _('preferences') }} - {% endblock %} | ||||||
| {% block content %} | {% block content %} | ||||||
| 
 | 
 | ||||||
| @ -228,10 +238,14 @@ | |||||||
|                                 <tr> |                                 <tr> | ||||||
|                                     {% if not rtl %} |                                     {% if not rtl %} | ||||||
|                                         <td class="onoff-checkbox"> |                                         <td class="onoff-checkbox"> | ||||||
|                                         {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} |                                         {{- checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) -}} | ||||||
|                                         </td> |                                         </td> | ||||||
|                                     <th scope="row">{% if search_engine.enable_http %}{{ icon('exclamation-sign', 'No HTTPS') }}{% endif %} {{ search_engine.name }}</td></th> |                                         <th scope="row"><span aria-labelledby="{{ 'tooltip_' + categ + '_' + search_engine.name }}"> | ||||||
|                                     <td class="name">{{ shortcuts[search_engine.name] }} |                                             {%- if search_engine.enable_http %}{{ icon('exclamation-sign', 'No HTTPS') }}{% endif -%} | ||||||
|  |                                             {{- search_engine.name -}}</span> | ||||||
|  |                                             {{- engine_about(search_engine, 'tooltip_' + categ + '_' + search_engine.name) -}} | ||||||
|  |                                         </th> | ||||||
|  |                                         <td class="name">{{ shortcuts[search_engine.name] }}</td> | ||||||
|                                         <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td> |                                         <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td> | ||||||
|                                         <td>{{ support_toggle(search_engine.safesearch==True) }}</td> |                                         <td>{{ support_toggle(search_engine.safesearch==True) }}</td> | ||||||
|                                         <td>{{ support_toggle(search_engine.time_range_support==True) }}</td> |                                         <td>{{ support_toggle(search_engine.time_range_support==True) }}</td> | ||||||
| @ -244,7 +258,7 @@ | |||||||
|                                         <td>{{ support_toggle(search_engine.safesearch==True) }}</td> |                                         <td>{{ support_toggle(search_engine.safesearch==True) }}</td> | ||||||
|                                         <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td> |                                         <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td> | ||||||
|                                         <td>{{ shortcuts[search_engine.name] }}</td> |                                         <td>{{ shortcuts[search_engine.name] }}</td> | ||||||
|                                     <th scope="row">{{ search_engine.name }}</th> |                                         <th scope="row"><span>{% if search_engine.enable_http %}{{ icon('exclamation-sign', 'No HTTPS') }}{% endif %}{{ search_engine.name }}</span>{{ engine_about(search_engine) }}</th> | ||||||
|                                         <td class="onoff-checkbox"> |                                         <td class="onoff-checkbox"> | ||||||
|                                         {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} |                                         {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} | ||||||
|                                         </td> |                                         </td> | ||||||
|  | |||||||
| @ -18,6 +18,17 @@ | |||||||
| {%- endfor -%} | {%- endfor -%} | ||||||
| {%- endmacro -%} | {%- endmacro -%} | ||||||
| 
 | 
 | ||||||
|  | {% macro engine_about(search_engine) -%} | ||||||
|  | {% if search_engine.about is defined %} | ||||||
|  | {% set about = search_engine.about %} | ||||||
|  | <div class="engine-tooltip" role="tooltip">{{- "" -}} | ||||||
|  |     <p><a href="{{about.website}}" rel="noreferrer">{{about.website}}</a></p> | ||||||
|  |     {%- if about.wikidata_id -%}<p><a href="https://www.wikidata.org/wiki/{{about.wikidata_id}}" rel="noreferrer">wikidata.org/wiki/{{about.wikidata_id}}</a></p>{%- endif -%} | ||||||
|  |     {%- if search_engine.enable_http %}<p>{{ icon('exclamation-sign', 'No HTTPS') }}{{ _('No HTTPS')}}</p>{% endif -%} | ||||||
|  | </div> | ||||||
|  | {%- endif -%} | ||||||
|  | {%- endmacro %} | ||||||
|  | 
 | ||||||
| {% block head %} {% endblock %} | {% block head %} {% endblock %} | ||||||
| {% block content %} | {% block content %} | ||||||
| 
 | 
 | ||||||
| @ -121,7 +132,7 @@ | |||||||
|       {% set engine_id = 'engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_') %} |       {% set engine_id = 'engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_') %} | ||||||
|       <tr> |       <tr> | ||||||
|         <td class="engine_checkbox">{{ checkbox_onoff(engine_id, (search_engine.name, categ) in disabled_engines) }}</td> |         <td class="engine_checkbox">{{ checkbox_onoff(engine_id, (search_engine.name, categ) in disabled_engines) }}</td> | ||||||
|         <th class="name">{% if search_engine.enable_http %}{{ icon('warning', 'No HTTPS') }}{% endif %} {{ search_engine.name }}</th> |         <th class="name">{% if search_engine.enable_http %}{{ icon('warning', 'No HTTPS') }}{% endif %} {{ search_engine.name }} {{ engine_about(search_engine) }}</th> | ||||||
|         <td class="shortcut">{{ shortcuts[search_engine.name] }}</td> |         <td class="shortcut">{{ shortcuts[search_engine.name] }}</td> | ||||||
|         <td>{{ 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) }}</td> |         <td>{{ 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) }}</td> | ||||||
|         <td>{{ checkbox(engine_id + '_safesearch', search_engine.safesearch==True, true, true) }}</td> |         <td>{{ checkbox(engine_id + '_safesearch', search_engine.safesearch==True, true, true) }}</td> | ||||||
|  | |||||||
| @ -853,7 +853,6 @@ def preferences(): | |||||||
|             if e.timeout > settings['outgoing']['request_timeout']: |             if e.timeout > settings['outgoing']['request_timeout']: | ||||||
|                 stats[e.name]['warn_timeout'] = True |                 stats[e.name]['warn_timeout'] = True | ||||||
|             stats[e.name]['supports_selected_language'] = _is_selected_language_supported(e, request.preferences) |             stats[e.name]['supports_selected_language'] = _is_selected_language_supported(e, request.preferences) | ||||||
| 
 |  | ||||||
|             engines_by_category[c].append(e) |             engines_by_category[c].append(e) | ||||||
| 
 | 
 | ||||||
|     # get first element [0], the engine time, |     # get first element [0], the engine time, | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user