diff options
| author | Alexandre Flament <alex@al-f.net> | 2016-12-09 23:11:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 23:11:45 +0100 |
| commit | e48f07a367e55bf8aa881902b977bd7ce1cd2bb6 (patch) | |
| tree | 8b285b2dd483006d08c03b9fec49cba49ff16a87 /searx/templates/oscar/result_templates | |
| parent | 219f047bf359ce94397241b875639f3aaddb0fe5 (diff) | |
| parent | d80fb2c8e8995facb3a25c152c47a93eecf1fee4 (diff) | |
Merge branch 'master' into searchpy2
Diffstat (limited to 'searx/templates/oscar/result_templates')
| -rw-r--r-- | searx/templates/oscar/result_templates/images.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index f7bcf0786..b23f34915 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -13,7 +13,12 @@ </div>
<div class="modal-body">
<img class="img-responsive center-block" src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" alt="{{ result.title|striptags }}">
- {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
+ {% if result.author %}<span class="photo-author">{{ result.author }}</span><br />{% endif %}
+ {% if result.content %}
+ <p class="result-content">
+ {{ result.content }}
+ </p>
+ {% endif %}
</div>
<div class="modal-footer">
<div class="clearfix"></div>
|