@@ -30,9 +30,9 @@
3030 <div class="col-sm-11 col-md-10">
3131 {% include 'oscar/categories.html' %}
3232 </div>
33− <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
33+ <label class="col-sm-3 col-md-2" for="categories">{{ _('Default categories') }}</label>
3434 {% else %}
35− <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
35+ <label class="col-sm-3 col-md-2" for="categories">{{ _('Default categories') }}</label>
3636 <div class="col-sm-11 col-md-10 search-categories">
3737 {% include 'oscar/categories.html' %}
3838 </div>
@@ -40,14 +40,14 @@
4040 </div>
4141 {% set language_label = _('Search language') %}
4242 {% set language_info = _('What language do you prefer for search?') %}
43− {{ preferences_item_header(language_info, language_label, rtl) }}
43+ {{ preferences_item_header(language_info, language_label, rtl, 'language') }}
4444 {% include 'oscar/languages.html' %}
4545 {{ preferences_item_footer(language_info, language_label, rtl) }}
4646
4747 {% set locale_label = _('Interface language') %}
4848 {% set locale_info = _('Change the language of the layout') %}
49− {{ preferences_item_header(locale_info, locale_label, rtl) }}
50− <select class="form-control" name='locale'>
49+ {{ preferences_item_header(locale_info, locale_label, rtl, 'locale') }}
50+ <select class="form-control" name="locale" id="locale">
5151 {% for locale_id,locale_name in locales.items() | sort %}
5252 <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
5353 {% endfor %}
@@ -56,8 +56,8 @@
5656
5757 {% set autocomplete_label = _('Autocomplete') %}
5858 {% set autocomplete_info = _('Find stuff as you type') %}
59− {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }}
60− <select class="form-control" name="autocomplete">
59+ {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl, 'autocomplete') }}
60+ <select class="form-control" name="autocomplete" id="autocomplete">
6161 <option value=""> - </option>
6262 {% for backend in autocomplete_backends %}
6363 <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
@@ -67,8 +67,8 @@
6767
6868 {% set image_proxy_label = _('Image proxy') %}
6969 {% set image_proxy_info = _('Proxying image results through searx') %}
70− {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }}
71− <select class="form-control" name='image_proxy'>
70+ {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl, 'image_proxy') }}
71+ <select class="form-control" name="image_proxy" id="image_proxy">
7272 <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
7373 <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
7474 </select>
@@ -76,8 +76,8 @@
7676
7777 {% set method_label = _('Method') %}
7878 {% 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>') %}
79− {{ preferences_item_header(method_info, method_label, rtl) }}
80− <select class="form-control" name='method'>
79+ {{ preferences_item_header(method_info, method_label, rtl, 'method') }}
80+ <select class="form-control" name="method" id="method">
8181 <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
8282 <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
8383 </select>
@@ -85,8 +85,8 @@
8585
8686 {% set safesearch_label = _('SafeSearch') %}
8787 {% set safesearch_info = _('Filter content') %}
88− {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }}
89− <select class="form-control" name='safesearch'>
88+ {{ preferences_item_header(safesearch_info, safesearch_label, rtl, 'safesearch') }}
89+ <select class="form-control" name="safesearch" id="safesearch">
9090 <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
9191 <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
9292 <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
@@ -95,16 +95,16 @@
9595
9696 {% set theme_label = _('Themes') %}
9797 {% set theme_info = _('Change searx layout') %}
98− {{ preferences_item_header(theme_info, theme_label, rtl) }}
99− <select class="form-control" name="theme">
98+ {{ preferences_item_header(theme_info, theme_label, rtl, 'theme') }}
99+ <select class="form-control" name="theme" id="theme">
100100 {% for name in themes %}
101101 <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
102102 {% endfor %}
103103 </select>
104104 {{ preferences_item_footer(theme_info, theme_label, rtl) }}
105105
106− {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl) }}
107− <select class="form-control" name='oscar-style'>
106+ {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl, 'oscar_style') }}
107+ <select class="form-control" name="oscar-style" id="oscar_style">
108108 <option value="logicodev" >Logicodev</option>
109109 <option value="pointhi" {% if preferences.get_value('oscar-style') == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option>
110110 <option value="logicodev-dark" {% if preferences.get_value('oscar-style') == 'logicodev-dark' %}selected="selected"{% endif %}>Logicodev dark</option>
@@ -113,8 +113,8 @@
113113
114114 {% set label = _('Results on new tabs') %}
115115 {% set info = _('Open result links on new browser tabs') %}
116− {{ preferences_item_header(info, label, rtl) }}
117− <select class="form-control" name='results_on_new_tab'>
116+ {{ preferences_item_header(info, label, rtl, 'results_on_new_tab') }}
117+ <select class="form-control" name="results_on_new_tab" id="results_on_new_tab">
118118 <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option>
119119 <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option>
120120 </select>
@@ -122,8 +122,8 @@
122122
123123 {% set label = _('Open Access DOI resolver') %}
124124 {% set info = _('Redirect to open-access versions of publications when available (plugin required)') %}
125− {{ preferences_item_header(info, label, rtl) }}
126− <select class="form-control" id='doi_resolver' name='doi_resolver'>
125+ {{ preferences_item_header(info, label, rtl, 'doi_resolver') }}
126+ <select class="form-control" name="doi_resolver" id="doi_resolver">
127127 {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %}
128128 <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}>
129129 {{ doi_resolver_name }} - {{ doi_resolver_url }}
@@ -134,8 +134,8 @@
134134
135135 {% set label = _('Engine tokens') %}
136136 {% set info = _('Access tokens for private engines') %}
137− {{ preferences_item_header(info, label, rtl) }}
138− <input class="form-control" id='tokens' name='tokens' value='{{ preferences.tokens.get_value() }}'/>
137+ {{ preferences_item_header(info, label, rtl, 'tokens') }}
138+ <input class="form-control" id="tokens" name="tokens" value='{{ preferences.tokens.get_value() }}'/>
139139 {{ preferences_item_footer(info, label, rtl) }}
140140 </div>
141141 </fieldset>
@@ -173,23 +173,23 @@
173173 <table class="table table-hover table-condensed table-striped">
174174 <tr>
175175 {% if not rtl %}
176− <th>{{ _("Allow") }}</th>
177− <th>{{ _("Engine name") }}</th>
178− <th>{{ _("Shortcut") }}</th>
179− <th>{{ _("Selected language") }}</th>
180− <th>{{ _("SafeSearch") }}</th>
181− <th>{{ _("Time range") }}</th>
182− <th>{{ _("Avg. time") }}</th>
183− <th>{{ _("Max time") }}</th>
176+ <th scope="col">{{ _("Allow") }}</th>
177+ <th scope="col">{{ _("Engine name") }}</th>
178+ <th scope="col">{{ _("Shortcut") }}</th>
179+ <th scope="col">{{ _("Selected language") }}</th>
180+ <th scope="col">{{ _("SafeSearch") }}</th>
181+ <th scope="col">{{ _("Time range") }}</th>
182+ <th scope="col">{{ _("Avg. time") }}</th>
183+ <th scope="col">{{ _("Max time") }}</th>
184184 {% else %}
185− <th class="text-right">{{ _("Max time") }}</th>
186− <th class="text-right">{{ _("Avg. time") }}</th>
187− <th class="text-right">{{ _("Time range") }}</th>
188− <th class="text-right">{{ _("SafeSearch") }}</th>
189− <th class="text-right">{{ _("Selected language") }}</th>
190− <th class="text-right">{{ _("Shortcut") }}</th>
191− <th class="text-right">{{ _("Engine name") }}</th>
192− <th class="text-right">{{ _("Allow") }}</th>
185+ <th scope="col" class="text-right">{{ _("Max time") }}</th>
186+ <th scope="col" class="text-right">{{ _("Avg. time") }}</th>
187+ <th scope="col" class="text-right">{{ _("Time range") }}</th>
188+ <th scope="col" class="text-right">{{ _("SafeSearch") }}</th>
189+ <th scope="col" class="text-right">{{ _("Selected language") }}</th>
190+ <th scope="col" class="text-right">{{ _("Shortcut") }}</th>
191+ <th scope="col" class="text-right">{{ _("Engine name") }}</th>
192+ <th scope="col" class="text-right">{{ _("Allow") }}</th>
193193 {% endif %}
194194 </tr>
195195 {% for search_engine in engines_by_category[categ] %}
@@ -199,21 +199,21 @@
199199 <td class="onoff-checkbox">
200200 {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
201201 </td>
202− <th>{{ search_engine.name }}</th>
202+ <th scope="row">{{ search_engine.name }}</th>
203203 <td class="name">{{ shortcuts[search_engine.name] }}</td>
204204 <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
205205 <td>{{ support_toggle(search_engine.safesearch==True) }}</td>
206206 <td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
207− <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>
208− <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
209− {% else %}
210− <td class="{{ 'danger' if stats[search_engine.name]['warn_timeout'] else '' }}">{{ search_engine.timeout }}</td>
211− <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>
207+ <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>
208+ <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>
209+ {% else %}
210+ <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>
211+ <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>
212212 <td>{{ support_toggle(search_engine.time_range_support==True) }}</td>
213213 <td>{{ support_toggle(search_engine.safesearch==True) }}</td>
214214 <td>{{ support_toggle(stats[search_engine.name].supports_selected_language) }}</td>
215215 <td>{{ shortcuts[search_engine.name] }}</td>
216− <th>{{ search_engine.name }}</th>
216+ <th scope="row">{{ search_engine.name }}</th>
217217 <td class="onoff-checkbox">
218218 {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}
219219 </td>
@@ -241,7 +241,7 @@
241241 <h3 class="panel-title">{{ _(plugin.name) }}</h3>
242242 </div>
243243 <div class="panel-body">
244− <div class="col-xs-6 col-sm-4 col-md-6">{{ _(plugin.description) }}</div>
244+ <div class="col-xs-6 col-sm-4 col-md-6"><label for="{{'plugin_' + plugin.id}}">{{ _(plugin.description) }}</label></div>
245245 <div class="col-xs-6 col-sm-4 col-md-6">
246246 <div class="onoff-checkbox">
247247 {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}