merge v04

[pettanr/pettanr.git] / app / views / resource_pictures / index.html.erb

diff --git a/app/views/resource_pictures/index.html.erb b/app/views/resource_pictures/index.html.erb
index 4c3d464..859041c 100644 (file)
--- a/app/views/resource_pictures/index.html.erb
+++ b/app/views/resource_pictures/index.html.erb
@@ -1,10 +1,11 @@
 <h1>Listing resource_pictures</h1>
 <% @resource_pictures.each do |resource_picture| %>
+  <% @resource_picture = resource_picture %>
   <div>
-    <%= resource_picture.filename %>
-    <img src="<%= resource_picture.url('thumbnail') -%>">
+    <%= link_to resource_picture.filename, resource_picture_path(resource_picture) %>
+    <img src="<%= resource_picture.url -%>">
     <%= resource_picture.width %>x<%= resource_picture.height %>
     <%= resource_picture.filesize %>bytes
-    画:<%= h resource_picture.original_picture.artist.name %>
+    <%= render resource_picture.credit_template %>
   </div>
 <% end %>