diff --git a/searx/plugins/__init__.py b/searx/plugins/__init__.py
index 22f475875..45b210662 100644
--- a/searx/plugins/__init__.py
+++ b/searx/plugins/__init__.py
@@ -70,6 +70,13 @@ class PluginStore():
if not hasattr(plugin, plugin_attr) or not isinstance(getattr(plugin, plugin_attr), plugin_attr_type):
setattr(plugin, plugin_attr, plugin_attr_type())
plugin.id = plugin.name.replace(' ', '_')
+ if not hasattr(plugin, 'preference_section'):
+ plugin.preference_section = 'general'
+ if plugin.preference_section == 'query':
+ for plugin_attr in ('query_keywords', 'query_examples'):
+ if not hasattr(plugin, plugin_attr):
+ logger.critical('missing attribute "{0}", cannot load plugin: {1}'.format(plugin_attr, plugin))
+ exit(3)
self.plugins.append(plugin)
def call(self, ordered_plugin_list, plugin_type, request, *args, **kwargs):
diff --git a/searx/plugins/hash_plugin.py b/searx/plugins/hash_plugin.py
index 1d3baaede..edb91dd8e 100644
--- a/searx/plugins/hash_plugin.py
+++ b/searx/plugins/hash_plugin.py
@@ -23,6 +23,9 @@ import re
name = "Hash plugin"
description = gettext("Converts strings to different hash digests.")
default_on = True
+preference_section = 'query'
+query_keywords = ['md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512']
+query_examples = 'sha512 The quick brown fox jumps over the lazy dog'
parser_re = re.compile('(md5|sha1|sha224|sha256|sha384|sha512) (.*)', re.I)
diff --git a/searx/plugins/self_info.py b/searx/plugins/self_info.py
index 4fdfb4288..053899483 100644
--- a/searx/plugins/self_info.py
+++ b/searx/plugins/self_info.py
@@ -19,7 +19,9 @@ import re
name = gettext('Self Informations')
description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".')
default_on = True
-
+preference_section = 'query'
+query_keywords = ['user-agent']
+query_examples = ''
# Self User Agent regex
p = re.compile('.*user[ -]agent.*', re.IGNORECASE)
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 352b90eed..c47675562 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -76,6 +76,16 @@
{%- endif -%}
{%- endmacro -%}
+{%- macro plugin_of_category(plugin_category) -%}
+{%- for plugin in plugins -%}
+ {%- if plugin.preference_section == plugin_category -%}
+ {{- preferences_item_header(_(plugin.description), _(plugin.name), rtl, 'plugin_' + plugin.id) -}}
+ {{- checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) -}}
+ {{- preferences_item_footer(_(plugin.description), _(plugin.name), rtl) -}}
+ {%- endif -%}
+{%- endfor -%}
+{% endmacro %}
+
{%- block title %}{{ _('preferences') }} - {% endblock -%}
{% block content %}
@@ -88,9 +98,10 @@
@@ -125,53 +136,6 @@
{{ preferences_item_footer(language_info, language_label, rtl) }}
{% endif %}
- {% if 'locale' not in locked_preferences %}
- {% set locale_label = _('Interface language') %}
- {% set locale_info = _('Change the language of the layout') %}
- {{ preferences_item_header(locale_info, locale_label, rtl, 'locale') }}
-
- {{ preferences_item_footer(locale_info, locale_label, rtl) }}
- {% endif %}
-
- {% if 'autocomplete' not in locked_preferences %}
- {% set autocomplete_label = _('Autocomplete') %}
- {% set autocomplete_info = _('Find stuff as you type') %}
- {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl, 'autocomplete') }}
-
- {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }}
- {% endif %}
-
- {% if 'image_proxy' not in locked_preferences %}
- {% 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, 'image_proxy') }}
-
- {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }}
- {% endif %}
-
- {% if 'method' not in locked_preferences %}
- {% set method_label = _('Method') %}
- {% set method_info = _('Change how forms are submited, learn more about request methods') %}
- {{ preferences_item_header(method_info, method_label, rtl, 'method') }}
-
- {{ preferences_item_footer(method_info, method_label, rtl) }}
- {% endif %}
-
{% if 'safesearch' not in locked_preferences %}
{% set safesearch_label = _('SafeSearch') %}
{% set safesearch_info = _('Filter content') %}
@@ -184,47 +148,20 @@
{{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }}
{% endif %}
- {% if 'theme' not in locked_preferences %}
- {% set theme_label = _('Themes') %}
- {% set theme_info = _('Change searx layout') %}
- {{ preferences_item_header(theme_info, theme_label, rtl, 'theme') }}
-