From 30695265c26a79864df982e717fb35811943b98a Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Thu, 26 Jan 2017 21:12:41 +0100
Subject: [enh] search input design mods according to #226

---
 searx/templates/oscar/advanced.html   | 12 +++++++++---
 searx/templates/oscar/languages.html  |  2 +-
 searx/templates/oscar/results.html    |  2 +-
 searx/templates/oscar/search.html     | 18 +++++++++++++++---
 searx/templates/oscar/time-range.html |  2 +-
 5 files changed, 27 insertions(+), 9 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/advanced.html b/searx/templates/oscar/advanced.html
index b4a054a11..95d99ba6a 100644
--- a/searx/templates/oscar/advanced.html
+++ b/searx/templates/oscar/advanced.html
@@ -4,7 +4,13 @@
     {{ _('Advanced settings') }}
 </label>
 <div id="advanced-search-container">
-    {% include 'oscar/categories.html' %}
-    {% include 'oscar/time-range.html' %}
-    {% include 'oscar/languages.html' %}
+  {% include 'oscar/categories.html' %}
+  <div class="row">
+    <div class="col-xs-6">
+      {% include 'oscar/time-range.html' %}
+    </div>
+    <div class="col-xs-6">
+      {% include 'oscar/languages.html' %}
+    </div>
+  </div>
 </div>
diff --git a/searx/templates/oscar/languages.html b/searx/templates/oscar/languages.html
index 03df06823..96c1c3a9c 100644
--- a/searx/templates/oscar/languages.html
+++ b/searx/templates/oscar/languages.html
@@ -1,7 +1,7 @@
 {% if preferences %}
 <select class="form-control" name='language'>
 {% else %}
-<select class="time_range" id='language' name='language'>
+<select class="time_range custom-select form-control" id='language' name='language'>
 {% endif %}
 	<option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>
 		{% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %}
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 11c950b9e..b32dc7734 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -11,10 +11,10 @@
 {% block title %}{{ q|e }} - {% endblock %}
 {% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q|e }}" href="{{ search_url() }}&amp;format=rss">{% endblock %}
 {% block content %}
+    {% include 'oscar/search.html' %}
     <div class="row">
         <div class="col-sm-8" id="main_results">
             <h1 class="sr-only">{{ _('Search results') }}</h1>
-            {% include 'oscar/search.html' %}
 
             {% if corrections %}
             <div class="result">
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
index 6a3b2d294..59ee4688d 100644
--- a/searx/templates/oscar/search.html
+++ b/searx/templates/oscar/search.html
@@ -1,12 +1,24 @@
 {% from 'oscar/macros.html' import icon %}
 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form" role="search">
-    <div class="input-group col-sm-12">
+  <div class="row">
+    <div class="col-xs-12 col-md-8">
+      <div class="input-group search-margin">
         <input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}">
         <span class="input-group-btn">
             <button type="submit" class="btn btn-default"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
         </span>
+      </div>
     </div>
-    <div class="input-group col-sm-12 advanced">
-        {% include 'oscar/advanced.html' %}
+    <div class="col-xs-6 col-md-2 search-margin">
+        {% include 'oscar/time-range.html' %}
     </div>
+    <div class="col-xs-6 col-md-2 search-margin">
+        {% include 'oscar/languages.html' %}
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-sm-12">
+        {% include 'oscar/categories.html' %}
+    </div>
+  </div>
 </form><!-- / #search_form_full -->
diff --git a/searx/templates/oscar/time-range.html b/searx/templates/oscar/time-range.html
index 6ce1b91cb..d5efe9182 100644
--- a/searx/templates/oscar/time-range.html
+++ b/searx/templates/oscar/time-range.html
@@ -1,4 +1,4 @@
-<select name="time_range" id="time-range">
+<select name="time_range" id="time-range" class="custom-select form-control">
     <option id="time-range-anytime" value="" {{ "selected" if time_range=="" or not time_range  else ""}}>
         {{ _('Anytime') }}
     </option>
-- 
cgit v1.2.3