on master help sign in
[fix] connect selects and inputs programmatically on the preferences page - #350
6ab569fAdam Tauber
searx/templates/oscar/macros.html+3−3
@@ -60,15 +60,15 @@
60 {%- endif %}
60 {%- endif %}
61{%- endmacro %}
61{%- endmacro %}
62
62
63−{% macro preferences_item_header(info, label, rtl) -%}
63+{% macro preferences_item_header(info, label, rtl, id) -%}
64 {% if rtl %}
64 {% if rtl %}
65 <div class="row form-group">
65 <div class="row form-group">
66− <label class="col-sm-3 col-md-2 pull-right">{{ label }}</label>
66+ <label class="col-sm-3 col-md-2 pull-right"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label>
67 <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>
67 <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>
68 <div class="col-sm-4 col-md-4">
68 <div class="col-sm-4 col-md-4">
69 {% else %}
69 {% else %}
70 <div class="row form-group">
70 <div class="row form-group">
71− <label class="col-sm-3 col-md-2">{{ label }}</label>
71+ <label class="col-sm-3 col-md-2"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label>
72 <div class="col-sm-4 col-md-4">
72 <div class="col-sm-4 col-md-4">
73 {% endif %}
73 {% endif %}
74{%- endmacro %}
74{%- endmacro %}
searx/templates/oscar/preferences.html+24−24
@@ -30,9 +30,9 @@
30 <div class="col-sm-11 col-md-10">
30 <div class="col-sm-11 col-md-10">
31 {% include 'oscar/categories.html' %}
31 {% include 'oscar/categories.html' %}
32 </div>
32 </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>
34 {% else %}
34 {% 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>
36 <div class="col-sm-11 col-md-10 search-categories">
36 <div class="col-sm-11 col-md-10 search-categories">
37 {% include 'oscar/categories.html' %}
37 {% include 'oscar/categories.html' %}
38 </div>
38 </div>
@@ -40,14 +40,14 @@
40 </div>
40 </div>
41 {% set language_label = _('Search language') %}
41 {% set language_label = _('Search language') %}
42 {% set language_info = _('What language do you prefer for search?') %}
42 {% 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') }}
44 {% include 'oscar/languages.html' %}
44 {% include 'oscar/languages.html' %}
45 {{ preferences_item_footer(language_info, language_label, rtl) }}
45 {{ preferences_item_footer(language_info, language_label, rtl) }}
46
46
47 {% set locale_label = _('Interface language') %}
47 {% set locale_label = _('Interface language') %}
48 {% set locale_info = _('Change the language of the layout') %}
48 {% set locale_info = _('Change the language of the layout') %}
49− {{ preferences_item_header(locale_info, locale_label, rtl) }}
49+ {{ preferences_item_header(locale_info, locale_label, rtl, 'locale') }}
50− <select class="form-control" name='locale'>
50+ <select class="form-control" name="locale" id="locale">
51 {% for locale_id,locale_name in locales.items() | sort %}
51 {% for locale_id,locale_name in locales.items() | sort %}
52 <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
52 <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
53 {% endfor %}
53 {% endfor %}
@@ -56,8 +56,8 @@
56
56
57 {% set autocomplete_label = _('Autocomplete') %}
57 {% set autocomplete_label = _('Autocomplete') %}
58 {% set autocomplete_info = _('Find stuff as you type') %}
58 {% set autocomplete_info = _('Find stuff as you type') %}
59− {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }}
59+ {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl, 'autocomplete') }}
60− <select class="form-control" name="autocomplete">
60+ <select class="form-control" name="autocomplete" id="autocomplete">
61 <option value=""> - </option>
61 <option value=""> - </option>
62 {% for backend in autocomplete_backends %}
62 {% for backend in autocomplete_backends %}
63 <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
63 <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
@@ -67,8 +67,8 @@
67
67
68 {% set image_proxy_label = _('Image proxy') %}
68 {% set image_proxy_label = _('Image proxy') %}
69 {% set image_proxy_info = _('Proxying image results through searx') %}
69 {% set image_proxy_info = _('Proxying image results through searx') %}
70− {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl) }}
70+ {{ preferences_item_header(image_proxy_info, image_proxy_label, rtl, 'image_proxy') }}
71− <select class="form-control" name='image_proxy'>
71+ <select class="form-control" name="image_proxy" id="image_proxy">
72 <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
72 <option value="1" {% if image_proxy %}selected="selected"{% endif %}>{{ _('Enabled') }}</option>
73 <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
73 <option value="" {% if not image_proxy %}selected="selected"{% endif %}>{{ _('Disabled')}}</option>
74 </select>
74 </select>
@@ -76,8 +76,8 @@
76
76
77 {% set method_label = _('Method') %}
77 {% set method_label = _('Method') %}
78 {% 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>') %}
78 {% 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) }}
79+ {{ preferences_item_header(method_info, method_label, rtl, 'method') }}
80− <select class="form-control" name='method'>
80+ <select class="form-control" name="method" id="method">
81 <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
81 <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
82 <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
82 <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
83 </select>
83 </select>
@@ -85,8 +85,8 @@
85
85
86 {% set safesearch_label = _('SafeSearch') %}
86 {% set safesearch_label = _('SafeSearch') %}
87 {% set safesearch_info = _('Filter content') %}
87 {% set safesearch_info = _('Filter content') %}
88− {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }}
88+ {{ preferences_item_header(safesearch_info, safesearch_label, rtl, 'safesearch') }}
89− <select class="form-control" name='safesearch'>
89+ <select class="form-control" name="safesearch" id="safesearch">
90 <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
90 <option value="2" {% if safesearch == '2' %}selected="selected"{% endif %}>{{ _('Strict') }}</option>
91 <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
91 <option value="1" {% if safesearch == '1' %}selected="selected"{% endif %}>{{ _('Moderate') }}</option>
92 <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
92 <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option>
@@ -95,16 +95,16 @@
95
95
96 {% set theme_label = _('Themes') %}
96 {% set theme_label = _('Themes') %}
97 {% set theme_info = _('Change searx layout') %}
97 {% set theme_info = _('Change searx layout') %}
98− {{ preferences_item_header(theme_info, theme_label, rtl) }}
98+ {{ preferences_item_header(theme_info, theme_label, rtl, 'theme') }}
99− <select class="form-control" name="theme">
99+ <select class="form-control" name="theme" id="theme">
100 {% for name in themes %}
100 {% for name in themes %}
101 <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
101 <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
102 {% endfor %}
102 {% endfor %}
103 </select>
103 </select>
104 {{ preferences_item_footer(theme_info, theme_label, rtl) }}
104 {{ preferences_item_footer(theme_info, theme_label, rtl) }}
105
105
106− {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl) }}
106+ {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl, 'oscar_style') }}
107− <select class="form-control" name='oscar-style'>
107+ <select class="form-control" name="oscar-style" id="oscar_style">
108 <option value="logicodev" >Logicodev</option>
108 <option value="logicodev" >Logicodev</option>
109 <option value="pointhi" {% if preferences.get_value('oscar-style') == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option>
109 <option value="pointhi" {% if preferences.get_value('oscar-style') == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option>
110 <option value="logicodev-dark" {% if preferences.get_value('oscar-style') == 'logicodev-dark' %}selected="selected"{% endif %}>Logicodev dark</option>
110 <option value="logicodev-dark" {% if preferences.get_value('oscar-style') == 'logicodev-dark' %}selected="selected"{% endif %}>Logicodev dark</option>
@@ -113,8 +113,8 @@
113
113
114 {% set label = _('Results on new tabs') %}
114 {% set label = _('Results on new tabs') %}
115 {% set info = _('Open result links on new browser tabs') %}
115 {% set info = _('Open result links on new browser tabs') %}
116− {{ preferences_item_header(info, label, rtl) }}
116+ {{ preferences_item_header(info, label, rtl, 'results_on_new_tab') }}
117− <select class="form-control" name='results_on_new_tab'>
117+ <select class="form-control" name="results_on_new_tab" id="results_on_new_tab">
118 <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option>
118 <option value="1" {% if results_on_new_tab %}selected="selected"{% endif %}>{{ _('On') }}</option>
119 <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option>
119 <option value="0" {% if not results_on_new_tab %}selected="selected"{% endif %}>{{ _('Off')}}</option>
120 </select>
120 </select>
@@ -122,8 +122,8 @@
122
122
123 {% set label = _('Open Access DOI resolver') %}
123 {% set label = _('Open Access DOI resolver') %}
124 {% set info = _('Redirect to open-access versions of publications when available (plugin required)') %}
124 {% set info = _('Redirect to open-access versions of publications when available (plugin required)') %}
125− {{ preferences_item_header(info, label, rtl) }}
125+ {{ preferences_item_header(info, label, rtl, 'doi_resolver') }}
126− <select class="form-control" id='doi_resolver' name='doi_resolver'>
126+ <select class="form-control" name="doi_resolver" id="doi_resolver">
127 {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %}
127 {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %}
128 <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}>
128 <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}>
129 {{ doi_resolver_name }} - {{ doi_resolver_url }}
129 {{ doi_resolver_name }} - {{ doi_resolver_url }}
@@ -134,8 +134,8 @@
134
134
135 {% set label = _('Engine tokens') %}
135 {% set label = _('Engine tokens') %}
136 {% set info = _('Access tokens for private engines') %}
136 {% set info = _('Access tokens for private engines') %}
137− {{ preferences_item_header(info, label, rtl) }}
137+ {{ preferences_item_header(info, label, rtl, 'tokens') }}
138− <input class="form-control" id='tokens' name='tokens' value='{{ preferences.tokens.get_value() }}'/>
138+ <input class="form-control" id="tokens" name="tokens" value='{{ preferences.tokens.get_value() }}'/>
139 {{ preferences_item_footer(info, label, rtl) }}
139 {{ preferences_item_footer(info, label, rtl) }}
140 </div>
140 </div>
141 </fieldset>
141 </fieldset>
@@ -241,7 +241,7 @@
241 <h3 class="panel-title">{{ _(plugin.name) }}</h3>
241 <h3 class="panel-title">{{ _(plugin.name) }}</h3>
242 </div>
242 </div>
243 <div class="panel-body">
243 <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>
245 <div class="col-xs-6 col-sm-4 col-md-6">
245 <div class="col-xs-6 col-sm-4 col-md-6">
246 <div class="onoff-checkbox">
246 <div class="onoff-checkbox">
247 {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}
247 {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }}