git.iko.soy/searx
on master help sign in
Final commit on favicons

Definitely remove engine array Change every themes to accomodate that change Tweak of video template of oscar to add link on video thumbnail

commit83d6f366596829f2140f84c73b684bd7f783e93c authorCqoicebordel <Cqoicebordel@users.noreply.github.com> dateThu 18 Dec 2014, 16:26 (12 years ago) parente71b665
12 files changed+18−30
compare with master
unifiedsplit
searx/templates/courgette/result_templates/default.html+2−2 searx/templates/courgette/result_templates/map.html+2−2 searx/templates/courgette/result_templates/videos.html+3−5 searx/templates/default/result_templates/default.html+1−1 searx/templates/default/result_templates/map.html+2−2 searx/templates/default/result_templates/videos.html+2−4 searx/templates/oscar/result_templates/default.html+1−1 searx/templates/oscar/result_templates/images.html+1−1 searx/templates/oscar/result_templates/map.html+1−1 searx/templates/oscar/result_templates/torrent.html+1−1 searx/templates/oscar/result_templates/videos.html+2−2 searx/webapp.py−8
searx/templates/courgette/result_templates/default.html+2−2
@@ -1,7 +1,7 @@
11<div class="result {{ result.class }}">
22
3− {% if result['favicon'] %}
4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
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}}" />
55 {% endif %}
66
77 <div>
searx/templates/courgette/result_templates/map.html+2−2
@@ -1,7 +1,7 @@
11<div class="result {{ result.class }}">
22
3− {% if result['favicon'] %}
4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
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}}" />
55 {% endif %}
66
77 <div>
searx/templates/courgette/result_templates/videos.html+3−5
@@ -1,12 +1,10 @@
11<div class="result">
2− {% if result['favicon'] %}
3− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
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}}" />
44 {% endif %}
55
6− <p>
76 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
87 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
9− <a href="{{ result.url }}"><img width="400px" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
8+ <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
109 <p class="url">{{ result.url }}</p>
11− </p>
1210</div>
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 result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% 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/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+2−2
@@ -1,7 +1,7 @@
11<div class="result {{ result.class }}">
22
3− {% if result['favicon'] %}
4− <img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />
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}}" />
55 {% endif %}
66
77 <div>
searx/templates/default/result_templates/videos.html+2−4
@@ -1,8 +1,6 @@
11<div class="result">
2− <p>
3− <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% 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/icon_{{result.engine}}.ico" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
43 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
5− <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
4+ <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
65 <p class="url">{{ result.url }}</p>
7− </p>
86</div>
searx/templates/oscar/result_templates/default.html+1−1
@@ -1,6 +1,6 @@
11{% from 'oscar/macros.html' import icon %}
22
3−<h4 class="result_header">{% if result['favicon']~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
3+<h4 class="result_header">{% if result.engine~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result.engine }}.png" alt="{{ result.engine }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
44
55{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
66<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
searx/templates/oscar/result_templates/images.html+1−1
@@ -7,7 +7,7 @@
77 <div class="modal-content">
88 <div class="modal-header">
99 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
10− <h4 class="modal-title">{% if result['favicon']~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}{{ result.title|striptags }}</h4>
10+ <h4 class="modal-title">{% if result.engine~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result.engine }}.png" alt="{{ result.engine }}" /> {% endif %}{{ result.title|striptags }}</h4>
1111 </div>
1212 <div class="modal-body">
1313 <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">
searx/templates/oscar/result_templates/map.html+1−1
@@ -1,6 +1,6 @@
11{% from 'oscar/macros.html' import icon %}
22
3−<h4 class="result_header">{% if result['favicon']~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
3+<h4 class="result_header">{% if result.engine~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result.engine }}.png" alt="{{ result.engine }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
44
55{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
66
searx/templates/oscar/result_templates/torrent.html+1−1
@@ -1,6 +1,6 @@
11{% from 'oscar/macros.html' import icon %}
22
3−<h4 class="result_header">{% if result['favicon']~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
3+<h4 class="result_header">{% if result.engine~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result.engine }}.png" alt="{{ result.engine }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
44
55{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
66<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
searx/templates/oscar/result_templates/videos.html+2−2
@@ -1,13 +1,13 @@
11{% from 'oscar/macros.html' import icon %}
22
3−<h4 class="result_header">{% if result['favicon']~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
3+<h4 class="result_header">{% if result.engine~".png" in favicons %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result.engine }}.png" alt="{{ result.engine }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>
44
55{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
66<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>
77
88<div class="container-fluid">
99 <div class="row">
10− <img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" alt="{{ result.title|urlencode }} {{ result['favicon'] }}" />
10+ <a href="{{ result.url }}"><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>
1111 {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %}
1212 </div>
1313</div>
searx/webapp.py−8
@@ -68,10 +68,6 @@ app.secret_key = settings['server']['secret_key']
6868
6969babel = Babel(app)
7070
71−#TODO configurable via settings.yml
72−favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud',
73− 'twitter', 'stackoverflow', 'github', 'deviantart']
74−
7571global_favicons = []
7672for indice,theme in enumerate(themes):
7773 global_favicons.append([])
@@ -294,10 +290,6 @@ def index():
294290 result['pretty_url'] = u'{0}[...]{1}'.format(*url_parts)
295291 else:
296292 result['pretty_url'] = result['url']
297−
298− for engine in result['engines']:
299− if engine in favicons:
300− result['favicon'] = engine
301293
302294 # TODO, check if timezone is calculated right
303295 if 'publishedDate' in result: