From c21a907cacbbfa8ce8a135362067086063a805f6 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 22 Sep 2014 22:42:29 +0200
Subject: initial commit of the new template 'oscar'

* base.html mostly implemented
* stats.html implemented
* about.html implemented
* most of preferences.html implemented
* using bootstrap.js
---
 searx/templates/oscar/preferences.html | 120 +++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 searx/templates/oscar/preferences.html

(limited to 'searx/templates/oscar/preferences.html')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
new file mode 100644
index 000000000..fa0799b28
--- /dev/null
+++ b/searx/templates/oscar/preferences.html
@@ -0,0 +1,120 @@
+{% extends "oscar/base.html" %}
+{% block content %}
+<div>
+
+    <h1>{{ _('Preferences') }}</h1>
+    <form method="post" action="{{ url_for('preferences') }}" id="search_form">
+
+    <!-- Nav tabs -->
+    <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
+      <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
+      <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
+    </ul>
+
+    <!-- Tab panes -->
+    <div class="tab-content">
+        <div class="tab-pane active" id="tab_general">
+            <fieldset>
+                <legend>{{ _('Default categories') }}</legend>
+                <p>
+                {% include 'default/categories.html' %}
+                </p>
+            </fieldset>
+
+            <fieldset>
+            <div class="container-fluid">
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Search language') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" 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>
+                    </div>
+                </div>
+                
+                
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Interface language') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" 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>
+                    </div>
+                </div>
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Autocomplete') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        
+                        <select class="form-control" name="autocomplete">
+                            <option value=""> - </option>
+                            {% for backend in autocomplete_backends %}
+                            <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Find stuff as you type') }}</span>
+                </div>
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Method') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" 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>
+                    </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') }}</span>
+                </div>
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Themes') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" name="theme">
+                            {% for name in themes %}
+                            <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change searx layout') }}</span>
+                </div>
+            </div>
+            </fieldset>
+        </div>
+        <div class="tab-pane" id="tab_engine">
+            <fieldset>
+            {% for (categ,search_engines) in categs %}
+                <legend>{{ _(categ) }}</legend>
+                <div class="container-fluid">
+                {% for search_engine in search_engines %}
+                    {% if not search_engine.private %}
+                        <div class="row">
+                            <div class="col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
+                            <div class="col-sm-4 col-md-4">
+                                <div class="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 btn btn-success" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+                                <label class="deny btn btn-danger" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                </div>
+                            </div>
+                        </div>
+                    {% endif %}
+                {% endfor %}
+                </div>
+            {% endfor %}   
+            </fieldset>     
+        </div>
+    </div>
+
+    <p class="text-muted" style="margin:20px 0;">{{ _('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.") }}
+    </p>
+
+    <input type="submit" class="btn btn-primary" value="{{ _('save') }}" />
+	<a href="{{ url_for('index') }}"><div class="btn btn-default">{{ _('back') }}</div></a>
+    </form>    
+</div>
+{% endblock %}
-- 
cgit v1.2.3


From a88ce4bd336e470900d138dcc19af7efaad40573 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 18:26:46 +0200
Subject: little enhancement of oscar template

* improve site-titles
* add message which tell you if no data is availabe yet
---
 searx/templates/oscar/preferences.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'searx/templates/oscar/preferences.html')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index fa0799b28..840e9513a 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -1,4 +1,5 @@
 {% extends "oscar/base.html" %}
+{% block title %}{{ _('preferences') }} - {% endblock %}
 {% block content %}
 <div>
 
-- 
cgit v1.2.3


From 8c6e63402ae304fc4aa889911ee20f48ea4d9a09 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 20:12:46 +0200
Subject: add more tooltips to preferences

---
 searx/templates/oscar/preferences.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'searx/templates/oscar/preferences.html')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 840e9513a..d0bbbc820 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -34,6 +34,7 @@
                             {% endfor %}
                         </select>
                     </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('What language do you prefer for search?') }}</span>
                 </div>
                 
                 
@@ -46,6 +47,7 @@
                             {% endfor %}
                         </select>
                     </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change the language of the layout') }}</span>
                 </div>
                 <div class="row form-group">
                     <label class="col-sm-3 col-md-2">{{ _('Autocomplete') }}</label>
-- 
cgit v1.2.3


From afcfa04e30af048c63d12bdbe3e281582a917b91 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 21:18:45 +0200
Subject: oscar template: improve style for check and uncheck of engines

---
 searx/templates/oscar/preferences.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'searx/templates/oscar/preferences.html')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index d0bbbc820..38f874e51 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -97,9 +97,9 @@
                             <div class="col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
                             <div class="col-sm-4 col-md-4">
                                 <div class="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 btn btn-success" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
-                                <label class="deny btn btn-danger" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                <input class="hidden" 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="btn btn-success label_hide_if_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
                                 </div>
                             </div>
                         </div>
-- 
cgit v1.2.3


From 5568fbd89d9c0f8c7f6530c6f0826a35d01c83a8 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 21:43:12 +0200
Subject: oscar template: using tab to seperate engines in preferences

---
 searx/templates/oscar/preferences.html | 49 +++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 18 deletions(-)

(limited to 'searx/templates/oscar/preferences.html')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 38f874e51..6803a02e5 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -87,27 +87,40 @@
             </fieldset>
         </div>
         <div class="tab-pane" id="tab_engine">
-            <fieldset>
-            {% for (categ,search_engines) in categs %}
-                <legend>{{ _(categ) }}</legend>
-                <div class="container-fluid">
-                {% for search_engine in search_engines %}
-                    {% if not search_engine.private %}
-                        <div class="row">
-                            <div class="col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
-                            <div class="col-sm-4 col-md-4">
-                                <div class="checkbox">
-                                <input class="hidden" 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="btn btn-success label_hide_if_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
-                                <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+        
+            <!-- Nav tabs -->
+            <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
+                {% for (categ,search_engines) in categs %}
+                <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
+                {% endfor %}
+            </ul>
+        
+        
+            <!-- Tab panes -->
+            <div class="tab-content">
+                {% for (categ,search_engines) in categs %}
+                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '') }}">
+                    <div class="container-fluid">
+                    <fieldset>
+                    {% for search_engine in search_engines %}
+                        {% if not search_engine.private %}
+                            <div class="row">
+                                <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
+                                <div class="col-xs-6 col-sm-4 col-md-4">
+                                    <div class="checkbox">
+                                    <input class="hidden" 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="btn btn-success label_hide_if_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                    <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    {% endif %}
-                {% endfor %}
+                        {% endif %}
+                    {% endfor %}
+                    </fieldset>
+                    </div>
                 </div>
-            {% endfor %}   
-            </fieldset>     
+                {% endfor %}
+            </div>
         </div>
     </div>
 
-- 
cgit v1.2.3


From 25919de6084599c3196622ed1c89648b2c11f78a Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 22:43:54 +0200
Subject: oscar template: make the categories clickable

---
 searx/templates/oscar/preferences.html | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'searx/templates/oscar/preferences.html')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 6803a02e5..3d66d1963 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -15,15 +15,14 @@
     <!-- Tab panes -->
     <div class="tab-content">
         <div class="tab-pane active" id="tab_general">
-            <fieldset>
-                <legend>{{ _('Default categories') }}</legend>
-                <p>
-                {% include 'default/categories.html' %}
-                </p>
-            </fieldset>
-
             <fieldset>
             <div class="container-fluid">
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                    <div class="col-sm-11 col-md-10">
+                        {% include 'oscar/categories.html' %}
+                    </div>
+                </div>
                 <div class="row form-group">
                     <label class="col-sm-3 col-md-2">{{ _('Search language') }}</label>
                     <div class="col-sm-4 col-md-4">
@@ -36,8 +35,6 @@
                     </div>
                     <span class="col-sm-5 col-md-6 help-block">{{ _('What language do you prefer for search?') }}</span>
                 </div>
-                
-                
                 <div class="row form-group">
                     <label class="col-sm-3 col-md-2">{{ _('Interface language') }}</label>
                     <div class="col-sm-4 col-md-4">
@@ -91,7 +88,7 @@
             <!-- Nav tabs -->
             <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
                 {% for (categ,search_engines) in categs %}
-                <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
+                <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
                 {% endfor %}
             </ul>
         
@@ -99,7 +96,7 @@
             <!-- Tab panes -->
             <div class="tab-content">
                 {% for (categ,search_engines) in categs %}
-                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '') }}">
+                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '_') }}">
                     <div class="container-fluid">
                     <fieldset>
                     {% for search_engine in search_engines %}
-- 
cgit v1.2.3


From 25312c53e170deb55bd48029e3b76b87692e1911 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 3 Nov 2014 22:18:40 +0100
Subject: [enh] add no-js support

* image results have url, which can be clicked
* preferences full functionable without js
---
 searx/templates/oscar/preferences.html | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'searx/templates/oscar/preferences.html')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 3d66d1963..2868adecc 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -7,12 +7,15 @@
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
+    <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;">
       <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
       <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
     </ul>
 
     <!-- Tab panes -->
+    <noscript>
+        <h3>{{ _('General') }}</h3>
+    </noscript>
     <div class="tab-content">
         <div class="tab-pane active" id="tab_general">
             <fieldset>
@@ -83,20 +86,25 @@
             </div>
             </fieldset>
         </div>
-        <div class="tab-pane" id="tab_engine">
+        <div class="tab-pane active_if_nojs" id="tab_engine">
         
             <!-- Nav tabs -->
-            <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
+            <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;">
                 {% for (categ,search_engines) in categs %}
                 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
                 {% endfor %}
             </ul>
         
+            <noscript>
+                <h3>{{ _('Engines') }}</h3>
+            </noscript>
         
             <!-- Tab panes -->
             <div class="tab-content">
                 {% for (categ,search_engines) in categs %}
-                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '_') }}">
+                <noscript><label>{{ _(categ) }}</label>
+                </noscript>
+                <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
                     <div class="container-fluid">
                     <fieldset>
                     {% for search_engine in search_engines %}
-- 
cgit v1.2.3