From 8af29d9797ce0b8ba06c1440d4d074c487994e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <sitbackandwait@gmail.com>
Date: Tue, 3 Jan 2017 22:03:59 +0100
Subject: Revert "Merge pull request #799 from kvch/modal-arrows"

This reverts commit 79ceb13577fcc83eabe642a4ed6dd793b7bf0d4b, reversing
changes made to eaa0fb8102825fa4ccdb348429fdbf39837921be.
---
 searx/templates/oscar/result_templates/images.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index bf154e793..3bf52cd68 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -13,10 +13,10 @@
         <div class="row">
             <div class="col-md-12 col-sm-12 col-xs-12 modal-header">
                 <a {% if index != 1 %}href="#open-modal-{{ index-1 }}-{{ pageno }}"{% endif %}>
-                    <span class="pull-left image-paging-left"></span>
+                    <span class="pull-left glyphicon glyphicon-chevron-left image-paging-left"></span>
                  </a>
                 <a href="#open-modal-{{ index+1 }}-{{ pageno }}">
-                    <span class="pull-right image-paging-right"></span>
+                    <span class="image-paging-right pull-right glyphicon glyphicon-chevron-right"></span>
                 </a>
                 <h4 class="modal-title image-title">{{ result.title|striptags }}</h4>
             </div>
-- 
cgit v1.2.3


From e8319fa2cbd388712a39202d44c1b6a3a520b048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <sitbackandwait@gmail.com>
Date: Tue, 3 Jan 2017 22:04:09 +0100
Subject: Revert "Merge pull request #793 from kvch/pics-modal"

This reverts commit bff41987a49af9ae53ff9fc3494fa7973ac03500, reversing
changes made to d08108be6293c8764f0d1d950a7aab283cddffed.
---
 searx/templates/oscar/result_templates/images.html | 73 +++++++++-------------
 1 file changed, 29 insertions(+), 44 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 3bf52cd68..b23f34915 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -1,54 +1,39 @@
-<a href="#open-modal-{{ index }}-{{ pageno }}">
-    <img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="img-thumbnail" id="img-result-thumb-{{ index }}" />
-</a>
+{% from 'oscar/macros.html' import draw_favicon %}
 
-<style type="text/css" media="screen">
-#open-modal-{{ index }}-{{ pageno }}:target .image-container::before {
-    background: url({{ image_proxify(result.img_src)|safe }}) no-repeat center/contain;
-}
-</style>
+<a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} data-toggle="modal" data-target="#modal-{{ index }}-{{pageno}}">
+    <img src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="img-thumbnail">
+</a>
 
-<div id="open-modal-{{ index }}-{{ pageno }}" class="modal-image">
-    <div class="container modal-dialog">
-        <div class="row">
-            <div class="col-md-12 col-sm-12 col-xs-12 modal-header">
-                <a {% if index != 1 %}href="#open-modal-{{ index-1 }}-{{ pageno }}"{% endif %}>
-                    <span class="pull-left glyphicon glyphicon-chevron-left image-paging-left"></span>
-                 </a>
-                <a href="#open-modal-{{ index+1 }}-{{ pageno }}">
-                    <span class="image-paging-right pull-right glyphicon glyphicon-chevron-right"></span>
-                </a>
-                <h4 class="modal-title image-title">{{ result.title|striptags }}</h4>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-12 col-sm-12 col-xs-12 modal-body">
-                <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><div class="image-container"></div></a>
+<div class="modal fade" id="modal-{{ index }}-{{ pageno }}" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-wrapper">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                <h4 class="modal-title">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result.title|striptags }}</h4>
             </div>
-        </div>
-        {% if result.content %}
-        <div class="row">
-            <div class="col-md-12 hidden-sm hidden-xs modal-body">
-                <p class="result-content">{{ result.content|safe }}</p>
+            <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.author %}<span class="photo-author">{{ result.author }}</span><br />{% endif %}
+                {% if result.content %}
+                    <p class="result-content">
+                        {{ result.content }}
+                    </p>
+                {% endif %}
             </div>
-        </div>
-        {% endif %}
-        <div class="modal-footer">
-            <div class="row">
-                <div class="col-md-10 col-xs-12">
-                    <p class="text-muted pull-left">{{ result.pretty_url }}</p>
+            <div class="modal-footer">
+                <div class="clearfix"></div>
+                <span class="label label-default pull-right">{{ result.engine }}</span>
+                <p class="text-muted pull-left">{{ result.pretty_url }}</p>
+                <div class="clearfix"></div>
+				<div class="row">
+                    <div class="col-md-6">
+                        <a href="{{ result.img_src }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('Get image') }}</a>
+                    </div>
+                    <div class="col-md-6">
+                        <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} class="btn btn-default">{{ _('View source') }}</a>
+                    </div>
                 </div>
-                <div class="col-md-2 hidden-sm hidden-xs">
-                    <span class="label label-default pull-right">{{ result.engine }}</span>
-                </div>
-            </div>
-            <div class="row">
-                <a href="{{ result.url }}" class="btn btn-default">
-                    {{ _('View source') }}
-                </a>
             </div>
         </div>
     </div>
-    <a href="#img-result-thumb-{{ index }}-{{ pageno }}" class="modal-close"></a>
 </div>
-- 
cgit v1.2.3