searx

commit: 67bd68b5e56a2285bc9cd39cf2e206f95fe1ab2b
parent 0ca04be55dec06c5ef737febb128d3dc36c3b5d7
Author: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date:   Mon,  5 Jan 2015 20:25:47 +0100

Put media above result content
Mimick more closely usual video viewer (video above, details below)

Diffstat:
M
searx/templates/oscar/result_templates/default.html
4
++--
M
searx/templates/oscar/result_templates/videos.html
14
+++++++-------

2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
@@ -9,8 +9,6 @@
     <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader" 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>
 {% endif %}
 
-{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
-
 {% if result.embedded %}
 <div id="result-media-{{ index }}" class="collapse">
 {% autoescape false %}
@@ -19,6 +17,8 @@
 </div>
 {% endif %}
 
+{% 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>
diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html
@@ -9,13 +9,6 @@
     <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader" data-toggle="collapse" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}">{{ icon('film') }} {{ _('show video') }}</a></small>
 {% endif %}
 
-<div class="container-fluid">
-    <div class="row">
-        <a href="{{ result.url }}"><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>
-        {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %}
-    </div>
-</div>
-
 {% if result.embedded %}
 <div id="result-video-{{ index }}" class="collapse">
 {% autoescape false %}
@@ -24,6 +17,13 @@
 </div>
 {% endif %}
 
+<div class="container-fluid">
+    <div class="row">
+        <a href="{{ result.url }}"><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>
+        {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %}
+    </div>
+</div>
+
 <div class="clearfix"></div>
 
 <span class="label label-default pull-right">{{ result.engine }}</span>