From a0293d6196c708e3a79cbb2a099a46caab7e58c7 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 28 Dec 2014 15:07:11 +0100
Subject: [PATCH] [enh] move favicons into own directory

---
 .../courgette/img/{ => icons}/icon_dailymotion.ico  | Bin
 .../courgette/img/{ => icons}/icon_deviantart.ico   | Bin
 .../courgette/img/{ => icons}/icon_github.ico       | Bin
 .../courgette/img/{ => icons}/icon_kickass.ico      | Bin
 .../courgette/img/{ => icons}/icon_soundcloud.ico   | Bin
 .../img/{ => icons}/icon_stackoverflow.ico          | Bin
 .../courgette/img/{ => icons}/icon_twitter.ico      | Bin
 .../static/courgette/img/{ => icons}/icon_vimeo.ico | Bin
 .../courgette/img/{ => icons}/icon_wikipedia.ico    | Bin
 .../courgette/img/{ => icons}/icon_youtube.ico      | Bin
 .../default/img/{ => icons}/icon_dailymotion.ico    | Bin
 .../default/img/{ => icons}/icon_deviantart.ico     | Bin
 .../static/default/img/{ => icons}/icon_github.ico  | Bin
 .../static/default/img/{ => icons}/icon_kickass.ico | Bin
 .../default/img/{ => icons}/icon_soundcloud.ico     | Bin
 .../default/img/{ => icons}/icon_stackoverflow.ico  | Bin
 .../static/default/img/{ => icons}/icon_twitter.ico | Bin
 searx/static/default/img/{ => icons}/icon_vimeo.ico | Bin
 .../default/img/{ => icons}/icon_wikipedia.ico      | Bin
 .../static/default/img/{ => icons}/icon_youtube.ico | Bin
 .../courgette/result_templates/default.html         |   2 +-
 searx/templates/courgette/result_templates/map.html |   2 +-
 .../courgette/result_templates/videos.html          |   2 +-
 .../templates/default/result_templates/default.html |   2 +-
 searx/templates/default/result_templates/map.html   |   2 +-
 .../templates/default/result_templates/videos.html  |   2 +-
 searx/webapp.py                                     |   2 +-
 27 files changed, 7 insertions(+), 7 deletions(-)
 rename searx/static/courgette/img/{ => icons}/icon_dailymotion.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_deviantart.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_github.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_kickass.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_soundcloud.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_stackoverflow.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_twitter.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_vimeo.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_wikipedia.ico (100%)
 rename searx/static/courgette/img/{ => icons}/icon_youtube.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_dailymotion.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_deviantart.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_github.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_kickass.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_soundcloud.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_stackoverflow.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_twitter.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_vimeo.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_wikipedia.ico (100%)
 rename searx/static/default/img/{ => icons}/icon_youtube.ico (100%)

diff --git a/searx/static/courgette/img/icon_dailymotion.ico b/searx/static/courgette/img/icons/icon_dailymotion.ico
similarity index 100%
rename from searx/static/courgette/img/icon_dailymotion.ico
rename to searx/static/courgette/img/icons/icon_dailymotion.ico
diff --git a/searx/static/courgette/img/icon_deviantart.ico b/searx/static/courgette/img/icons/icon_deviantart.ico
similarity index 100%
rename from searx/static/courgette/img/icon_deviantart.ico
rename to searx/static/courgette/img/icons/icon_deviantart.ico
diff --git a/searx/static/courgette/img/icon_github.ico b/searx/static/courgette/img/icons/icon_github.ico
similarity index 100%
rename from searx/static/courgette/img/icon_github.ico
rename to searx/static/courgette/img/icons/icon_github.ico
diff --git a/searx/static/courgette/img/icon_kickass.ico b/searx/static/courgette/img/icons/icon_kickass.ico
similarity index 100%
rename from searx/static/courgette/img/icon_kickass.ico
rename to searx/static/courgette/img/icons/icon_kickass.ico
diff --git a/searx/static/courgette/img/icon_soundcloud.ico b/searx/static/courgette/img/icons/icon_soundcloud.ico
similarity index 100%
rename from searx/static/courgette/img/icon_soundcloud.ico
rename to searx/static/courgette/img/icons/icon_soundcloud.ico
diff --git a/searx/static/courgette/img/icon_stackoverflow.ico b/searx/static/courgette/img/icons/icon_stackoverflow.ico
similarity index 100%
rename from searx/static/courgette/img/icon_stackoverflow.ico
rename to searx/static/courgette/img/icons/icon_stackoverflow.ico
diff --git a/searx/static/courgette/img/icon_twitter.ico b/searx/static/courgette/img/icons/icon_twitter.ico
similarity index 100%
rename from searx/static/courgette/img/icon_twitter.ico
rename to searx/static/courgette/img/icons/icon_twitter.ico
diff --git a/searx/static/courgette/img/icon_vimeo.ico b/searx/static/courgette/img/icons/icon_vimeo.ico
similarity index 100%
rename from searx/static/courgette/img/icon_vimeo.ico
rename to searx/static/courgette/img/icons/icon_vimeo.ico
diff --git a/searx/static/courgette/img/icon_wikipedia.ico b/searx/static/courgette/img/icons/icon_wikipedia.ico
similarity index 100%
rename from searx/static/courgette/img/icon_wikipedia.ico
rename to searx/static/courgette/img/icons/icon_wikipedia.ico
diff --git a/searx/static/courgette/img/icon_youtube.ico b/searx/static/courgette/img/icons/icon_youtube.ico
similarity index 100%
rename from searx/static/courgette/img/icon_youtube.ico
rename to searx/static/courgette/img/icons/icon_youtube.ico
diff --git a/searx/static/default/img/icon_dailymotion.ico b/searx/static/default/img/icons/icon_dailymotion.ico
similarity index 100%
rename from searx/static/default/img/icon_dailymotion.ico
rename to searx/static/default/img/icons/icon_dailymotion.ico
diff --git a/searx/static/default/img/icon_deviantart.ico b/searx/static/default/img/icons/icon_deviantart.ico
similarity index 100%
rename from searx/static/default/img/icon_deviantart.ico
rename to searx/static/default/img/icons/icon_deviantart.ico
diff --git a/searx/static/default/img/icon_github.ico b/searx/static/default/img/icons/icon_github.ico
similarity index 100%
rename from searx/static/default/img/icon_github.ico
rename to searx/static/default/img/icons/icon_github.ico
diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/default/img/icons/icon_kickass.ico
similarity index 100%
rename from searx/static/default/img/icon_kickass.ico
rename to searx/static/default/img/icons/icon_kickass.ico
diff --git a/searx/static/default/img/icon_soundcloud.ico b/searx/static/default/img/icons/icon_soundcloud.ico
similarity index 100%
rename from searx/static/default/img/icon_soundcloud.ico
rename to searx/static/default/img/icons/icon_soundcloud.ico
diff --git a/searx/static/default/img/icon_stackoverflow.ico b/searx/static/default/img/icons/icon_stackoverflow.ico
similarity index 100%
rename from searx/static/default/img/icon_stackoverflow.ico
rename to searx/static/default/img/icons/icon_stackoverflow.ico
diff --git a/searx/static/default/img/icon_twitter.ico b/searx/static/default/img/icons/icon_twitter.ico
similarity index 100%
rename from searx/static/default/img/icon_twitter.ico
rename to searx/static/default/img/icons/icon_twitter.ico
diff --git a/searx/static/default/img/icon_vimeo.ico b/searx/static/default/img/icons/icon_vimeo.ico
similarity index 100%
rename from searx/static/default/img/icon_vimeo.ico
rename to searx/static/default/img/icons/icon_vimeo.ico
diff --git a/searx/static/default/img/icon_wikipedia.ico b/searx/static/default/img/icons/icon_wikipedia.ico
similarity index 100%
rename from searx/static/default/img/icon_wikipedia.ico
rename to searx/static/default/img/icons/icon_wikipedia.ico
diff --git a/searx/static/default/img/icon_youtube.ico b/searx/static/default/img/icons/icon_youtube.ico
similarity index 100%
rename from searx/static/default/img/icon_youtube.ico
rename to searx/static/default/img/icons/icon_youtube.ico
diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html
index 3e93eee73..b46f95e9f 100644
--- a/searx/templates/courgette/result_templates/default.html
+++ b/searx/templates/courgette/result_templates/default.html
@@ -1,7 +1,7 @@
 <div class="result {{ result.class }}">
 
   {% if "icon_"~result.engine~".ico" in favicons %}
-    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
   {% endif %}
 
   <div>
diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html
index 3e93eee73..b46f95e9f 100644
--- a/searx/templates/courgette/result_templates/map.html
+++ b/searx/templates/courgette/result_templates/map.html
@@ -1,7 +1,7 @@
 <div class="result {{ result.class }}">
 
   {% if "icon_"~result.engine~".ico" in favicons %}
-    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
   {% endif %}
 
   <div>
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html
index 2694a9101..7b8bf6653 100644
--- a/searx/templates/courgette/result_templates/videos.html
+++ b/searx/templates/courgette/result_templates/videos.html
@@ -1,6 +1,6 @@
 <div class="result">
   {% if "icon_"~result.engine~".ico" in favicons %}
-    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
   {% endif %}
 
       <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html
index 0f3e3e6d8..73e9af1a9 100644
--- a/searx/templates/default/result_templates/default.html
+++ b/searx/templates/default/result_templates/default.html
@@ -1,5 +1,5 @@
 <div class="result {{ result.class }}">
-    <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
     {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
     <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html
index f9ba7dcf6..d361ddb01 100644
--- a/searx/templates/default/result_templates/map.html
+++ b/searx/templates/default/result_templates/map.html
@@ -1,7 +1,7 @@
 <div class="result {{ result.class }}">
 
   {% if "icon_"~result.engine~".ico" in favicons %}
-    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
+    <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
   {% endif %}
 
   <div>
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html
index 16b2d5f30..08575e847 100644
--- a/searx/templates/default/result_templates/videos.html
+++ b/searx/templates/default/result_templates/videos.html
@@ -1,5 +1,5 @@
 <div class="result">
-      <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+      <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
       {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
       <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
       <p class="url">{{ result.url }}</p>
diff --git a/searx/webapp.py b/searx/webapp.py
index 8d1676808..be7feee82 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -68,7 +68,7 @@ babel = Babel(app)
 global_favicons = []
 for indice, theme in enumerate(themes):
     global_favicons.append([])
-    theme_img_path = searx_dir+"/static/"+theme+"/img/"
+    theme_img_path = searx_dir+"/static/"+theme+"/img/icons/"
     for (dirpath, dirnames, filenames) in os.walk(theme_img_path):
         global_favicons[indice].extend(filenames)