Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results

Conflicts:
	searx/static/themes/default/css/style.css
	searx/static/themes/oscar/css/oscar.min.css
	searx/templates/oscar/result_templates/torrent.html

1 files changed, 4 insertions, 9 deletions

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
index 23af61f21..2be06642a 100644
--- a/searx/templates/oscar/result_templates/default.html
+++ b/searx/templates/oscar/result_templates/default.html
@@ -1,9 +1,7 @@
-{% from 'oscar/macros.html' import icon %}

+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}

 

-<h4 class="result_header">{% if result.engine~".png" in favicons %}<img width="32" height="32" class="favicon" src="{{ url_for('static', filename='img/icons/'+result.engine+'.png') }}" alt="{{ result.engine }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

-

-{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

-<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>

+{{ result_header(result, favicons) }}

+{{ result_sub_header(result) }}

 

 {% if result.embedded %}

     <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}">{{ icon('music') }} {{ _('show media') }}</a></small>

@@ -17,7 +15,4 @@
 

 {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}

 

-<div class="clearfix"></div>

-

-<span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{{ result.pretty_url }}</p>

+{{ result_footer(result) }}