Merge pull request #176 from Cqoicebordel/courgette-UXUI

Courgette theme - UIUX

1 files changed, 53 insertions, 55 deletions

diff --git a/searx/templates/courgette/preferences.html b/searx/templates/courgette/preferences.html
index 7d35de7c3..c492e3751 100644
--- a/searx/templates/courgette/preferences.html
+++ b/searx/templates/courgette/preferences.html
@@ -1,4 +1,4 @@
-{% extends "default/base.html" %}
+{% extends "courgette/base.html" %}
 {% block head %} {% endblock %}
 {% block content %}
 <div class="row">
@@ -7,95 +7,93 @@
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
     <fieldset>
         <legend>{{ _('Default categories') }}</legend>
-        <p>
-        {% include 'default/categories.html' %}
-        </p>
+        {% include 'courgette/categories.html' %}
     </fieldset>
     <fieldset>
         <legend>{{ _('Search language') }}</legend>
         <p>
-        <select name='language'>
-            <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
-            {% for lang_id,lang_name,country_name in language_codes %}
-            <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
-            {% endfor %}
-        </select>
+            <select name='language'>
+                <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
+                {% for lang_id,lang_name,country_name in language_codes %}
+                <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
+                {% endfor %}
+            </select>
         </p>
     </fieldset>
     <fieldset>
         <legend>{{ _('Interface language') }}</legend>
         <p>
-        <select name='locale'>
-            {% for locale_id,locale_name in locales.items() %}
-            <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
-            {% endfor %}
-        </select>
+            <select name='locale'>
+                {% for locale_id,locale_name in locales.items() %}
+                <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
+                {% endfor %}
+            </select>
         </p>
     </fieldset>
     <fieldset>
         <legend>{{ _('Autocomplete') }}</legend>
         <p>
-        <select name="autocomplete">
-            <option value=""> - </option>
-            {% for backend in autocomplete_backends %}
-            <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
-            {% endfor %}
-        </select>
+            <select name="autocomplete">
+                <option value=""> - </option>
+                {% for backend in autocomplete_backends %}
+                <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
+                {% endfor %}
+            </select>
         </p>
     </fieldset>
     <fieldset>
         <legend>{{ _('Method') }}</legend>
         <p>
-        <select name='method'>
-            <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
-            <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
-        </select>
+            <select name='method'>
+                <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
+                <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
+            </select>
         </p>
     </fieldset>
     <fieldset>
         <legend>{{ _('Themes') }}</legend>
         <p>
-        <select name="theme">
-            {% for name in themes %}
-            <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
-            {% endfor %}
-        </select>
+            <select name="theme">
+                {% for name in themes %}
+                <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
+                {% endfor %}
+            </select>
         </p>
     </fieldset>
     <fieldset>
-    <legend>{{ _('Currently used search engines') }}</legend>
-
-    <table>
-        <tr>
-            <th>{{ _('Engine name') }}</th>
-            <th>{{ _('Category') }}</th>
-            <th>{{ _('Allow') }} / {{ _('Block') }}</th>
-        </tr>
-    {% for (categ,search_engines) in categs %}
-        {% for search_engine in search_engines %}
+        <legend>{{ _('Currently used search engines') }}</legend>
 
-            {% if not search_engine.private %}
+        <table>
             <tr>
-                <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td>
-                <td>{{ _(categ) }}</td>
-                <td class="engine_checkbox">
-                    <input type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
-                    <label class="allow" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
-                    <label class="deny" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
-                </td>
+                <th>{{ _('Engine name') }}</th>
+                <th>{{ _('Category') }}</th>
+                <th>{{ _('Allow') }} / {{ _('Block') }}</th>
             </tr>
-            {% endif %}
+        {% for (categ,search_engines) in categs %}
+            {% for search_engine in search_engines %}
+
+                {% if not search_engine.private %}
+                <tr>
+                    <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td>
+                    <td>{{ _(categ) }}</td>
+                    <td class="engine_checkbox">
+                        <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
+                        <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+                        <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                    </td>
+                </tr>
+                {% endif %}
+            {% endfor %}
         {% endfor %}
-    {% endfor %}
-    </table>
+        </table>
     </fieldset>
     <p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }}
-    <br />
-    {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
+        <br />
+        {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }}
     </p>
 
     <input type="submit" value="{{ _('save') }}" />
-	<div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
+    <div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
     </form>    
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file