From 281ddae35d06dbc6567c43b5ea4dcdae1a1042cb Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 26 Jun 2017 20:50:22 -0500
Subject: [PATCH 1/2] /uploads/batch: add thumbnail previews (#3194).

---
 app/assets/stylesheets/specific/uploads.scss | 24 ++++++++++++++++++++
 app/views/uploads/batch.html.erb             | 16 +++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/specific/uploads.scss b/app/assets/stylesheets/specific/uploads.scss
index c98073ad8..2315bc6fa 100644
--- a/app/assets/stylesheets/specific/uploads.scss
+++ b/app/assets/stylesheets/specific/uploads.scss
@@ -47,4 +47,28 @@ div#c-uploads {
       display: inline;
     }
   }
+
+  div.upload-preview {
+    display: inline-block;
+
+    > a {
+      width: 154px;
+      height: 154px;
+      margin: 0 10px 10px 0;
+      display: inline-block;
+
+      img {
+        margin: auto;
+        border: 2px solid transparent;
+
+        max-width: 154px;
+        max-height: 154px;
+      }
+    }
+
+    .caption-top {
+      font-size: 0.8em;
+      margin-bottom: 0;
+    }
+  }
 }
diff --git a/app/views/uploads/batch.html.erb b/app/views/uploads/batch.html.erb
index accc35c1b..5162a6f71 100644
--- a/app/views/uploads/batch.html.erb
+++ b/app/views/uploads/batch.html.erb
@@ -2,11 +2,19 @@
   <div id="a-new">
     <h1>Batch Upload</h1>
 
-    <ul id="links">
+    <section>
       <% @urls.each.with_index do |url, i| %>
-        <li><%= link_to "Image ##{i}", new_upload_path(:url => url, :ref => params[:url]), :target => "_blank" %></li>
+        <div class="upload-preview">
+          <p class="caption-top">
+            <%= link_to "Image ##{i}", new_upload_path(url: url, ref: params[:url]), target: "_blank" %>
+          </p>
+
+          <%= link_to new_upload_path(url: url, ref: params[:url]), target: "_blank" do %>
+            <%= image_tag url %>
+          <% end %>
+        </div>
       <% end %>
-    </ul>
+    </section>
 
     <p><%= link_to "Open all links in new windows", "#", :id => "link" %></p>
   </div>
@@ -20,7 +28,7 @@
   <script type="text/javascript">
     $(function() {
       $("#link").click(function() {
-        $("#links a").each(function(i, v) {
+        $(".upload-preview > a").each(function(i, v) {
           window.open(v.href);
         });
       });

From e3a4bfd28c3b7e936e3e8ade161a2083fe846c92 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 27 Jun 2017 13:46:59 -0500
Subject: [PATCH 2/2] /upload/batch: use image proxy for embedded thumbnails.

---
 app/views/uploads/batch.html.erb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/uploads/batch.html.erb b/app/views/uploads/batch.html.erb
index 5162a6f71..b2c74b0d2 100644
--- a/app/views/uploads/batch.html.erb
+++ b/app/views/uploads/batch.html.erb
@@ -10,7 +10,11 @@
           </p>
 
           <%= link_to new_upload_path(url: url, ref: params[:url]), target: "_blank" do %>
-            <%= image_tag url %>
+            <% if ImageProxy.needs_proxy?(url) %>
+              <%= image_tag(image_proxy_uploads_path(url: url)) %>
+            <% else %>
+              <%= image_tag url %>
+            <% end %>
           <% end %>
         </div>
       <% end %>