From 04727a2043025597293fed47392f3b748a654a01 Mon Sep 17 00:00:00 2001
From: dalf <alex@al-f.net>
Date: Tue, 31 Dec 2013 12:58:10 +0100
Subject: [mod] more html5 compliant

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

(limited to 'searx/templates')

diff --git a/searx/templates/results.html b/searx/templates/results.html
index a939bde22..2f018881c 100644
--- a/searx/templates/results.html
+++ b/searx/templates/results.html
@@ -6,7 +6,7 @@
 </div>
 <div id="results">
     {% if suggestions %}
-    <div id="suggestions">Suggestions: {% for suggestion in suggestions %}<form method="post" action=""><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div>
+    <div id="suggestions">Suggestions: {% for suggestion in suggestions %}<form method="post" action="/"><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div>
     {% endif %}
     <div>
         Number of results: {{ number_of_results }}
@@ -18,14 +18,14 @@
             {% include 'result_templates/default.html' %}
         {% endif %}
     {% endfor %}
-    <form method="post" action="">
+    <form method="post" action="/">
         <div class="left">
             <input type="hidden" name="q" value="{{ q }}" />
             <input type="hidden" name="format" value="csv" />
             <input type="submit" value="download results in csv" />
         </div>
     </form>
-    <form method="post" action="">
+    <form method="post" action="/">
         <div class="">
             <input type="hidden" name="q" value="{{ q }}" />
             <input type="hidden" name="format" value="json" />
-- 
cgit v1.2.3


From 4e8b75a0fbddb64e079dfd88658f344fa624f27c Mon Sep 17 00:00:00 2001
From: dalf <alex@al-f.net>
Date: Tue, 31 Dec 2013 13:33:45 +0100
Subject: [mod] the search text input gets the focus automatically

---
 searx/templates/base.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'searx/templates')

diff --git a/searx/templates/base.html b/searx/templates/base.html
index 9aa40297e..8175836ec 100644
--- a/searx/templates/base.html
+++ b/searx/templates/base.html
@@ -18,6 +18,7 @@
 <div id="container">
 {% block content %}
 {% endblock %}
+<script src="/static/js/searx.js" ></script>
 </div>
 </body>
 </html>
-- 
cgit v1.2.3


From a3de9ba56c592b99f2c654c37af0861806a45d1f Mon Sep 17 00:00:00 2001
From: asciimoo <asciimoo@gmail.com>
Date: Wed, 1 Jan 2014 22:16:21 +0100
Subject: [mod] separating categories

---
 searx/templates/categories.html | 5 +++++
 searx/templates/search.html     | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 searx/templates/categories.html

(limited to 'searx/templates')

diff --git a/searx/templates/categories.html b/searx/templates/categories.html
new file mode 100644
index 000000000..4c693f3dd
--- /dev/null
+++ b/searx/templates/categories.html
@@ -0,0 +1,5 @@
+{% for category in categories %}
+    <div class="checkbox_container">
+        <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}" class="cb"></label><label for="checkbox_{{ category|replace(' ', '_') }}">{{ category }}</label>
+    </div>
+{% endfor %}
diff --git a/searx/templates/search.html b/searx/templates/search.html
index 64f0d8f73..51522b45c 100644
--- a/searx/templates/search.html
+++ b/searx/templates/search.html
@@ -4,10 +4,6 @@
     <input type="submit" value="" id="search_submit" />
 </div>
     <div>
-    {% for category in categories %}
-        <div class="checkbox_container">
-            <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}" class="cb"></label><label for="checkbox_{{ category|replace(' ', '_') }}">{{ category }}</label>
-        </div>
-    {% endfor %}
+    {% include 'categories.html' %}
     </div>
 </form>
-- 
cgit v1.2.3


From 2e55e5f0be363fde1fe5a4eac31383f8fecd2d46 Mon Sep 17 00:00:00 2001
From: asciimoo <asciimoo@gmail.com>
Date: Wed, 1 Jan 2014 22:17:10 +0100
Subject: [enh] links to preferences

---
 searx/templates/index.html   | 1 +
 searx/templates/results.html | 1 +
 2 files changed, 2 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/index.html b/searx/templates/index.html
index 4d13b77e7..bdb31e844 100644
--- a/searx/templates/index.html
+++ b/searx/templates/index.html
@@ -6,6 +6,7 @@
     {% include 'search.html' %}
     <p class="top_margin">
         <a href="/about" class="hmarg">about</a>
+        <a href="/preferences" class="hmarg">preferences</a>
     </p>
 </div>
 {% endblock %}
diff --git a/searx/templates/results.html b/searx/templates/results.html
index 2f018881c..c20f2d862 100644
--- a/searx/templates/results.html
+++ b/searx/templates/results.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ q }} - {% endblock %}
 {% block content %}
+<div class="right"><a href="/preferences">preferences</a></div>
 <div class="small">
     {% include 'search.html' %}
 </div>
-- 
cgit v1.2.3


From 41b8478f87a679b3b7bd4ed44b1fadc79d4c7d4e Mon Sep 17 00:00:00 2001
From: asciimoo <asciimoo@gmail.com>
Date: Wed, 1 Jan 2014 22:17:36 +0100
Subject: [fix] preferences template added

---
 searx/templates/preferences.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 searx/templates/preferences.html

(limited to 'searx/templates')

diff --git a/searx/templates/preferences.html b/searx/templates/preferences.html
new file mode 100644
index 000000000..a9769b9c1
--- /dev/null
+++ b/searx/templates/preferences.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% block head %} {% endblock %}
+{% block content %}
+<div class="row">
+    <h2>Preferences</h2>
+
+
+    <fieldset>
+        <legend>Default categories</legend>
+        <form method="post" action="/preferences" id="search_form">
+        <p>
+        {% include 'categories.html' %}
+        </p>
+        <input type="submit" value="save" />
+        </form>
+    </fieldset>
+</div>
+{% endblock %}
-- 
cgit v1.2.3


From fbe5fc3986c91d5dc463b067a2419d92255aed2d Mon Sep 17 00:00:00 2001
From: asciimoo <asciimoo@gmail.com>
Date: Wed, 1 Jan 2014 23:01:59 +0100
Subject: [enh] navigation link

---
 searx/templates/preferences.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'searx/templates')

diff --git a/searx/templates/preferences.html b/searx/templates/preferences.html
index a9769b9c1..705139e58 100644
--- a/searx/templates/preferences.html
+++ b/searx/templates/preferences.html
@@ -14,5 +14,6 @@
         <input type="submit" value="save" />
         </form>
     </fieldset>
+    <div class="right"><a href="/">back</a></div>
 </div>
 {% endblock %}
-- 
cgit v1.2.3