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..b2c74b0d2 100644 --- a/app/views/uploads/batch.html.erb +++ b/app/views/uploads/batch.html.erb @@ -2,11 +2,23 @@
+ <%= link_to "Image ##{i}", new_upload_path(url: url, ref: params[:url]), target: "_blank" %> +
+ + <%= link_to new_upload_path(url: url, ref: params[:url]), target: "_blank" do %> + <% if ImageProxy.needs_proxy?(url) %> + <%= image_tag(image_proxy_uploads_path(url: url)) %> + <% else %> + <%= image_tag url %> + <% end %> + <% end %> +<%= link_to "Open all links in new windows", "#", :id => "link" %>