commit: c7cbd38fcc60601dd3b41df8a3a234c079f5dc0b parent: 213667b1ef93b7932aeba58aed58a0fef83749a3 Author: Adam Tauber <asciimoo@gmail.com> Date: Thu, 1 Jan 2015 14:06:34 +0100 Merge pull request #164 from pointhi/favicons improve FaviconsDiffstat:
38 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/searx/static/courgette/img/icon_dailymotion.ico b/searx/static/courgette/img/icons/icon_dailymotion.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_deviantart.ico b/searx/static/courgette/img/icons/icon_deviantart.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_github.ico b/searx/static/courgette/img/icons/icon_github.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_kickass.ico b/searx/static/courgette/img/icons/icon_kickass.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_soundcloud.ico b/searx/static/courgette/img/icons/icon_soundcloud.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_stackoverflow.ico b/searx/static/courgette/img/icons/icon_stackoverflow.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_twitter.ico b/searx/static/courgette/img/icons/icon_twitter.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_vimeo.ico b/searx/static/courgette/img/icons/icon_vimeo.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_wikipedia.ico b/searx/static/courgette/img/icons/icon_wikipedia.ico Binary files differ. diff --git a/searx/static/courgette/img/icon_youtube.ico b/searx/static/courgette/img/icons/icon_youtube.ico Binary files differ. diff --git a/searx/static/default/img/icon_dailymotion.ico b/searx/static/default/img/icons/icon_dailymotion.ico Binary files differ. diff --git a/searx/static/default/img/icon_deviantart.ico b/searx/static/default/img/icons/icon_deviantart.ico Binary files differ. diff --git a/searx/static/default/img/icon_github.ico b/searx/static/default/img/icons/icon_github.ico Binary files differ. diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/default/img/icons/icon_kickass.ico Binary files differ. diff --git a/searx/static/default/img/icon_soundcloud.ico b/searx/static/default/img/icons/icon_soundcloud.ico Binary files differ. diff --git a/searx/static/default/img/icon_stackoverflow.ico b/searx/static/default/img/icons/icon_stackoverflow.ico Binary files differ. diff --git a/searx/static/default/img/icon_twitter.ico b/searx/static/default/img/icons/icon_twitter.ico Binary files differ. diff --git a/searx/static/default/img/icon_vimeo.ico b/searx/static/default/img/icons/icon_vimeo.ico Binary files differ. diff --git a/searx/static/default/img/icon_wikipedia.ico b/searx/static/default/img/icons/icon_wikipedia.ico Binary files differ. diff --git a/searx/static/default/img/icon_youtube.ico b/searx/static/default/img/icons/icon_youtube.ico Binary files differ. diff --git a/searx/static/oscar/img/icons/openstreetmap.png b/searx/static/oscar/img/icons/openstreetmap.png Binary files differ. diff --git a/searx/static/oscar/img/icons/photon.png b/searx/static/oscar/img/icons/photon.png Binary files differ. diff --git a/searx/static/oscar/img/icons/searchcode code.png b/searx/static/oscar/img/icons/searchcode code.png Binary files differ. diff --git a/searx/static/oscar/img/icons/searchcode doc.png b/searx/static/oscar/img/icons/searchcode doc.png Binary files differ. diff --git a/searx/static/oscar/img/map/marker-icon-2x-green.png b/searx/static/oscar/img/map/marker-icon-2x-green.png Binary files differ. diff --git a/searx/static/oscar/img/map/marker-icon-2x-orange.png b/searx/static/oscar/img/map/marker-icon-2x-orange.png Binary files differ. diff --git a/searx/static/oscar/img/map/marker-icon-2x-red.png b/searx/static/oscar/img/map/marker-icon-2x-red.png Binary files differ. diff --git a/searx/static/oscar/img/map/marker-icon-green.png b/searx/static/oscar/img/map/marker-icon-green.png Binary files differ. diff --git a/searx/static/oscar/img/map/marker-icon-orange.png b/searx/static/oscar/img/map/marker-icon-orange.png Binary files differ. diff --git a/searx/static/oscar/img/map/marker-icon-red.png b/searx/static/oscar/img/map/marker-icon-red.png Binary files differ. diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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/tests/test_webapp.py b/searx/tests/test_webapp.py @@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase): ) result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '<h3 class="result_title"><img width="14" height="14" class="favicon" src="static/default/img/icon_youtube.ico" alt="youtube" /><a href="http://second.test.xyz">Second <span class="highlight">Test</span></a></h3>', # noqa + '<h3 class="result_title"><img width="14" height="14" class="favicon" src="static/default/img/icons/icon_youtube.ico" alt="youtube" /><a href="http://second.test.xyz">Second <span class="highlight">Test</span></a></h3>', # noqa result.data ) self.assertIn( diff --git 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)