From 7915b5c5a08afbdc8fd2144866e2d5d9f0591696 Mon Sep 17 00:00:00 2001
From: Dalf <alex@al-f.net>
Date: Sun, 5 Jan 2014 20:27:13 +0100
Subject: [mod] web page modification

---
 searx/templates/categories.html |  4 +++-
 searx/templates/results.html    | 26 ++++++++++++++------------
 searx/templates/search.html     |  8 +++-----
 3 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/categories.html b/searx/templates/categories.html
index 4c693f3dd..ec9c2e7d0 100644
--- a/searx/templates/categories.html
+++ b/searx/templates/categories.html
@@ -1,5 +1,7 @@
+<div id="categories">
 {% 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>
+        <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /></label><label for="checkbox_{{ category|replace(' ', '_') }}">{{ category }}</label>
     </div>
 {% endfor %}
+</div>
diff --git a/searx/templates/results.html b/searx/templates/results.html
index c20f2d862..1f3153624 100644
--- a/searx/templates/results.html
+++ b/searx/templates/results.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 {% block title %}{{ q }} - {% endblock %}
 {% block content %}
-<div class="right"><a href="/preferences">preferences</a></div>
-<div class="small">
+<div class="right"><a href="/preferences" id="preferences"><span>preferences</span></a></div>
+<div class="small search">
     {% include 'search.html' %}
 </div>
 <div id="results">
@@ -19,19 +19,21 @@
             {% include 'result_templates/default.html' %}
         {% endif %}
     {% endfor %}
-    <form method="post" action="/">
+    <div id="apis">
+      <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" />
+          <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>
+      <form method="post" action="/">
         <div class="">
-            <input type="hidden" name="q" value="{{ q }}" />
-            <input type="hidden" name="format" value="json" />
-            <input type="submit" value="download results in json" />
+          <input type="hidden" name="q" value="{{ q }}" />
+          <input type="hidden" name="format" value="json" />
+          <input type="submit" value="download results in json" />
         </div>
-    </form>
+      </form>
+    </div>
 </div>
 {% endblock %}
diff --git a/searx/templates/search.html b/searx/templates/search.html
index 12d507335..92ce5a72c 100644
--- a/searx/templates/search.html
+++ b/searx/templates/search.html
@@ -1,9 +1,7 @@
 <form method="post" action="/" id="search_form">
-<div id="search_wrapper">
+  <div id="search_wrapper">
     <input type="text" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
     <input type="submit" value="" id="search_submit" />
-</div>
-    <div>
-    {% include 'categories.html' %}
-    </div>
+  </div>
+  {% include 'categories.html' %}
 </form>
-- 
cgit v1.2.3


From 843342115633c93b2d90c4e1cec2e7cf6d4c0c6b Mon Sep 17 00:00:00 2001
From: Dalf <alex@al-f.net>
Date: Tue, 7 Jan 2014 00:21:08 +0100
Subject: [mod] more web page modification

---
 searx/templates/result_templates/default.html | 3 ++-
 searx/templates/results.html                  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html
index 3b1c448e4..27cf57528 100644
--- a/searx/templates/result_templates/default.html
+++ b/searx/templates/result_templates/default.html
@@ -1,4 +1,5 @@
 <div class="result">
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-    <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}<span class="url">{{ result.pretty_url }}</span></p>
+    <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
+    <p class="url">{{ result.pretty_url }}</p>
 </div>
diff --git a/searx/templates/results.html b/searx/templates/results.html
index 1f3153624..b134c8cf0 100644
--- a/searx/templates/results.html
+++ b/searx/templates/results.html
@@ -7,9 +7,9 @@
 </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"><span>Suggestions: </span>{% 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>
+    <div id ="result_count">
         Number of results: {{ number_of_results }}
     </div>
     {% for result in results %}
-- 
cgit v1.2.3