git.iko.soy/searx
on master help sign in
[enh] make custom oscar option configurable from url
commite060aedc16bb2b9e5c1ee3fc69a0e07a3576a80c authorAdam Tauber <asciimoo@gmail.com> dateTue 5 Dec 2017, 22:30 (9 years ago) parent46fb0d8
4 files changed+10−4
compare with master
unifiedsplit
searx/preferences.py+4 searx/templates/oscar/base.html+2−2 searx/templates/oscar/preferences.html+2−2 searx/webapp.py+2
searx/preferences.py+4
@@ -305,6 +305,8 @@ class Preferences(object):
305305 elif user_setting_name == 'disabled_plugins':
306306 self.plugins.parse_cookie((input_data.get('disabled_plugins', ''),
307307 input_data.get('enabled_plugins', '')))
308+ else:
309+ self.unknown_params[user_setting_name] = user_setting
308310
309311 def parse_form(self, input_data):
310312 disabled_engines = []
@@ -329,6 +331,8 @@ class Preferences(object):
329331 def get_value(self, user_setting_name):
330332 if user_setting_name in self.key_value_settings:
331333 return self.key_value_settings[user_setting_name].get_value()
334+ if user_setting_name in self.unknown_params:
335+ return self.unknown_params[user_setting_name]
332336
333337 def save(self, resp):
334338 for user_setting_name, user_setting in self.key_value_settings.items():
searx/templates/oscar/base.html+2−2
@@ -13,8 +13,8 @@
1313 <title>{% block title %}{% endblock %}{{ instance_name }}</title>
1414
1515 <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
16− {% if cookies['oscar-style'] %}
17− <link rel="stylesheet" href="{{ url_for('static', filename='css/'+cookies['oscar-style']+'.min.css') }}" type="text/css" />
16+ {% if preferences.get_value('oscar-style') %}
17+ <link rel="stylesheet" href="{{ url_for('static', filename='css/'+preferences.get_value('oscar-style')+'.min.css') }}" type="text/css" />
1818 {% else %}
1919 <link rel="stylesheet" href="{{ url_for('static', filename='css/logicodev.min.css') }}" type="text/css" />
2020 {% endif %}
searx/templates/oscar/preferences.html+2−2
@@ -106,8 +106,8 @@
106106 {{ preferences_item_header(_('Choose style for this theme'), _('Style'), rtl) }}
107107 <select class="form-control" name='oscar-style'>
108108 <option value="logicodev" >Logicodev</option>
109− <option value="pointhi" {% if cookies['oscar-style'] == 'pointhi' %}selected="selected"{% endif %}>Pointhi</option>
110− <option value="logicodev-dark" {% if cookies['oscar-style'] == 'logicodev-dark' %}selected="selected"{% endif %}>Logicodev dark</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>
111111 </select>
112112 {{ preferences_item_footer(_('Choose style for this theme'), _('Style'), rtl) }}
113113
searx/webapp.py+2
@@ -376,6 +376,8 @@ def render(template_name, override_theme=None, **kwargs):
376376
377377 kwargs['unicode'] = unicode
378378
379+ kwargs['preferences'] = request.preferences
380+
379381 kwargs['scripts'] = set()
380382 for plugin in request.user_plugins:
381383 for script in plugin.js_dependencies: