git.iko.soy/searx
on master help sign in
[enh] move favicons into own directory
a0293d6Thomas Pointhuber
searx/static/courgette/img/icon_dailymotion.ico → searx/static/courgette/img/icons/icon_dailymotion.icorenamed
compare with master
unifiedsplit

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/templates/courgette/result_templates/default.html+1−1
@@ -1,7 +1,7 @@
1<div class="result {{ result.class }}">
1<div class="result {{ result.class }}">
2
2
3 {% if "icon_"~result.engine~".ico" in favicons %}
3 {% 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}}" />
5 {% endif %}
5 {% endif %}
6
6
7 <div>
7 <div>
searx/templates/courgette/result_templates/map.html+1−1
@@ -1,7 +1,7 @@
1<div class="result {{ result.class }}">
1<div class="result {{ result.class }}">
2
2
3 {% if "icon_"~result.engine~".ico" in favicons %}
3 {% 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}}" />
5 {% endif %}
5 {% endif %}
6
6
7 <div>
7 <div>
searx/templates/courgette/result_templates/videos.html+1−1
@@ -1,6 +1,6 @@
1<div class="result">
1<div class="result">
2 {% if "icon_"~result.engine~".ico" in favicons %}
2 {% 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}}" />
4 {% endif %}
4 {% endif %}
5
5
6 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
6 <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 @@
1<div class="result {{ result.class }}">
1<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>
3 <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
3 <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
4 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
4 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
5 <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>
5 <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 @@
1<div class="result {{ result.class }}">
1<div class="result {{ result.class }}">
2
2
3 {% if "icon_"~result.engine~".ico" in favicons %}
3 {% 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}}" />
5 {% endif %}
5 {% endif %}
6
6
7 <div>
7 <div>
searx/templates/default/result_templates/videos.html+1−1
@@ -1,5 +1,5 @@
1<div class="result">
1<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>
3 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
3 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
4 <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
4 <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
5 <p class="url">{{ result.url }}</p>
5 <p class="url">{{ result.url }}</p>
searx/webapp.py+1−1
@@ -68,7 +68,7 @@ babel = Babel(app)
68global_favicons = []
68global_favicons = []
69for indice, theme in enumerate(themes):
69for indice, theme in enumerate(themes):
70 global_favicons.append([])
70 global_favicons.append([])
71− theme_img_path = searx_dir+"/static/"+theme+"/img/"
71+ theme_img_path = searx_dir+"/static/"+theme+"/img/icons/"
72 for (dirpath, dirnames, filenames) in os.walk(theme_img_path):
72 for (dirpath, dirnames, filenames) in os.walk(theme_img_path):
73 global_favicons[indice].extend(filenames)
73 global_favicons[indice].extend(filenames)
74
74