oscar template: improve result icons

29 files changed, 13 insertions, 11 deletions

diff --git a/searx/static/courgette/img/icon_dailymotion.ico b/searx/static/courgette/img/icon_dailymotion.ico
new file mode 100644
index 000000000..b161a57fb
--- /dev/null
+++ b/searx/static/courgette/img/icon_dailymotion.ico
diff --git a/searx/static/courgette/img/icon_deviantart.ico b/searx/static/courgette/img/icon_deviantart.ico
new file mode 100644
index 000000000..26c353325
--- /dev/null
+++ b/searx/static/courgette/img/icon_deviantart.ico
diff --git a/searx/static/default/img/icon_dailymotion.ico b/searx/static/default/img/icon_dailymotion.ico
new file mode 100644
index 000000000..b161a57fb
--- /dev/null
+++ b/searx/static/default/img/icon_dailymotion.ico
diff --git a/searx/static/default/img/icon_deviantart.ico b/searx/static/default/img/icon_deviantart.ico
new file mode 100644
index 000000000..26c353325
--- /dev/null
+++ b/searx/static/default/img/icon_deviantart.ico
diff --git a/searx/static/oscar/img/icon_github.ico b/searx/static/oscar/img/icon_github.ico
deleted file mode 100644
index 133f0ca35..000000000
--- a/searx/static/oscar/img/icon_github.ico
+++ /dev/null
diff --git a/searx/static/oscar/img/icon_soundcloud.ico b/searx/static/oscar/img/icon_soundcloud.ico
deleted file mode 100644
index 4130bea1b..000000000
--- a/searx/static/oscar/img/icon_soundcloud.ico
+++ /dev/null
diff --git a/searx/static/oscar/img/icon_stackoverflow.ico b/searx/static/oscar/img/icon_stackoverflow.ico
deleted file mode 100644
index b2242bc6c..000000000
--- a/searx/static/oscar/img/icon_stackoverflow.ico
+++ /dev/null
diff --git a/searx/static/oscar/img/icon_twitter.ico b/searx/static/oscar/img/icon_twitter.ico
deleted file mode 100644
index b4a71699a..000000000
--- a/searx/static/oscar/img/icon_twitter.ico
+++ /dev/null
diff --git a/searx/static/oscar/img/icon_vimeo.ico b/searx/static/oscar/img/icon_vimeo.ico
deleted file mode 100644
index 4fe4336da..000000000
--- a/searx/static/oscar/img/icon_vimeo.ico
+++ /dev/null
diff --git a/searx/static/oscar/img/icon_wikipedia.ico b/searx/static/oscar/img/icon_wikipedia.ico
deleted file mode 100644
index 911fa76f6..000000000
--- a/searx/static/oscar/img/icon_wikipedia.ico
+++ /dev/null
diff --git a/searx/static/oscar/img/icon_youtube.ico b/searx/static/oscar/img/icon_youtube.ico
deleted file mode 100644
index 977887dbb..000000000
--- a/searx/static/oscar/img/icon_youtube.ico
+++ /dev/null
diff --git a/searx/static/oscar/img/icons/README.md b/searx/static/oscar/img/icons/README.md
new file mode 100644
index 000000000..0e3ad1c03
--- /dev/null
+++ b/searx/static/oscar/img/icons/README.md
@@ -0,0 +1,2 @@
+Source: http://www.iconspedia.com/pack/flat-gradient-social-icons-4384/
+License: Free for non commercial use.
diff --git a/searx/static/oscar/img/icons/amazon.png b/searx/static/oscar/img/icons/amazon.png
new file mode 100644
index 000000000..4f330f38e
--- /dev/null
+++ b/searx/static/oscar/img/icons/amazon.png
diff --git a/searx/static/oscar/img/icons/dailymotion.png b/searx/static/oscar/img/icons/dailymotion.png
new file mode 100644
index 000000000..a15da99fa
--- /dev/null
+++ b/searx/static/oscar/img/icons/dailymotion.png
diff --git a/searx/static/oscar/img/icons/deviantart.png b/searx/static/oscar/img/icons/deviantart.png
new file mode 100644
index 000000000..cec53bcea
--- /dev/null
+++ b/searx/static/oscar/img/icons/deviantart.png
diff --git a/searx/static/oscar/img/icons/facebook.png b/searx/static/oscar/img/icons/facebook.png
new file mode 100644
index 000000000..ac5a59493
--- /dev/null
+++ b/searx/static/oscar/img/icons/facebook.png
diff --git a/searx/static/oscar/img/icons/flickr.png b/searx/static/oscar/img/icons/flickr.png
new file mode 100644
index 000000000..be238bb1a
--- /dev/null
+++ b/searx/static/oscar/img/icons/flickr.png
diff --git a/searx/static/oscar/img/icons/github.png b/searx/static/oscar/img/icons/github.png
new file mode 100644
index 000000000..bf09bae55
--- /dev/null
+++ b/searx/static/oscar/img/icons/github.png
diff --git a/searx/static/oscar/img/icons/soundcloud.png b/searx/static/oscar/img/icons/soundcloud.png
new file mode 100644
index 000000000..351c8030d
--- /dev/null
+++ b/searx/static/oscar/img/icons/soundcloud.png
diff --git a/searx/static/oscar/img/icons/stackoverflow.png b/searx/static/oscar/img/icons/stackoverflow.png
new file mode 100644
index 000000000..812176ad2
--- /dev/null
+++ b/searx/static/oscar/img/icons/stackoverflow.png
diff --git a/searx/static/oscar/img/icons/twitter.png b/searx/static/oscar/img/icons/twitter.png
new file mode 100644
index 000000000..f71c1973a
--- /dev/null
+++ b/searx/static/oscar/img/icons/twitter.png
diff --git a/searx/static/oscar/img/icons/vimeo.png b/searx/static/oscar/img/icons/vimeo.png
new file mode 100644
index 000000000..0238d24d2
--- /dev/null
+++ b/searx/static/oscar/img/icons/vimeo.png
diff --git a/searx/static/oscar/img/icons/wikipedia.png b/searx/static/oscar/img/icons/wikipedia.png
new file mode 100644
index 000000000..37997fbc7
--- /dev/null
+++ b/searx/static/oscar/img/icons/wikipedia.png
diff --git a/searx/static/oscar/img/icons/youtube.png b/searx/static/oscar/img/icons/youtube.png
new file mode 100644
index 000000000..ba2484d0f
--- /dev/null
+++ b/searx/static/oscar/img/icons/youtube.png
diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
index 2ea246542..3b0963816 100644
--- a/searx/templates/oscar/result_templates/default.html
+++ b/searx/templates/oscar/result_templates/default.html
@@ -1,8 +1,8 @@
-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

 

 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}

 

 {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}

 

 <span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>

+<p class="text-muted">{{ result.pretty_url }}</p>

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 48ed5dece..5570a3143 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -7,7 +7,7 @@
         <div class="modal-content">

             <div class="modal-header">

                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>

-                <h4 class="modal-title">{{ result.title|striptags }}</h4>

+                <h4 class="modal-title">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}{{ result.title|striptags }}</h4>

             </div>

             <div class="modal-body">

                 <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">

@@ -15,7 +15,7 @@
             </div>

             <div class="modal-footer">

                 <span class="label label-default pull-right">{{ result.engine }}</span>

-                <p class="text-muted pull-left">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>

+                <p class="text-muted pull-left">{{ result.pretty_url }}</p>

                 <div class="clearfix"></div>

                 <a href="{{ result.img_src }}" class="btn btn-default">{{ _('Get image') }}</a>

                 <a href="{{ result.url }}" class="btn btn-default">{{ _('View source') }}</a>

diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html
index 14ac63232..903d304eb 100644
--- a/searx/templates/oscar/result_templates/torrent.html
+++ b/searx/templates/oscar/result_templates/torrent.html
@@ -1,6 +1,6 @@
 {% from 'oscar/macros.html' import icon %}

 

-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

 

 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}

 

@@ -11,4 +11,4 @@
 {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}

 

 <span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>

+<p class="text-muted">{{ result.pretty_url }}</p>

diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html
index 32112472e..1a9b60717 100644
--- a/searx/templates/oscar/result_templates/videos.html
+++ b/searx/templates/oscar/result_templates/videos.html
@@ -1,4 +1,4 @@
-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

     

 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}

     

@@ -8,6 +8,6 @@
         {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif %}

     </div>

 </div>

-    

+

 <span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>

+<p class="text-muted">{{ result.pretty_url }}</p>

diff --git a/searx/webapp.py b/searx/webapp.py
index 90451bf2a..c6cd78dc5 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -69,8 +69,8 @@ app.secret_key = settings['server']['secret_key']
 babel = Babel(app)
 
 #TODO configurable via settings.yml
-favicons = ['wikipedia', 'youtube', 'vimeo', 'soundcloud',
-            'twitter', 'stackoverflow', 'github']
+favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud',
+            'twitter', 'stackoverflow', 'github', 'deviantart']
 
 cookie_max_age = 60 * 60 * 24 * 365 * 23  # 23 years