From 4a195e0b28fdd940e046c442032c816095416fec Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Mon, 5 Jan 2015 02:04:23 +0100
Subject: Integrated media in results + Deezer Engine New "embedded" item for
 the results, allow to give an iframe to display the media directly in the
 results. Note that the attributes src of the iframes are not set, but instead
 data-src is set, allowing to only load the iframe when clicked.

Deezer engine based on public API (no key).
---
 searx/templates/oscar/result_templates/default.html | 12 ++++++++++++
 searx/templates/oscar/result_templates/videos.html  | 12 ++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
index 6ab26132e..3e58588cc 100644
--- a/searx/templates/oscar/result_templates/default.html
+++ b/searx/templates/oscar/result_templates/default.html
@@ -5,8 +5,20 @@
 {% 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>
 
+{% if result.embedded %}
+    <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 %}
+   {{ result.embedded }}
+{% endautoescape %}
+</div>
+{% 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
index ef4c5dd83..187f5dfed 100644
--- a/searx/templates/oscar/result_templates/videos.html
+++ b/searx/templates/oscar/result_templates/videos.html
@@ -5,6 +5,10 @@
 {% 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>
 
+{% if result.embedded %}
+    <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>
@@ -12,6 +16,14 @@
     </div>
 </div>
 
+{% if result.embedded %}
+<div id="result-video-{{ index }}" class="collapse">
+{% autoescape false %}
+   {{ result.embedded }}
+{% endautoescape %}
+</div>
+{% endif %}
+
 <div class="clearfix"></div>
 
 <span class="label label-default pull-right">{{ result.engine }}</span>
-- 
cgit v1.2.3


From 67bd68b5e56a2285bc9cd39cf2e206f95fe1ab2b Mon Sep 17 00:00:00 2001
From: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Mon, 5 Jan 2015 20:25:47 +0100
Subject: Put media above result content Mimick more closely usual video viewer
 (video above, details below)

---
 searx/templates/oscar/result_templates/default.html |  4 ++--
 searx/templates/oscar/result_templates/videos.html  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
index 3e58588cc..25506b2f5 100644
--- 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
index 187f5dfed..32000e662 100644
--- 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>
-- 
cgit v1.2.3