From 6ee35145caccab29a12e32e815bfd838579b35db Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Wed, 18 Feb 2015 18:31:01 +0100 Subject: [PATCH 1/2] New Tab in preferences in Oscar to view Cookies This tab only purpose is to allow to see what searx is storing on the user's computer. At a later time, we could implement a way to delete those cookies. --- searx/templates/oscar/preferences.html | 316 +++++++++++++------------ 1 file changed, 171 insertions(+), 145 deletions(-) diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index 126bdbd7b..2425b9ea4 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -12,159 +12,185 @@

{{ _('Preferences') }}

- - + + - - -
-
-
-
-
- {% if rtl %} -
- {% include 'oscar/categories.html' %} -
- - {% else %} - -
- {% include 'oscar/categories.html' %} -
- {% endif %} -
- {% set language_label = _('Search language') %} - {% set language_info = _('What language do you prefer for search?') %} - {{ preferences_item_header(language_info, language_label, rtl) }} - - {{ preferences_item_footer(language_info, language_label, rtl) }} - - {% set locale_label = _('Interface language') %} - {% set locale_info = _('Change the language of the layout') %} - {{ preferences_item_header(locale_info, locale_label, rtl) }} - - {{ preferences_item_footer(locale_info, locale_label, rtl) }} - - {% set autocomplete_label = _('Autocomplete') %} - {% set autocomplete_info = _('Find stuff as you type') %} - {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }} - - {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }} - - {% 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) }} - - {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }} - - {% 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) }} - - {{ preferences_item_footer(method_info, method_label, rtl) }} - - {% set safesearch_label = _('SafeSearch') %} - {% set safesearch_info = _('Filter content') %} - {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }} - - {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }} - - {% set theme_label = _('Themes') %} - {% set theme_info = _('Change searx layout') %} - {{ preferences_item_header(theme_info, theme_label, rtl) }} - - {{ preferences_item_footer(theme_info, theme_label, rtl) }} -
-
-
-
- - - - - - - -
- {% for (categ,search_engines) in categs %} - -
-
-
- {% for search_engine in search_engines %} - {% if not search_engine.private %} -
- {% if not rtl %} -
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})
- {% endif %} -
-
- - - -
-
- {% if rtl %} -
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎
- {% endif %} -
+ + +
+
+
+
+
+ {% if rtl %} +
+ {% include 'oscar/categories.html' %} +
+ + {% else %} + +
+ {% include 'oscar/categories.html' %} +
{% endif %} +
+ {% set language_label = _('Search language') %} + {% set language_info = _('What language do you prefer for search?') %} + {{ preferences_item_header(language_info, language_label, rtl) }} + + {{ preferences_item_footer(language_info, language_label, rtl) }} + + {% set locale_label = _('Interface language') %} + {% set locale_info = _('Change the language of the layout') %} + {{ preferences_item_header(locale_info, locale_label, rtl) }} + + {{ preferences_item_footer(locale_info, locale_label, rtl) }} + + {% set autocomplete_label = _('Autocomplete') %} + {% set autocomplete_info = _('Find stuff as you type') %} + {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }} + + {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }} + + {% 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) }} + + {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }} + + {% 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) }} + + {{ preferences_item_footer(method_info, method_label, rtl) }} + + {% set safesearch_label = _('SafeSearch') %} + {% set safesearch_info = _('Filter content') %} + {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }} + + {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }} + + {% set theme_label = _('Themes') %} + {% set theme_info = _('Change searx layout') %} + {{ preferences_item_header(theme_info, theme_label, rtl) }} + + {{ preferences_item_footer(theme_info, theme_label, rtl) }} +
+
+
+
+ + + + + + + +
+ {% for (categ,search_engines) in categs %} + +
+
+
+ {% for search_engine in search_engines %} + {% if not search_engine.private %} +
+ {% if not rtl %} +
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})
+ {% endif %} +
+
+ + + +
+
+ {% if rtl %} +
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎
+ {% endif %} +
+ {% endif %} + {% endfor %} +
+
+
+ {% endfor %} +
+
+ +
+ +

+ {{ _('This is the list of cookies and their values searx is storing on your computer.') }}
+ {{ _('With that list, you can assess searx transparency.') }}
+

+
+
+
+
+
+
+ + {% for cookie in cookies %} +
+
{{ cookie }}
+
{{ cookies[cookie] }}
+
{% endfor %}
-
- {% endfor %}
-
-

{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} -
- {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} -

+

{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} +
+ {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} +

- -
{{ _('back') }}
+ +
{{ _('back') }}
{% endblock %} From 5c5ff19ec116062dc8c31e51af3f26fca041a445 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 26 Apr 2015 20:09:28 +0200 Subject: [PATCH 2/2] [fix] indentation --- searx/templates/oscar/preferences.html | 324 ++++++++++++------------- 1 file changed, 162 insertions(+), 162 deletions(-) diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index 9beb21009..56e67e815 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -12,179 +12,179 @@

{{ _('Preferences') }}

- - + + - - -
-
-
-
-
- {% if rtl %} -
- {% include 'oscar/categories.html' %} -
- - {% else %} - -
- {% include 'oscar/categories.html' %} -
- {% endif %} -
- {% set language_label = _('Search language') %} - {% set language_info = _('What language do you prefer for search?') %} - {{ preferences_item_header(language_info, language_label, rtl) }} - - {{ preferences_item_footer(language_info, language_label, rtl) }} - - {% set locale_label = _('Interface language') %} - {% set locale_info = _('Change the language of the layout') %} - {{ preferences_item_header(locale_info, locale_label, rtl) }} - - {{ preferences_item_footer(locale_info, locale_label, rtl) }} - - {% set autocomplete_label = _('Autocomplete') %} - {% set autocomplete_info = _('Find stuff as you type') %} - {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }} - - {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }} - - {% 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) }} - - {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }} - - {% 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) }} - - {{ preferences_item_footer(method_info, method_label, rtl) }} - - {% set safesearch_label = _('SafeSearch') %} - {% set safesearch_info = _('Filter content') %} - {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }} - - {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }} - - {% set theme_label = _('Themes') %} - {% set theme_info = _('Change searx layout') %} - {{ preferences_item_header(theme_info, theme_label, rtl) }} - - {{ preferences_item_footer(theme_info, theme_label, rtl) }} -
-
-
-
- - - - - - - -
- {% for categ in categories %} - -
-
-
- {% for search_engine in engines_by_category[categ] %} - {% if not search_engine.private %} -
- {% if not rtl %} -
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})
- {% endif %} -
- {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in blocked_engines) }} -
- {% if rtl %} -
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎
- {% endif %} -
+ + +
+
+
+
+
+ {% if rtl %} +
+ {% include 'oscar/categories.html' %} +
+ + {% else %} + +
+ {% include 'oscar/categories.html' %} +
{% endif %} - {% endfor %} -
+ {% set language_label = _('Search language') %} + {% set language_info = _('What language do you prefer for search?') %} + {{ preferences_item_header(language_info, language_label, rtl) }} + + {{ preferences_item_footer(language_info, language_label, rtl) }} + + {% set locale_label = _('Interface language') %} + {% set locale_info = _('Change the language of the layout') %} + {{ preferences_item_header(locale_info, locale_label, rtl) }} + + {{ preferences_item_footer(locale_info, locale_label, rtl) }} + + {% set autocomplete_label = _('Autocomplete') %} + {% set autocomplete_info = _('Find stuff as you type') %} + {{ preferences_item_header(autocomplete_info, autocomplete_label, rtl) }} + + {{ preferences_item_footer(autocomplete_info, autocomplete_label, rtl) }} + + {% 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) }} + + {{ preferences_item_footer(image_proxy_info, image_proxy_label, rtl) }} + + {% 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) }} + + {{ preferences_item_footer(method_info, method_label, rtl) }} + + {% set safesearch_label = _('SafeSearch') %} + {% set safesearch_info = _('Filter content') %} + {{ preferences_item_header(safesearch_info, safesearch_label, rtl) }} + + {{ preferences_item_footer(safesearch_info, safesearch_label, rtl) }} + + {% set theme_label = _('Themes') %} + {% set theme_info = _('Change searx layout') %} + {{ preferences_item_header(theme_info, theme_label, rtl) }} + + {{ preferences_item_footer(theme_info, theme_label, rtl) }}
- {% endfor %} +
-
-
- -
-
- {% for plugin in plugins %} -
-
-

{{ plugin.name }}

-
-
-
{{ plugin.description }}
-
- {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }} +
+ + + + + + + +
+ {% for categ in categories %} + +
+
+
+ {% for search_engine in engines_by_category[categ] %} + {% if not search_engine.private %} +
+ {% if not rtl %} +
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})
+ {% endif %} +
+ {{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in blocked_engines) }} +
+ {% if rtl %} +
{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})‎
+ {% endif %} +
+ {% endif %} + {% endfor %} +
+ {% endfor %}
- {% endfor %}
-
+
+ +
+
+ {% for plugin in plugins %} +
+
+

{{ plugin.name }}

+
+
+
{{ plugin.description }}
+
+ {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }} +
+
+
+ {% endfor %} +
+
+
-
-

{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} -
- {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} -

+

{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} +
+ {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} +

- -
{{ _('back') }}
-
{{ _('Reset defaults') }}
+ +
{{ _('back') }}
+
{{ _('Reset defaults') }}
{% endblock %}