jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3195 from evazion/feat-batch-upload-thumbs

Browse Source 
#3194: Display thumbnails on batch upload page
This commit is contained in:
Albert Yi
2017-06-27 13:43:13 -07:00
committed by GitHub
parent c5e3973d6a e3a4bfd28c
commit 39f91bdae7
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/stylesheets/specific/uploads.scss
View File

@@ -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;
}
}
}

20
app/views/uploads/batch.html.erb
View File

@@ -2,11 +2,23 @@
<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 %>
<% if ImageProxy.needs_proxy?(url) %>
<%= image_tag(image_proxy_uploads_path(url: url)) %>
<% else %>
<%= image_tag url %>
<% end %>
<% end %>
</div>
<% end %>
</ul>
</section>
<p><%= link_to "Open all links in new windows", "#", :id => "link" %></p>
</div>
@@ -20,7 +32,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);
});
});