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, 9 insertions, 0 deletions

diff --git a/searx/templates/default/result_templates/code.html b/searx/templates/default/result_templates/code.html
new file mode 100644
index 000000000..616b7ea62
--- /dev/null
+++ b/searx/templates/default/result_templates/code.html
@@ -0,0 +1,9 @@
+<div class="result {{ result.class }}">

+    <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

+    <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>

+    {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}

+    <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>

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

+

+    {{ result.codelines|code_highlighter(result.code_language)|safe }}

+</div>