commit: fd0a93dd7ce6b701dfb5fe48d3196aee23d19621
parent: 9bd44596387c8a2fe3bd5c3ec2cf4163c10970ee
Author: asciimoo <asciimoo@gmail.com>
Date: Tue, 22 Oct 2013 23:32:52 +0200
[enh] result rendering templates
Diffstat:
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/searx/static/css/style.css b/searx/static/css/style.css
@@ -64,7 +64,7 @@ input[type="checkbox"] { visibility: hidden; }
a { text-decoration: none; }
-.result { margin-bottom: 16px; }
+.result { margin-bottom: 16px; clear: both; }
.result_title { margin-bottom: 0; }
.result p { margin-top: 0; padding-top: 0; font-size: 0.8em; max-width: 50em; }
.result h3 { font-size: 0.9em;}
@@ -76,8 +76,13 @@ a { text-decoration: none; }
.engines { color: #888888; }
+.small_font { font-size: 0.8em; }
+
.small p { margin: 2px 0; }
.right { float: right; }
.invisible { display: none; }
+
+.image_result { float: left; max-width: 250px; margin: 10px; height: 350px; min-width: 250px; }
+.image_result img { max-width: 240px; max-height: 320px; border: 2px solid #000000; }
diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html
@@ -0,0 +1,4 @@
+<div class="result">
+ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+ <p class="content"><span class="engines">{{ result.engine }}</span><br />{% if result.content %}{{ result.content|safe }}<br />{% endif %}<span class="url">{{ result.url }}</span></p>
+</div>
diff --git a/searx/templates/results.html b/searx/templates/results.html
@@ -9,10 +9,11 @@
</div>
<div id="results">
{% for result in results %}
- <div class="result">
- <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
- <p class="content"><span class="engines">{{ result.engine }}</span><br />{% if result.content %}{{ result.content|safe }}<br />{% endif %}<span class="url">{{ result.url }}</span></p>
- </div>
+ {% if result['template'] %}
+ {% include 'result_templates/'+result['template'] %}
+ {% else %}
+ {% include 'result_templates/default.html' %}
+ {% endif %}
{% endfor %}
</div>
{% endblock %}