From a0293d6196c708e3a79cbb2a099a46caab7e58c7 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sun, 28 Dec 2014 15:07:11 +0100 Subject: [enh] move favicons into own directory --- searx/static/courgette/img/icon_dailymotion.ico | Bin 4286 -> 0 bytes searx/static/courgette/img/icon_deviantart.ico | Bin 4286 -> 0 bytes searx/static/courgette/img/icon_github.ico | Bin 6518 -> 0 bytes searx/static/courgette/img/icon_kickass.ico | Bin 1150 -> 0 bytes searx/static/courgette/img/icon_soundcloud.ico | Bin 1150 -> 0 bytes searx/static/courgette/img/icon_stackoverflow.ico | Bin 1150 -> 0 bytes searx/static/courgette/img/icon_twitter.ico | Bin 1150 -> 0 bytes searx/static/courgette/img/icon_vimeo.ico | Bin 6518 -> 0 bytes searx/static/courgette/img/icon_wikipedia.ico | Bin 14858 -> 0 bytes searx/static/courgette/img/icon_youtube.ico | Bin 1150 -> 0 bytes searx/static/courgette/img/icons/icon_dailymotion.ico | Bin 0 -> 4286 bytes searx/static/courgette/img/icons/icon_deviantart.ico | Bin 0 -> 4286 bytes searx/static/courgette/img/icons/icon_github.ico | Bin 0 -> 6518 bytes searx/static/courgette/img/icons/icon_kickass.ico | Bin 0 -> 1150 bytes searx/static/courgette/img/icons/icon_soundcloud.ico | Bin 0 -> 1150 bytes searx/static/courgette/img/icons/icon_stackoverflow.ico | Bin 0 -> 1150 bytes searx/static/courgette/img/icons/icon_twitter.ico | Bin 0 -> 1150 bytes searx/static/courgette/img/icons/icon_vimeo.ico | Bin 0 -> 6518 bytes searx/static/courgette/img/icons/icon_wikipedia.ico | Bin 0 -> 14858 bytes searx/static/courgette/img/icons/icon_youtube.ico | Bin 0 -> 1150 bytes searx/static/default/img/icon_dailymotion.ico | Bin 4286 -> 0 bytes searx/static/default/img/icon_deviantart.ico | Bin 4286 -> 0 bytes searx/static/default/img/icon_github.ico | Bin 6518 -> 0 bytes searx/static/default/img/icon_kickass.ico | Bin 1150 -> 0 bytes searx/static/default/img/icon_soundcloud.ico | Bin 1150 -> 0 bytes searx/static/default/img/icon_stackoverflow.ico | Bin 1150 -> 0 bytes searx/static/default/img/icon_twitter.ico | Bin 1150 -> 0 bytes searx/static/default/img/icon_vimeo.ico | Bin 6518 -> 0 bytes searx/static/default/img/icon_wikipedia.ico | Bin 14858 -> 0 bytes searx/static/default/img/icon_youtube.ico | Bin 1150 -> 0 bytes searx/static/default/img/icons/icon_dailymotion.ico | Bin 0 -> 4286 bytes searx/static/default/img/icons/icon_deviantart.ico | Bin 0 -> 4286 bytes searx/static/default/img/icons/icon_github.ico | Bin 0 -> 6518 bytes searx/static/default/img/icons/icon_kickass.ico | Bin 0 -> 1150 bytes searx/static/default/img/icons/icon_soundcloud.ico | Bin 0 -> 1150 bytes searx/static/default/img/icons/icon_stackoverflow.ico | Bin 0 -> 1150 bytes searx/static/default/img/icons/icon_twitter.ico | Bin 0 -> 1150 bytes searx/static/default/img/icons/icon_vimeo.ico | Bin 0 -> 6518 bytes searx/static/default/img/icons/icon_wikipedia.ico | Bin 0 -> 14858 bytes searx/static/default/img/icons/icon_youtube.ico | Bin 0 -> 1150 bytes searx/templates/courgette/result_templates/default.html | 2 +- searx/templates/courgette/result_templates/map.html | 2 +- searx/templates/courgette/result_templates/videos.html | 2 +- searx/templates/default/result_templates/default.html | 2 +- searx/templates/default/result_templates/map.html | 2 +- searx/templates/default/result_templates/videos.html | 2 +- searx/webapp.py | 2 +- 47 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 searx/static/courgette/img/icon_dailymotion.ico delete mode 100644 searx/static/courgette/img/icon_deviantart.ico delete mode 100644 searx/static/courgette/img/icon_github.ico delete mode 100644 searx/static/courgette/img/icon_kickass.ico delete mode 100644 searx/static/courgette/img/icon_soundcloud.ico delete mode 100644 searx/static/courgette/img/icon_stackoverflow.ico delete mode 100644 searx/static/courgette/img/icon_twitter.ico delete mode 100644 searx/static/courgette/img/icon_vimeo.ico delete mode 100644 searx/static/courgette/img/icon_wikipedia.ico delete mode 100644 searx/static/courgette/img/icon_youtube.ico create mode 100644 searx/static/courgette/img/icons/icon_dailymotion.ico create mode 100644 searx/static/courgette/img/icons/icon_deviantart.ico create mode 100644 searx/static/courgette/img/icons/icon_github.ico create mode 100644 searx/static/courgette/img/icons/icon_kickass.ico create mode 100644 searx/static/courgette/img/icons/icon_soundcloud.ico create mode 100644 searx/static/courgette/img/icons/icon_stackoverflow.ico create mode 100644 searx/static/courgette/img/icons/icon_twitter.ico create mode 100644 searx/static/courgette/img/icons/icon_vimeo.ico create mode 100644 searx/static/courgette/img/icons/icon_wikipedia.ico create mode 100644 searx/static/courgette/img/icons/icon_youtube.ico delete mode 100644 searx/static/default/img/icon_dailymotion.ico delete mode 100644 searx/static/default/img/icon_deviantart.ico delete mode 100644 searx/static/default/img/icon_github.ico delete mode 100644 searx/static/default/img/icon_kickass.ico delete mode 100644 searx/static/default/img/icon_soundcloud.ico delete mode 100644 searx/static/default/img/icon_stackoverflow.ico delete mode 100644 searx/static/default/img/icon_twitter.ico delete mode 100644 searx/static/default/img/icon_vimeo.ico delete mode 100644 searx/static/default/img/icon_wikipedia.ico delete mode 100644 searx/static/default/img/icon_youtube.ico create mode 100644 searx/static/default/img/icons/icon_dailymotion.ico create mode 100644 searx/static/default/img/icons/icon_deviantart.ico create mode 100644 searx/static/default/img/icons/icon_github.ico create mode 100644 searx/static/default/img/icons/icon_kickass.ico create mode 100644 searx/static/default/img/icons/icon_soundcloud.ico create mode 100644 searx/static/default/img/icons/icon_stackoverflow.ico create mode 100644 searx/static/default/img/icons/icon_twitter.ico create mode 100644 searx/static/default/img/icons/icon_vimeo.ico create mode 100644 searx/static/default/img/icons/icon_wikipedia.ico create mode 100644 searx/static/default/img/icons/icon_youtube.ico diff --git a/searx/static/courgette/img/icon_dailymotion.ico b/searx/static/courgette/img/icon_dailymotion.ico deleted file mode 100644 index b161a57fb..000000000 Binary files a/searx/static/courgette/img/icon_dailymotion.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_deviantart.ico b/searx/static/courgette/img/icon_deviantart.ico deleted file mode 100644 index 26c353325..000000000 Binary files a/searx/static/courgette/img/icon_deviantart.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_github.ico b/searx/static/courgette/img/icon_github.ico deleted file mode 100644 index 133f0ca35..000000000 Binary files a/searx/static/courgette/img/icon_github.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_kickass.ico b/searx/static/courgette/img/icon_kickass.ico deleted file mode 100644 index 4aa2c77a5..000000000 Binary files a/searx/static/courgette/img/icon_kickass.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_soundcloud.ico b/searx/static/courgette/img/icon_soundcloud.ico deleted file mode 100644 index 4130bea1b..000000000 Binary files a/searx/static/courgette/img/icon_soundcloud.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_stackoverflow.ico b/searx/static/courgette/img/icon_stackoverflow.ico deleted file mode 100644 index b2242bc6c..000000000 Binary files a/searx/static/courgette/img/icon_stackoverflow.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_twitter.ico b/searx/static/courgette/img/icon_twitter.ico deleted file mode 100644 index b4a71699a..000000000 Binary files a/searx/static/courgette/img/icon_twitter.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_vimeo.ico b/searx/static/courgette/img/icon_vimeo.ico deleted file mode 100644 index 4fe4336da..000000000 Binary files a/searx/static/courgette/img/icon_vimeo.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_wikipedia.ico b/searx/static/courgette/img/icon_wikipedia.ico deleted file mode 100644 index 911fa76f6..000000000 Binary files a/searx/static/courgette/img/icon_wikipedia.ico and /dev/null differ diff --git a/searx/static/courgette/img/icon_youtube.ico b/searx/static/courgette/img/icon_youtube.ico deleted file mode 100644 index 977887dbb..000000000 Binary files a/searx/static/courgette/img/icon_youtube.ico and /dev/null differ diff --git a/searx/static/courgette/img/icons/icon_dailymotion.ico b/searx/static/courgette/img/icons/icon_dailymotion.ico new file mode 100644 index 000000000..b161a57fb Binary files /dev/null and b/searx/static/courgette/img/icons/icon_dailymotion.ico differ diff --git a/searx/static/courgette/img/icons/icon_deviantart.ico b/searx/static/courgette/img/icons/icon_deviantart.ico new file mode 100644 index 000000000..26c353325 Binary files /dev/null and b/searx/static/courgette/img/icons/icon_deviantart.ico differ diff --git a/searx/static/courgette/img/icons/icon_github.ico b/searx/static/courgette/img/icons/icon_github.ico new file mode 100644 index 000000000..133f0ca35 Binary files /dev/null and b/searx/static/courgette/img/icons/icon_github.ico differ diff --git a/searx/static/courgette/img/icons/icon_kickass.ico b/searx/static/courgette/img/icons/icon_kickass.ico new file mode 100644 index 000000000..4aa2c77a5 Binary files /dev/null and b/searx/static/courgette/img/icons/icon_kickass.ico differ diff --git a/searx/static/courgette/img/icons/icon_soundcloud.ico b/searx/static/courgette/img/icons/icon_soundcloud.ico new file mode 100644 index 000000000..4130bea1b Binary files /dev/null and b/searx/static/courgette/img/icons/icon_soundcloud.ico differ diff --git a/searx/static/courgette/img/icons/icon_stackoverflow.ico b/searx/static/courgette/img/icons/icon_stackoverflow.ico new file mode 100644 index 000000000..b2242bc6c Binary files /dev/null and b/searx/static/courgette/img/icons/icon_stackoverflow.ico differ diff --git a/searx/static/courgette/img/icons/icon_twitter.ico b/searx/static/courgette/img/icons/icon_twitter.ico new file mode 100644 index 000000000..b4a71699a Binary files /dev/null and b/searx/static/courgette/img/icons/icon_twitter.ico differ diff --git a/searx/static/courgette/img/icons/icon_vimeo.ico b/searx/static/courgette/img/icons/icon_vimeo.ico new file mode 100644 index 000000000..4fe4336da Binary files /dev/null and b/searx/static/courgette/img/icons/icon_vimeo.ico differ diff --git a/searx/static/courgette/img/icons/icon_wikipedia.ico b/searx/static/courgette/img/icons/icon_wikipedia.ico new file mode 100644 index 000000000..911fa76f6 Binary files /dev/null and b/searx/static/courgette/img/icons/icon_wikipedia.ico differ diff --git a/searx/static/courgette/img/icons/icon_youtube.ico b/searx/static/courgette/img/icons/icon_youtube.ico new file mode 100644 index 000000000..977887dbb Binary files /dev/null and b/searx/static/courgette/img/icons/icon_youtube.ico differ diff --git a/searx/static/default/img/icon_dailymotion.ico b/searx/static/default/img/icon_dailymotion.ico deleted file mode 100644 index b161a57fb..000000000 Binary files a/searx/static/default/img/icon_dailymotion.ico and /dev/null differ diff --git a/searx/static/default/img/icon_deviantart.ico b/searx/static/default/img/icon_deviantart.ico deleted file mode 100644 index 26c353325..000000000 Binary files a/searx/static/default/img/icon_deviantart.ico and /dev/null differ diff --git a/searx/static/default/img/icon_github.ico b/searx/static/default/img/icon_github.ico deleted file mode 100644 index 133f0ca35..000000000 Binary files a/searx/static/default/img/icon_github.ico and /dev/null differ diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/default/img/icon_kickass.ico deleted file mode 100644 index 4aa2c77a5..000000000 Binary files a/searx/static/default/img/icon_kickass.ico and /dev/null differ diff --git a/searx/static/default/img/icon_soundcloud.ico b/searx/static/default/img/icon_soundcloud.ico deleted file mode 100644 index 4130bea1b..000000000 Binary files a/searx/static/default/img/icon_soundcloud.ico and /dev/null differ diff --git a/searx/static/default/img/icon_stackoverflow.ico b/searx/static/default/img/icon_stackoverflow.ico deleted file mode 100644 index b2242bc6c..000000000 Binary files a/searx/static/default/img/icon_stackoverflow.ico and /dev/null differ diff --git a/searx/static/default/img/icon_twitter.ico b/searx/static/default/img/icon_twitter.ico deleted file mode 100644 index b4a71699a..000000000 Binary files a/searx/static/default/img/icon_twitter.ico and /dev/null differ diff --git a/searx/static/default/img/icon_vimeo.ico b/searx/static/default/img/icon_vimeo.ico deleted file mode 100644 index 4fe4336da..000000000 Binary files a/searx/static/default/img/icon_vimeo.ico and /dev/null differ diff --git a/searx/static/default/img/icon_wikipedia.ico b/searx/static/default/img/icon_wikipedia.ico deleted file mode 100644 index 911fa76f6..000000000 Binary files a/searx/static/default/img/icon_wikipedia.ico and /dev/null differ diff --git a/searx/static/default/img/icon_youtube.ico b/searx/static/default/img/icon_youtube.ico deleted file mode 100644 index 977887dbb..000000000 Binary files a/searx/static/default/img/icon_youtube.ico and /dev/null differ diff --git a/searx/static/default/img/icons/icon_dailymotion.ico b/searx/static/default/img/icons/icon_dailymotion.ico new file mode 100644 index 000000000..b161a57fb Binary files /dev/null and b/searx/static/default/img/icons/icon_dailymotion.ico differ diff --git a/searx/static/default/img/icons/icon_deviantart.ico b/searx/static/default/img/icons/icon_deviantart.ico new file mode 100644 index 000000000..26c353325 Binary files /dev/null and b/searx/static/default/img/icons/icon_deviantart.ico differ diff --git a/searx/static/default/img/icons/icon_github.ico b/searx/static/default/img/icons/icon_github.ico new file mode 100644 index 000000000..133f0ca35 Binary files /dev/null and b/searx/static/default/img/icons/icon_github.ico differ diff --git a/searx/static/default/img/icons/icon_kickass.ico b/searx/static/default/img/icons/icon_kickass.ico new file mode 100644 index 000000000..4aa2c77a5 Binary files /dev/null and b/searx/static/default/img/icons/icon_kickass.ico differ diff --git a/searx/static/default/img/icons/icon_soundcloud.ico b/searx/static/default/img/icons/icon_soundcloud.ico new file mode 100644 index 000000000..4130bea1b Binary files /dev/null and b/searx/static/default/img/icons/icon_soundcloud.ico differ diff --git a/searx/static/default/img/icons/icon_stackoverflow.ico b/searx/static/default/img/icons/icon_stackoverflow.ico new file mode 100644 index 000000000..b2242bc6c Binary files /dev/null and b/searx/static/default/img/icons/icon_stackoverflow.ico differ diff --git a/searx/static/default/img/icons/icon_twitter.ico b/searx/static/default/img/icons/icon_twitter.ico new file mode 100644 index 000000000..b4a71699a Binary files /dev/null and b/searx/static/default/img/icons/icon_twitter.ico differ diff --git a/searx/static/default/img/icons/icon_vimeo.ico b/searx/static/default/img/icons/icon_vimeo.ico new file mode 100644 index 000000000..4fe4336da Binary files /dev/null and b/searx/static/default/img/icons/icon_vimeo.ico differ diff --git a/searx/static/default/img/icons/icon_wikipedia.ico b/searx/static/default/img/icons/icon_wikipedia.ico new file mode 100644 index 000000000..911fa76f6 Binary files /dev/null and b/searx/static/default/img/icons/icon_wikipedia.ico differ diff --git a/searx/static/default/img/icons/icon_youtube.ico b/searx/static/default/img/icons/icon_youtube.ico new file mode 100644 index 000000000..977887dbb Binary files /dev/null and b/searx/static/default/img/icons/icon_youtube.ico differ 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 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
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 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
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 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}

{{ result.title|safe }}

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 @@
-

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{{ result.pretty_url }} cached

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

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 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
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 @@
-

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} {{ result.title|striptags }}

{{ result.url }}

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) -- cgit v1.2.3