diff options
Diffstat (limited to 'searx/templates')
-rw-r--r-- | searx/templates/oscar/advanced.html | 2 | ||||
-rw-r--r-- | searx/templates/oscar/base.html | 2 | ||||
-rw-r--r-- | searx/templates/oscar/index.html | 4 | ||||
-rw-r--r-- | searx/templates/oscar/languages.html | 1 | ||||
-rw-r--r-- | searx/templates/oscar/macros.html | 6 | ||||
-rw-r--r-- | searx/templates/oscar/preferences.html | 94 | ||||
-rw-r--r-- | searx/templates/oscar/result_templates/default.html | 2 | ||||
-rw-r--r-- | searx/templates/oscar/result_templates/videos.html | 2 | ||||
-rw-r--r-- | searx/templates/oscar/time-range.html | 1 |
9 files changed, 58 insertions, 56 deletions
diff --git a/searx/templates/oscar/advanced.html b/searx/templates/oscar/advanced.html index bf5f86324..0b13d50d6 100644 --- a/searx/templates/oscar/advanced.html +++ b/searx/templates/oscar/advanced.html @@ -1,4 +1,4 @@ -<input type="checkbox" name="advanced_search" id="check-advanced" {% if advanced_search %} checked="checked"{% endif %}> +<input type="checkbox" name="advanced_search" class="visually-hidden" id="check-advanced" {% if advanced_search %} checked="checked"{% endif %}> <label for="check-advanced">{{- "" -}} <span class="glyphicon glyphicon-cog"></span> {{- _('Advanced settings') -}} diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 839619976..2ccadd700 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -1,6 +1,6 @@ {% from 'oscar/macros.html' import icon %} <!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}> +<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ preferences.get_value('locale') }}" xml:lang="{{ preferences.get_value('locale') }}"{% if rtl %} dir="rtl"{% endif %}> <head> <meta charset="UTF-8" /> <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine" /> diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html index b941f5f20..48c49d64a 100644 --- a/searx/templates/oscar/index.html +++ b/searx/templates/oscar/index.html @@ -6,10 +6,10 @@ {% if cookies['oscar-style'] == 'pointhi' %} <h1 class="text-hide center-block"><img class="center-block img-responsive" src="{{ url_for('static', filename='img/searx_logo.png') }}" alt="searx logo"/>searx</h1> {% else %} - <h1 class="text-hide center-block" id="main-logo"> + <div class="text-hide center-block" id="main-logo"> <img class="center-block img-responsive" src="{{ url_for('static', filename='img/logo_searx_a.png') }}" alt="searx logo" /> searx - </h1> + </div> {% endif %} </div> </div> diff --git a/searx/templates/oscar/languages.html b/searx/templates/oscar/languages.html index 5aff9f918..9c00c9cea 100644 --- a/searx/templates/oscar/languages.html +++ b/searx/templates/oscar/languages.html @@ -1,3 +1,4 @@ +<label class="visually-hidden" for="language">{{ _('Language') }}</label> <select class="language custom-select form-control" id="language" name="language" accesskey="l"> <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option> {%- for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) -%} diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index c4b2a7ddb..809c9f595 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -60,15 +60,15 @@ {%- endif %} {%- endmacro %} -{% macro preferences_item_header(info, label, rtl) -%} +{% macro preferences_item_header(info, label, rtl, id) -%} {% if rtl %} <div class="row form-group"> - <label class="col-sm-3 col-md-2 pull-right">{{ label }}</label> + <label class="col-sm-3 col-md-2 pull-right"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label> <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span> <div class="col-sm-4 col-md-4"> {% else %} <div class="row form-group"> - <label class="col-sm-3 col-md-2">{{ label }}</label> + <label class="col-sm-3 col-md-2"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label> <div class="col-sm-4 col-md-4"> {% endif %} {%- endmacro %} diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index 0d96ff5f2..8d37b8be2 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -30,9 +30,9 @@ <div class="col-sm-11 col-md-10"> {% include 'oscar/categories.html' %} </div> - <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label> + <label class="col-sm-3 col-md-2" for="categories">{{ _('Default categories') }}</label> {% else %} - <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label> + <label class="col-sm-3 col-md-2" for="categories">{{ _('Default categories') }}</label> <div class="col-sm-11 col-md-10 search-categories"> {% include 'oscar/categories.html' %} </div> @@ -40,14 +40,14 @@ </div> {% set language_label = _('Search language') %} {% set language_info = _('What language do you prefer for search?') %} - {{ preferences_item_header(language_info, language_label, rtl) }} + {{ preferences_item_header(language_info, language_label, rtl, 'language') }} {% include 'oscar/languages.html' %} {{ preferences_item_footer(language_info, language_label, rtl) }} {% set locale_label = _('Interface language') %} {% set locale_info = _('Change the language of the layout') %} - {{ preferences_item_header(locale_info, locale_label, rtl) }} - <select class="form-control" name='locale'> + {{ preferences_item_header(locale_info, locale_label, rtl, 'locale') }} + <select class="form-control" name="locale" id="locale"> {% for locale_id,locale_name in locales.items() | sort %} <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option> {% endfor %} @@ -56,8 +56,8 @@ {% set autocomplete_label = _('Autocomplete') %} {% set autocomplete_info = _('Find stuff as you type') %} - {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }} - <select class="form-control" name="autocomplete"> + {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl, 'autocomplete') }} + <select class="form-control" name="autocomplete" id="autocomplete"> <option value=""> - </option> {% for backend in autocomplete_backends %} <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option> @@ -67,8 +67,8 @@ {% set image_proxy_label = _('Image proxy') %} {% set image_proxy_info = _('Proxying image results through searx') %} - {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }} - <select class="form-control" name='image_proxy'> + {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl, 'image_proxy') }} + <select class="form-control" name="image_proxy" id="image_proxy"> <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option> <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option> </select> @@ -76,8 +76,8 @@ {% set method_label = _('Method') %} {% set method_info = _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') %} - {{ preferences_item_header(method_info, method_label, rtl) }} - <select class="form-control" name='method'> + {{ preferences_item_header(method_info, method_label, rtl, 'method') }} + <select class="form-control" name="method" id="method"> <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option> <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option> </select> @@ -85,8 +85,8 @@ {% set safesearch_label = _('SafeSearch') %} {% set safesearch_info = _('Filter content') %} - {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }} - <select class="form-control" name='safesearch'> + {{ preferences_item_header(safesearch_info, safesearch_label, rtl, 'safesearch') }} + <select class="form-control" name="safesearch" id="safesearch"> <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option> <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option> <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> @@ -95,16 +95,16 @@ {% set theme_label = _('Themes') %} {% set theme_info = _('Change searx layout') %} - {{ preferences_item_header(theme_info, theme_label, rtl) }} - <select class="form-control" name="theme"> + {{ preferences_item_header(theme_info, theme_label, rtl, 'theme') }} + <select class="form-control" name="theme" id="theme"> {% for name in themes %} <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option> {% endfor %} </select> {{ preferences_item_footer(theme_info, theme_label, rtl) }} - {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl) }} - <select class="form-control" name='oscar-style'> + {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl, 'oscar_style') }} + <select class="form-control" name="oscar-style" id="oscar_style"> <option value="logicodev" >Logicodev</option> <option value="pointhi" {% if preferences.get_value('oscar-style') == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option> <option value="logicodev-dark" {% if preferences.get_value('oscar-style') == 'logicodev-dark' %}selected="selected"{% endif %}>Logicodev dark</option> @@ -113,8 +113,8 @@ {% set label = _('Results on new tabs') %} {% set info = _('Open result links on new browser tabs') %} - {{ preferences_item_header(info, label, rtl) }} - <select class="form-control" name='results_on_new_tab'> + {{ preferences_item_header(info, label, rtl, 'results_on_new_tab') }} + <select class="form-control" name="results_on_new_tab" id="results_on_new_tab"> <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option> <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option> </select> @@ -122,8 +122,8 @@ {% set label = _('Open Access DOI resolver') %} {% set info = _('Redirect to open-access versions of publications when available (plugin required)') %} - {{ preferences_item_header(info, label, rtl) }} - <select class="form-control" id='doi_resolver' name='doi_resolver'> + {{ preferences_item_header(info, label, rtl, 'doi_resolver') }} + <select class="form-control" name="doi_resolver" id="doi_resolver"> {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %} <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}> {{ doi_resolver_name }} - {{ doi_resolver_url }} @@ -134,8 +134,8 @@ {% set label = _('Engine tokens') %} {% set info = _('Access tokens for private engines') %} - {{ preferences_item_header(info, label, rtl) }} - <input class="form-control" id='tokens' name='tokens' value='{{ preferences.tokens.get_value() }}'/> + {{ preferences_item_header(info, label, rtl, 'tokens') }} + <input class="form-control" id="tokens" name="tokens" value='{{ preferences.tokens.get_value() }}'/> {{ preferences_item_footer(info, label, rtl) }} </div> </fieldset> @@ -173,23 +173,23 @@ <table class="table table-hover table-condensed table-striped"> <tr> {% if not rtl %} - <th>{{ _("Allow") }}</th> - <th>{{ _("Engine name") }}</th> - <th>{{ _("Shortcut") }}</th> - <th>{{ _("Selected language") }}</th> - <th>{{ _("SafeSearch") }}</th> - <th>{{ _("Time range") }}</th> - <th>{{ _("Avg. time") }}</th> - <th>{{ _("Max time") }}</th> + <th scope="col">{{ _("Allow") }}</th> + <th scope="col">{{ _("Engine name") }}</th> + <th scope="col">{{ _("Shortcut") }}</th> + <th scope="col">{{ _("Selected language") }}</th> + <th scope="col">{{ _("SafeSearch") }}</th> + <th scope="col">{{ _("Time range") }}</th> + <th scope="col">{{ _("Avg. time") }}</th> + <th scope="col">{{ _("Max time") }}</th> {% else %} - <th class="text-right">{{ _("Max time") }}</th> - <th class="text-right">{{ _("Avg. time") }}</th> - <th class="text-right">{{ _("Time range") }}</th> - <th class="text-right">{{ _("SafeSearch") }}</th> - <th class="text-right">{{ _("Selected language") }}</th> - <th class="text-right">{{ _("Shortcut") }}</th> - <th class="text-right">{{ _("Engine name") }}</th> - <th class="text-right">{{ _("Allow") }}</th> + <th scope="col" class="text-right">{{ _("Max time") }}</th> + <th scope="col" class="text-right">{{ _("Avg. time") }}</th> + <th scope="col" class="text-right">{{ _("Time range") }}</th> + <th scope="col" class="text-right">{{ _("SafeSearch") }}</th> + <th scope="col" class="text-right">{{ _("Selected language") }}</th> + <th scope="col" class="text-right">{{ _("Shortcut") }}</th> + <th scope="col" class="text-right">{{ _("Engine name") }}</th> + <th scope="col" class="text-right">{{ _("Allow") }}</th> {% endif %} </tr> {% for search_engine in engines_by_category[categ] %} @@ -199,21 +199,21 @@ <td class="onoff-checkbox"> {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} </td> - <th>{{ search_engine.name }}</th> + <th scope="row">{{ 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(search_engine.safesearch==True) }}</td> <td>{{ support_toggle(search_engine.time_range_support==True) }}</td> - <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td> - <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td> - {% else %} - <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td> - <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td> + <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{% if stats[search_engine.name]['warn_time'] %}{{ icon('exclamation-sign')}} {% endif %}{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}</td> + <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{% if stats[search_engine.name]['warn_timeout'] %}{{ icon('exclamation-sign') }} {% endif %}{{ search_engine.timeout }}</td> + {% else %} + <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}{% if stats[search_engine.name]['warn_time'] %} {{ icon('exclamation-sign')}}{% endif %}</td> + <td class="{{ 'danger' if stats[search_engine.name]['warn_time'] else '' }}">{{ 'N/A' if stats[search_engine.name].time==None else stats[search_engine.name].time }}{% if stats[search_engine.name]['warn_time'] %} {{ icon('exclamation-sign')}}{% endif %}</td> <td>{{ support_toggle(search_engine.time_range_support==True) }}</td> <td>{{ support_toggle(search_engine.safesearch==True) }}</td> <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td> <td>{{ shortcuts[search_engine.name] }}</td> - <th>{{ search_engine.name }}</th> + <th scope="row">{{ search_engine.name }}</th> <td class="onoff-checkbox"> {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }} </td> @@ -241,7 +241,7 @@ <h3 class="panel-title">{{ _(plugin.name) }}</h3> </div> <div class="panel-body"> - <div class="col-xs-6 col-sm-4 col-md-6">{{ _(plugin.description) }}</div> + <div class="col-xs-6 col-sm-4 col-md-6"><label for="{{'plugin_' + plugin.id}}">{{ _(plugin.description) }}</label></div> <div class="col-xs-6 col-sm-4 col-md-6"> <div class="onoff-checkbox"> {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }} diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 885cbbfa8..57365f34e 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -16,7 +16,7 @@ {%- if result.img_src -%} <div class="container-fluid"> <div class="row"> -<img src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content"> +<img src="{{ image_proxify(result.img_src) }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content"> {% if result.content %}<p class="result-content col-xs-8 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif -%} </div> </div> diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 51ed5a025..6d9101d2e 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -15,7 +15,7 @@ <div class="container-fluid"> <div class="row"> - <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a> + <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" /></a> {% if result.author %}<p class="col-xs-12 col-sm-8 col-md-8 result-content"><b>{{ _('Author') }}</b>: {{ result.author }}</p>{% endif %} {% if result.length %}<p class="col-xs-12 col-sm-8 col-md-8 result-content"><b>{{ _('Length') }}</b>: {{ result.length }}</p>{% endif %} {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %} diff --git a/searx/templates/oscar/time-range.html b/searx/templates/oscar/time-range.html index fb1c0754b..181b57681 100644 --- a/searx/templates/oscar/time-range.html +++ b/searx/templates/oscar/time-range.html @@ -1,3 +1,4 @@ +<label class="visually-hidden" for="time-range">{{ _('Time range') }}</label> <select name="time_range" id="time-range" class="custom-select form-control" accesskey="t">{{- "" -}} <option id="time-range-anytime" value="" {{ "selected" if time_range=="" or not time_range else ""}}> {{- _('Anytime') -}} |