t#31471:add panel catch

[pettanr/pettanr.git] / app / views / panel_pictures / show.html.erb

diff --git a/app/views/panel_pictures/show.html.erb b/app/views/panel_pictures/show.html.erb
index f0b4fab..eb83223 100644 (file)
--- a/app/views/panel_pictures/show.html.erb
+++ b/app/views/panel_pictures/show.html.erb
@@ -1,22 +1,16 @@
 <h1><%= t '.title' -%></h1>
 <p id="notice"><%= notice %></p>
 
+<%= render 'panel_pictures/standard', :panel => @panel_picture.panel, :author => @author, :spot => @panel_picture %>
 <p>
   <b><%= t_m 'PanelPicture.panel_id' -%>:</b>
   <%= link_to @panel_picture.panel_id, panel_path(@panel_picture.panel) %>
 </p>
 
-<% if @panel_picture.picture.showable? @author %>
-  <p>
-    <b><%= t_m 'PanelPicture.picture_id' -%>:</b>
-    <%= link_to tag(:img, @panel_picture.opt_img_tag), picture_path(@panel_picture.picture) %>
-  </p>
-  <%= render @panel_picture.picture.credit_template, :picture => @panel_picture.picture %>
-<% else %>
-  <p>
-    <%= tag(:img, @panel_picture.picture.tail_opt_img_tag(asset_path('error.png'))) -%>
-  </p>
-<% end %>
+<p>
+  <b><%= t_m 'PanelPicture.caption' -%>:</b>
+  <%= h @panel_picture.caption %>
+</p>
 
 <p>
   <b><%= t_m 'PanelPicture.link' -%>:</b>
@@ -54,11 +48,6 @@
 </p>
 
 <p>
-  <b><%= t_m 'PanelPicture.caption' -%>:</b>
-  <%= h @panel_picture.caption %>
-</p>
-
-<p>
   <b><%= t_m 'PanelPicture.created_at' -%>:</b>
   <%= l @panel_picture.created_at %>
 </p>
@@ -67,3 +56,6 @@
   <b><%= t_m 'PanelPicture.updated_at' -%>:</b>
   <%= l @panel_picture.updated_at %>
 </p>
+
+<%= link_to t('link.edit'), edit_panel_picture_path(@panel_picture) %>
+<%= link_to t('link.destroy'), panel_picture_path(@panel_picture), :method => :delete %>