From 096ffd0659ea93a1de0009e37e49f71d576d2de6 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 18 Jan 2015 12:00:38 +0100
Subject: [enh] add new bootstrap-themes to oscar-template

---
 searx/templates/oscar/base.html        |  6 +++++-
 searx/templates/oscar/preferences.html | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 42cd4e9a7..c39de0460 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -10,7 +10,11 @@
     {% block meta %}{% endblock %}
     <title>{% block title %}{% endblock %}searx</title>
     
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
+    {% if bootstrap_theme == 'default' %}
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
+    {% else %}
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.' + bootstrap_theme + '.min.css') }}" type="text/css" />
+    {% endif %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />  
     <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
 
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 1a885f6cc..352c7d551 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -9,6 +9,7 @@
     <!-- Nav tabs -->
     <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_template" role="tab" data-toggle="tab">{{ _('Template features') }}</a></li>
       <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
     </ul>
 
@@ -96,6 +97,28 @@
             </div>
             </fieldset>
         </div>
+        
+        <div class="tab-pane active_if_nojs" id="tab_template">
+            <noscript>
+                <h3>{{ _('Template features') }}</h3>
+            </noscript>
+        
+            <fieldset>
+            <div class="container-fluid">
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('bootstrap theme') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" name='bootstrap_theme'>
+                            {% for b_theme in bootstrap_themes %}
+                                <option value="{{ b_theme }}" {% if bootstrap_theme == b_theme %}selected="selected"{% endif %}>{{ b_theme }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change style of this layout') }}</span>
+                </div>
+            </div>
+            </fieldset>
+        </div>
         <div class="tab-pane active_if_nojs" id="tab_engine">
 
             <!-- Nav tabs -->
-- 
cgit v1.2.3


From 016a0ffe8a0b97cd89e15e95a1cec5465d9c516e Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 18 Jan 2015 13:03:53 +0100
Subject: [enh] show js warning only if menu can't be used or inside
 preferences

---
 searx/templates/oscar/base.html        | 2 ++
 searx/templates/oscar/preferences.html | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index c39de0460..5a3ba9f42 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -57,7 +57,9 @@
     {% endblock %}
     {% block site_alert_warning_nojs %}
     <noscript>
+        <div class="visible-xs-block">
         {% include 'oscar/messages/js_disabled.html' %}
+        </div>
     </noscript>
     {% endblock %}
     {% block site_alert_info %}
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 352c7d551..14bbace32 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -1,5 +1,10 @@
 {% extends "oscar/base.html" %}
 {% block title %}{{ _('preferences') }} - {% endblock %}
+{% block site_alert_warning_nojs %}
+<noscript>
+    {% include 'oscar/messages/js_disabled.html' %}
+</noscript>
+{% endblock %}
 {% block content %}
 <div>
 
-- 
cgit v1.2.3


From 1f00ce8527c8ca0f6318f4b43b3f79ee1429b70b Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 18 Jan 2015 13:54:24 +0100
Subject: Revert: [enh] add new bootstrap-themes to oscar-template

---
 searx/templates/oscar/base.html        |  6 +-----
 searx/templates/oscar/preferences.html | 23 -----------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 5a3ba9f42..57c4d5593 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -10,11 +10,7 @@
     {% block meta %}{% endblock %}
     <title>{% block title %}{% endblock %}searx</title>
     
-    {% if bootstrap_theme == 'default' %}
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
-    {% else %}
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.' + bootstrap_theme + '.min.css') }}" type="text/css" />
-    {% endif %}
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />  
     <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" />
 
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 14bbace32..f6f14501e 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -14,7 +14,6 @@
     <!-- Nav tabs -->
     <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_template" role="tab" data-toggle="tab">{{ _('Template features') }}</a></li>
       <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
     </ul>
 
@@ -102,28 +101,6 @@
             </div>
             </fieldset>
         </div>
-        
-        <div class="tab-pane active_if_nojs" id="tab_template">
-            <noscript>
-                <h3>{{ _('Template features') }}</h3>
-            </noscript>
-        
-            <fieldset>
-            <div class="container-fluid">
-                <div class="row form-group">
-                    <label class="col-sm-3 col-md-2">{{ _('bootstrap theme') }}</label>
-                    <div class="col-sm-4 col-md-4">
-                        <select class="form-control" name='bootstrap_theme'>
-                            {% for b_theme in bootstrap_themes %}
-                                <option value="{{ b_theme }}" {% if bootstrap_theme == b_theme %}selected="selected"{% endif %}>{{ b_theme }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change style of this layout') }}</span>
-                </div>
-            </div>
-            </fieldset>
-        </div>
         <div class="tab-pane active_if_nojs" id="tab_engine">
 
             <!-- Nav tabs -->
-- 
cgit v1.2.3