Loading searx/preferences.py +3 −7 Original line number Diff line number Diff line Loading @@ -373,7 +373,7 @@ class Preferences: } ), 'theme': EnumStringSetting( settings['ui'].get('default_theme', 'oscar'), settings['ui'].get('default_theme', 'etheme'), is_locked('theme'), choices=themes ), Loading @@ -396,10 +396,6 @@ class Preferences: is_locked('doi_resolver'), choices=DOI_RESOLVERS ), 'oscar-style': EnumStringSetting( settings['ui'].get('theme_args', {}).get('oscar_style', 'logicodev'), is_locked('oscar-style'), choices=['', 'logicodev', 'logicodev-dark', 'pointhi']), 'advanced_search': MapSetting( settings['ui'].get('advanced_search', False), is_locked('advanced_search'), Loading Loading @@ -450,8 +446,8 @@ class Preferences: def parse_dict(self, input_data): """parse preferences from request (``flask.request.form``)""" for user_setting_name, user_setting in input_data.items(): if user_setting_name == 'theme' and user_setting == 'eelo': # Fix theme name for old cookies user_setting = settings['ui'].get('default_theme', 'oscar') if user_setting_name == 'theme': # Fix theme name for old cookies user_setting = 'etheme' # only one theme supported if user_setting_name in self.key_value_settings: if self.key_value_settings[user_setting_name].locked: continue Loading searx/settings.yml +1 −1 Original line number Diff line number Diff line Loading @@ -37,7 +37,7 @@ server: ui: static_path : "" # Custom static path - leave it blank if you didn't change templates_path : "" # Custom templates path - leave it blank if you didn't change default_theme : oscar # ui theme default_theme : etheme # ui theme default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section theme_args : oscar_style : logicodev # default style of oscar Loading searx/settings_robot.yml +1 −1 Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ server: ui: static_path : "" templates_path : "" default_theme : oscar default_theme : etheme preferences: lock: [] Loading searx/static/themes/etheme/gruntfile.js +0 −2 Original line number Diff line number Diff line Loading @@ -26,7 +26,6 @@ module.exports = function(grunt) { development: { options: { paths: ["less/etheme"] //banner: '/*! less/etheme/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n' }, files: { "css/etheme.css": "less/etheme/etheme.less", Loading @@ -36,7 +35,6 @@ module.exports = function(grunt) { production: { options: { paths: ["less/etheme"], //banner: '/*! less/etheme/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n', cleancss: true }, files: { Loading searx/static/themes/oscar/.gitignoredeleted 100644 → 0 +0 −1 Original line number Diff line number Diff line /node_modules Loading
searx/preferences.py +3 −7 Original line number Diff line number Diff line Loading @@ -373,7 +373,7 @@ class Preferences: } ), 'theme': EnumStringSetting( settings['ui'].get('default_theme', 'oscar'), settings['ui'].get('default_theme', 'etheme'), is_locked('theme'), choices=themes ), Loading @@ -396,10 +396,6 @@ class Preferences: is_locked('doi_resolver'), choices=DOI_RESOLVERS ), 'oscar-style': EnumStringSetting( settings['ui'].get('theme_args', {}).get('oscar_style', 'logicodev'), is_locked('oscar-style'), choices=['', 'logicodev', 'logicodev-dark', 'pointhi']), 'advanced_search': MapSetting( settings['ui'].get('advanced_search', False), is_locked('advanced_search'), Loading Loading @@ -450,8 +446,8 @@ class Preferences: def parse_dict(self, input_data): """parse preferences from request (``flask.request.form``)""" for user_setting_name, user_setting in input_data.items(): if user_setting_name == 'theme' and user_setting == 'eelo': # Fix theme name for old cookies user_setting = settings['ui'].get('default_theme', 'oscar') if user_setting_name == 'theme': # Fix theme name for old cookies user_setting = 'etheme' # only one theme supported if user_setting_name in self.key_value_settings: if self.key_value_settings[user_setting_name].locked: continue Loading
searx/settings.yml +1 −1 Original line number Diff line number Diff line Loading @@ -37,7 +37,7 @@ server: ui: static_path : "" # Custom static path - leave it blank if you didn't change templates_path : "" # Custom templates path - leave it blank if you didn't change default_theme : oscar # ui theme default_theme : etheme # ui theme default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section theme_args : oscar_style : logicodev # default style of oscar Loading
searx/settings_robot.yml +1 −1 Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ server: ui: static_path : "" templates_path : "" default_theme : oscar default_theme : etheme preferences: lock: [] Loading
searx/static/themes/etheme/gruntfile.js +0 −2 Original line number Diff line number Diff line Loading @@ -26,7 +26,6 @@ module.exports = function(grunt) { development: { options: { paths: ["less/etheme"] //banner: '/*! less/etheme/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n' }, files: { "css/etheme.css": "less/etheme/etheme.less", Loading @@ -36,7 +35,6 @@ module.exports = function(grunt) { production: { options: { paths: ["less/etheme"], //banner: '/*! less/etheme/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n', cleancss: true }, files: { Loading
searx/static/themes/oscar/.gitignoredeleted 100644 → 0 +0 −1 Original line number Diff line number Diff line /node_modules