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 Binary files /dev/null and b/searx/static/courgette/img/icon_dailymotion.ico differ 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 Binary files /dev/null and b/searx/static/courgette/img/icon_deviantart.ico differ 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 Binary files /dev/null and b/searx/static/default/img/icon_dailymotion.ico differ 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 Binary files /dev/null and b/searx/static/default/img/icon_deviantart.ico differ 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 Binary files a/searx/static/oscar/img/icon_github.ico and /dev/null differ 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 Binary files a/searx/static/oscar/img/icon_soundcloud.ico and /dev/null differ 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 Binary files a/searx/static/oscar/img/icon_stackoverflow.ico and /dev/null differ 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 Binary files a/searx/static/oscar/img/icon_twitter.ico and /dev/null differ 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 Binary files a/searx/static/oscar/img/icon_vimeo.ico and /dev/null differ 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 Binary files a/searx/static/oscar/img/icon_wikipedia.ico and /dev/null differ 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 Binary files a/searx/static/oscar/img/icon_youtube.ico and /dev/null differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/amazon.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/dailymotion.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/deviantart.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/facebook.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/flickr.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/github.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/soundcloud.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/stackoverflow.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/twitter.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/vimeo.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/wikipedia.png differ 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 Binary files /dev/null and b/searx/static/oscar/img/icons/youtube.png differ 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 @@ -

{{ result.title|safe }}

+

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} {% if result.content %}

{{ result.content|safe }}

{% endif %} {{ result.engine }} -

{% if result['favicon'] %}{% endif %} {{ result.pretty_url }}

+

{{ result.pretty_url }}

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 @@ - + {{ result.engine }} -

{% if result['favicon'] %}{% endif %} {{ result.pretty_url }}

+

{{ result.pretty_url }}

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