Merge pull request #70 from matejc/theming_support

add multi theming support

15 files changed, 24 insertions, 14 deletions

diff --git a/searx/templates/about.html b/searx/templates/default/about.html
index 0ddf12254..19aba1905 100644
--- a/searx/templates/about.html
+++ b/searx/templates/default/about.html
@@ -1,6 +1,6 @@
-{% extends 'base.html' %}
+{% extends 'default/base.html' %}
 {% block content %}
-{% include 'github_ribbon.html' %}
+{% include 'default/github_ribbon.html' %}
 <div class="row">
     <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
 
diff --git a/searx/templates/base.html b/searx/templates/default/base.html
index da5ae905f..da5ae905f 100644
--- a/searx/templates/base.html
+++ b/searx/templates/default/base.html
diff --git a/searx/templates/categories.html b/searx/templates/default/categories.html
index 57e63c85d..57e63c85d 100644
--- a/searx/templates/categories.html
+++ b/searx/templates/default/categories.html
diff --git a/searx/templates/github_ribbon.html b/searx/templates/default/github_ribbon.html
index bdd9cf180..bdd9cf180 100644
--- a/searx/templates/github_ribbon.html
+++ b/searx/templates/default/github_ribbon.html
diff --git a/searx/templates/index.html b/searx/templates/default/index.html
index 57b67ef09..43ba88370 100644
--- a/searx/templates/index.html
+++ b/searx/templates/default/index.html
@@ -1,8 +1,8 @@
-{% extends "base.html" %}
+{% extends "default/base.html" %}
 {% block content %}
 <div class="center">
     <div class="title"><h1>searx</h1></div>
-    {% include 'search.html' %}
+    {% include 'default/search.html' %}
     <p class="top_margin">
         <a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a>
         <a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a>
diff --git a/searx/templates/opensearch.xml b/searx/templates/default/opensearch.xml
index f39283f99..f39283f99 100644
--- a/searx/templates/opensearch.xml
+++ b/searx/templates/default/opensearch.xml
diff --git a/searx/templates/opensearch_response_rss.xml b/searx/templates/default/opensearch_response_rss.xml
index 5673eb2e1..5673eb2e1 100644
--- a/searx/templates/opensearch_response_rss.xml
+++ b/searx/templates/default/opensearch_response_rss.xml
diff --git a/searx/templates/preferences.html b/searx/templates/default/preferences.html
index eeb86577f..7d35de7c3 100644
--- a/searx/templates/preferences.html
+++ b/searx/templates/default/preferences.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "default/base.html" %}
 {% block head %} {% endblock %}
 {% block content %}
 <div class="row">
@@ -8,7 +8,7 @@
     <fieldset>
         <legend>{{ _('Default categories') }}</legend>
         <p>
-        {% include 'categories.html' %}
+        {% include 'default/categories.html' %}
         </p>
     </fieldset>
     <fieldset>
@@ -53,6 +53,16 @@
         </p>
     </fieldset>
     <fieldset>
+        <legend>{{ _('Themes') }}</legend>
+        <p>
+        <select name="theme">
+            {% for name in themes %}
+            <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
+            {% endfor %}
+        </select>
+        </p>
+    </fieldset>
+    <fieldset>
     <legend>{{ _('Currently used search engines') }}</legend>
 
     <table>
diff --git a/searx/templates/result_templates/default.html b/searx/templates/default/result_templates/default.html
index e0711b761..734f9066c 100644
--- a/searx/templates/result_templates/default.html
+++ b/searx/templates/default/result_templates/default.html
@@ -1,7 +1,7 @@
 <div class="result {{ result.class }}">
 
   {% if result['favicon'] %}
-    <img width="14" height="14" class="favicon" src="static/img/icon_{{result['favicon']}}.ico" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
   {% endif %}
 
   <div>
diff --git a/searx/templates/result_templates/images.html b/searx/templates/default/result_templates/images.html
index 1f15ff2bb..1f15ff2bb 100644
--- a/searx/templates/result_templates/images.html
+++ b/searx/templates/default/result_templates/images.html
diff --git a/searx/templates/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html
index 6c62793a5..6c62793a5 100644
--- a/searx/templates/result_templates/torrent.html
+++ b/searx/templates/default/result_templates/torrent.html
diff --git a/searx/templates/result_templates/videos.html b/searx/templates/default/result_templates/videos.html
index ab869a6eb..8ceb0b180 100644
--- a/searx/templates/result_templates/videos.html
+++ b/searx/templates/default/result_templates/videos.html
@@ -1,6 +1,6 @@
 <div class="result">
   {% if result['favicon'] %}
-    <img width="14" height="14" class="favicon" src="static/img/icon_{{result['favicon']}}.ico" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
   {% endif %}
 
     <p>
diff --git a/searx/templates/results.html b/searx/templates/default/results.html
index 608cfb20a..d0b53b48a 100644
--- a/searx/templates/results.html
+++ b/searx/templates/default/results.html
@@ -1,9 +1,9 @@
-{% extends "base.html" %}
+{% extends "default/base.html" %}
 {% block title %}{{ q }} - {% endblock %}
 {% block content %}
 <div class="right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
 <div class="small search center">
-    {% include 'search.html' %}
+    {% include 'default/search.html' %}
 </div>
 <div id="results">
     <div id="sidebar">
@@ -43,9 +43,9 @@
 
     {% for result in results %}
         {% if result['template'] %}
-            {% include 'result_templates/'+result['template'] %}
+            {% include 'default/result_templates/'+result['template'] %}
         {% else %}
-            {% include 'result_templates/default.html' %}
+            {% include 'default/result_templates/default.html' %}
         {% endif %}
     {% endfor %}
 
diff --git a/searx/templates/search.html b/searx/templates/default/search.html
index 30d1568cf..8a9965582 100644
--- a/searx/templates/search.html
+++ b/searx/templates/default/search.html
@@ -3,5 +3,5 @@
     <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
     <input type="submit" value="search" id="search_submit" />
   </div>
-  {% include 'categories.html' %}
+  {% include 'default/categories.html' %}
 </form>
diff --git a/searx/templates/stats.html b/searx/templates/default/stats.html
index cb5757b31..70fe98ac7 100644
--- a/searx/templates/stats.html
+++ b/searx/templates/default/stats.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "default/base.html" %}
 {% block head %} {% endblock %}
 {% block content %}
 <h2>{{ _('Engine stats') }}</h2>