From 9782633054129fd28a3e785f293b0b34649a3550 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Tue, 1 Nov 2016 23:11:38 +0100
Subject: [PATCH] [fix] menu without js - closes #747

---
 .../static/themes/oscar/css/logicodev.min.css | Bin 10116 -> 10469 bytes
 .../themes/oscar/less/logicodev/navbar.less   |  37 +++++++++++++++-
 searx/templates/oscar/about.html              |   1 -
 searx/templates/oscar/base.html               |   7 ---
 searx/templates/oscar/categories.html         |   1 -
 .../templates/oscar/messages/js_disabled.html |   4 --
 searx/templates/oscar/navbar.html             |  40 +++---------------
 searx/templates/oscar/preferences.html        |   5 ---
 8 files changed, 43 insertions(+), 52 deletions(-)
 delete mode 100644 searx/templates/oscar/messages/js_disabled.html

diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css
index bd58aa5b07f3e20e2546d86847e9829e5b2e69e1..33d451b8f1b712e5bd5d8f106b4d1deb13fa6da8 100644
GIT binary patch
delta 356
zcmYk0VM@d>5QXWwcmfYlTtNg|S}9#j?x2V#$ZjUxfpk*RR91uRA8+7AgguczyoXJ-
z-R8$5dGDKf`FQ+!`nrtHZ_^s6`;4wHj%Bo*-ZzWqF`~uyVSs!sY=y)!-Uum?s&F$c
zIyA(@rZu{Az@2GW(d_xgSP8aA-V!7UdzNS8;XA-;=U9>ToJN9VX1otwai{&M<uEo+
zVXX0#$7u;Q9~rK+5sqn4u3z4|q;;<v7#V{3cr5(ZXk*z*mFixJd6tT;!xxy4e3j*L
bEsH-UvElcAP<99PzZ(jDkl-C3&dRG_)3SXA

delta 25
hcmaDF*y6uIiE*<AqXgsRa3-h8Ynd)@-oRq20swbJ2-N@p

diff --git a/searx/static/themes/oscar/less/logicodev/navbar.less b/searx/static/themes/oscar/less/logicodev/navbar.less
index 2426210ca..411fd63c6 100644
--- a/searx/static/themes/oscar/less/logicodev/navbar.less
+++ b/searx/static/themes/oscar/less/logicodev/navbar.less
@@ -15,7 +15,7 @@
     line-height: 30px;
 }
 
-.navbar, .navbar-default{
+.navbar, .navbar-default, .menu {
     background-color: @black;
     border: none;
     border-top: 4px solid @light-green;
@@ -52,3 +52,38 @@
 .navbar-toggle {
     margin-top: 0;
 }
+
+.menu {
+    margin: 0;
+    padding: 0;
+    position: absolute;
+    top: 4px;
+    border: 0;
+    z-index: 1000000000;
+    height: 40px;
+    line-height: 40px;
+    ul {
+        padding: 0;
+        margin: 0;
+        li {
+            padding: 0 0.6em;
+            margin: 0;
+            float: left;
+            list-style: none;
+            a {
+                color: @dim-gray;
+            }
+        }
+        li.active a {
+            color: @light-green;
+        }
+    }
+}
+
+.menu-right {
+    right: 2em;
+}
+
+.menu-left {
+    left: 2em;
+}
diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html
index 743d48074..673738172 100644
--- a/searx/templates/oscar/about.html
+++ b/searx/templates/oscar/about.html
@@ -1,5 +1,4 @@
 {% extends "oscar/base.html" %}
-{% block site_alert_warning_nojs %} {% endblock %}
 {% block title %}{{ _('about') }} - {% endblock %}
 {% block content %}
 <div{% if rtl %} dir="ltr"{% endif %}>
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index d3170d622..81d4febcf 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -59,13 +59,6 @@
     {% endblock %}
     {% block site_alert_warning %}
     {% 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 %}
     {% endblock %}
     {% block site_alert_success %}
diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html
index 241d262ea..1ace10f16 100644
--- a/searx/templates/oscar/categories.html
+++ b/searx/templates/oscar/categories.html
@@ -3,7 +3,6 @@
     {% for category in categories | reverse %}
         <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
         <label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label>
-        </label>
     {% endfor %}
 {% else %}
     {% for category in categories %}
diff --git a/searx/templates/oscar/messages/js_disabled.html b/searx/templates/oscar/messages/js_disabled.html
deleted file mode 100644
index 8baaf1e4c..000000000
--- a/searx/templates/oscar/messages/js_disabled.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="alert alert-warning" role="alert">
-    <strong class="lead">{{ _('Warning!') }}</strong>
-    {{ _('Please enable JavaScript to use full functionality of this site.') }}
-</div>
diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html
index c59bcda3d..d12de7dab 100644
--- a/searx/templates/oscar/navbar.html
+++ b/searx/templates/oscar/navbar.html
@@ -1,40 +1,14 @@
 <!-- Static navbar -->
 <div class="navbar navbar-default" role="navigation">
     <div class="container-fluid">
-        {% if rtl %}
-        <div class="navbar-collapse collapse navbar-left">
-            <ul class="nav navbar-nav navbar-left"> <!-- results.html -->
-                <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li>
-                <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li>
-                <li{% if template_name == 'index.html' %} class="active"{% endif %}><a href="{{ url_for('index') }}" class="hmarg">{{ _('home') }}</a></li>
-            </ul>
-        </div>
-        <div class="navbar-header navbar-right">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="sr-only">{{ _('Toggle navigation') }}</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
+        <div class="navbar-header{% if rtl %} navbar-right{% endif %}">
             <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
         </div>
-        {% else %}
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="sr-only">{{ _('Toggle navigation') }}</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
-        </div>
-        <div class="navbar-collapse collapse">
-            <ul class="nav navbar-nav navbar-right"> <!-- results.html -->
-                <li{% if template_name == 'index.html' %} class="active"{% endif %}><a href="{{ url_for('index') }}" class="hmarg">{{ _('home') }}</a></li>
-                <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li>
-                <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li>
-            </ul>
-        </div><!--/.nav-collapse -->
-        {% endif %}
     </div><!--/.container-fluid -->
 </div>
+<div class="menu menu-{% if rtl %}left{% else %}right{% endif %}">
+    <ul> <!-- results.html -->
+        <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li>
+        <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li>
+    </ul>
+</div><!--/.nav-collapse -->
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 85e90d17d..ed790c56a 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -1,11 +1,6 @@
 {% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle %}
 {% 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>