oscar template: improve result icons
commit517e57b996aaeceda08afd0e80bfd30ad6192971
authorThomas Pointhuber <thomas.pointhuber@gmx.at>
dateFri 3 Oct 2014, 13:16 (12 years ago)
parentc25aab7
searx/static/courgette/img/icon_dailymotion.iconew file
Binary file not shown.
searx/static/courgette/img/icon_deviantart.iconew file
Binary file not shown.
searx/static/default/img/icon_dailymotion.iconew file
Binary file not shown.
searx/static/default/img/icon_deviantart.iconew file
Binary file not shown.
searx/static/oscar/img/icon_github.icodeleted
Binary file not shown.
searx/static/oscar/img/icon_soundcloud.icodeleted
Binary file not shown.
searx/static/oscar/img/icon_stackoverflow.icodeleted
Binary file not shown.
searx/static/oscar/img/icon_twitter.icodeleted
Binary file not shown.
searx/static/oscar/img/icon_vimeo.icodeleted
Binary file not shown.
searx/static/oscar/img/icon_wikipedia.icodeleted
Binary file not shown.
searx/static/oscar/img/icon_youtube.icodeleted
Binary file not shown.
searx/static/oscar/img/icons/README.mdnew file+2
@@ -0,0 +1,2 @@
1+Source: http://www.iconspedia.com/pack/flat-gradient-social-icons-4384/
2+License: Free for non commercial use.
searx/static/oscar/img/icons/amazon.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/dailymotion.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/deviantart.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/facebook.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/flickr.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/github.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/soundcloud.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/stackoverflow.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/twitter.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/vimeo.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/wikipedia.pngnew file
Binary file not shown.
searx/static/oscar/img/icons/youtube.pngnew file
Binary file not shown.
searx/templates/oscar/result_templates/default.html+2−2
@@ -1,8 +1,8 @@
1−<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
1+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
22
33{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
44
55{% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
66
77<span class="label label-default pull-right">{{ result.engine }}</span>
8−<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>
8+<p class="text-muted">{{ result.pretty_url }}</p>
searx/templates/oscar/result_templates/images.html+2−2
@@ -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">×</span><span class="sr-only">Close</span></button>
10− <h4 class="modal-title">{{ result.title|striptags }}</h4>
10+ <h4 class="modal-title">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% 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 }}">
@@ -15,7 +15,7 @@
1515 </div>
1616 <div class="modal-footer">
1717 <span class="label label-default pull-right">{{ result.engine }}</span>
18− <p class="text-muted pull-left">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>
18+ <p class="text-muted pull-left">{{ result.pretty_url }}</p>
1919 <div class="clearfix"></div>
2020 <a href="{{ result.img_src }}" class="btn btn-default">{{ _('Get image') }}</a>
2121 <a href="{{ result.url }}" class="btn btn-default">{{ _('View source') }}</a>
searx/templates/oscar/result_templates/torrent.html+2−2
@@ -1,6 +1,6 @@
11{% from 'oscar/macros.html' import icon %}
22
3−<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
3+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
44
55{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
66
@@ -11,4 +11,4 @@
1111{% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
1212
1313<span class="label label-default pull-right">{{ result.engine }}</span>
14−<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>
14+<p class="text-muted">{{ result.pretty_url }}</p>
searx/templates/oscar/result_templates/videos.html+3−3
@@ -1,4 +1,4 @@
1−<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
1+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
22
33{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
44
@@ -8,6 +8,6 @@
88 {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif %}
99 </div>
1010</div>
11−
11+
1212<span class="label label-default pull-right">{{ result.engine }}</span>
13−<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>
13+<p class="text-muted">{{ result.pretty_url }}</p>
searx/webapp.py+2−2
@@ -69,8 +69,8 @@ app.secret_key = settings['server']['secret_key']
6969babel = Babel(app)
7070
7171#TODO configurable via settings.yml
72−favicons = ['wikipedia', 'youtube', 'vimeo', 'soundcloud',
73− 'twitter', 'stackoverflow', 'github']
72+favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud',
73+ 'twitter', 'stackoverflow', 'github', 'deviantart']
7474
7575cookie_max_age = 60 * 60 * 24 * 365 * 23 # 23 years
7676