Merge pull request #164 from pointhi/favicons
improve Favicons
commitc7cbd38fcc60601dd3b41df8a3a234c079f5dc0b
authorAdam Tauber <asciimoo@gmail.com>
dateThu 1 Jan 2015, 14:06 (12 years ago)
parent213667b8f4814a
searx/static/courgette/img/icon_dailymotion.ico → searx/static/courgette/img/icons/icon_dailymotion.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_deviantart.ico → searx/static/courgette/img/icons/icon_deviantart.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_github.ico → searx/static/courgette/img/icons/icon_github.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_kickass.ico → searx/static/courgette/img/icons/icon_kickass.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_soundcloud.ico → searx/static/courgette/img/icons/icon_soundcloud.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_stackoverflow.ico → searx/static/courgette/img/icons/icon_stackoverflow.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_twitter.ico → searx/static/courgette/img/icons/icon_twitter.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_vimeo.ico → searx/static/courgette/img/icons/icon_vimeo.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_wikipedia.ico → searx/static/courgette/img/icons/icon_wikipedia.icorenamed
Binary file not shown.
searx/static/courgette/img/icon_youtube.ico → searx/static/courgette/img/icons/icon_youtube.icorenamed
Binary file not shown.
searx/static/default/img/icon_dailymotion.ico → searx/static/default/img/icons/icon_dailymotion.icorenamed
Binary file not shown.
searx/static/default/img/icon_deviantart.ico → searx/static/default/img/icons/icon_deviantart.icorenamed
Binary file not shown.
searx/static/default/img/icon_github.ico → searx/static/default/img/icons/icon_github.icorenamed
Binary file not shown.
searx/static/default/img/icon_kickass.ico → searx/static/default/img/icons/icon_kickass.icorenamed
Binary file not shown.
searx/static/default/img/icon_soundcloud.ico → searx/static/default/img/icons/icon_soundcloud.icorenamed
Binary file not shown.
searx/static/default/img/icon_stackoverflow.ico → searx/static/default/img/icons/icon_stackoverflow.icorenamed
Binary file not shown.
searx/static/default/img/icon_twitter.ico → searx/static/default/img/icons/icon_twitter.icorenamed
Binary file not shown.
searx/static/default/img/icon_vimeo.ico → searx/static/default/img/icons/icon_vimeo.icorenamed
Binary file not shown.
searx/static/default/img/icon_wikipedia.ico → searx/static/default/img/icons/icon_wikipedia.icorenamed
Binary file not shown.
searx/static/default/img/icon_youtube.ico → searx/static/default/img/icons/icon_youtube.icorenamed
Binary file not shown.
searx/static/oscar/img/icons/openstreetmap.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/photon.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/searchcode code.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/searchcode doc.pngnew file
Binary file not shown.
searx/static/oscar/img/map/marker-icon-2x-green.pngnew file
Binary file not shown.
searx/static/oscar/img/map/marker-icon-2x-orange.pngnew file
Binary file not shown.
searx/static/oscar/img/map/marker-icon-2x-red.pngnew file
Binary file not shown.
searx/static/oscar/img/map/marker-icon-green.pngnew file
Binary file not shown.
searx/static/oscar/img/map/marker-icon-orange.pngnew file
Binary file not shown.
searx/static/oscar/img/map/marker-icon-red.pngnew file
Binary file not shown.
searx/templates/courgette/result_templates/default.html+1−1
@@ -1,7 +1,7 @@
11<div class="result {{ result.class }}">
22
33 {% if "icon_"~result.engine~".ico" in favicons %}
4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
4+ <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
55 {% endif %}
66
77 <div>
searx/templates/courgette/result_templates/map.html+1−1
@@ -1,7 +1,7 @@
11<div class="result {{ result.class }}">
22
33 {% if "icon_"~result.engine~".ico" in favicons %}
4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
4+ <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
55 {% endif %}
66
77 <div>
searx/templates/courgette/result_templates/videos.html+1−1
@@ -1,6 +1,6 @@
11<div class="result">
22 {% if "icon_"~result.engine~".ico" in favicons %}
3− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
3+ <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
44 {% endif %}
55
66 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
searx/templates/default/result_templates/default.html+1−1
@@ -1,5 +1,5 @@
11<div class="result {{ result.class }}">
2− <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>
2+ <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>
33 <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
44 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
55 <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>
searx/templates/default/result_templates/map.html+1−1
@@ -1,7 +1,7 @@
11<div class="result {{ result.class }}">
22
33 {% if "icon_"~result.engine~".ico" in favicons %}
4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
4+ <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icons/icon_{{result.engine}}.ico" alt="{{result.engine}}" />
55 {% endif %}
66
77 <div>
searx/templates/default/result_templates/videos.html+1−1
@@ -1,5 +1,5 @@
11<div class="result">
2− <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>
2+ <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>
33 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
44 <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
55 <p class="url">{{ result.url }}</p>
searx/tests/test_webapp.py+1−1
@@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase):
4949 )
5050 result = self.app.post('/', data={'q': 'test'})
5151 self.assertIn(
52− '<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
52+ '<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
5353 result.data
5454 )
5555 self.assertIn(
searx/webapp.py+1−1
@@ -68,7 +68,7 @@ babel = Babel(app)
6868global_favicons = []
6969for indice, theme in enumerate(themes):
7070 global_favicons.append([])
71− theme_img_path = searx_dir+"/static/"+theme+"/img/"
71+ theme_img_path = searx_dir+"/static/"+theme+"/img/icons/"
7272 for (dirpath, dirnames, filenames) in os.walk(theme_img_path):
7373 global_favicons[indice].extend(filenames)
7474