Merge branch 'v04' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v04

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

diff --git a/app/views/original_pictures/show.html.erb b/app/views/original_pictures/show.html.erb
index 858d167..89ce57c 100644 (file)
--- a/app/views/original_pictures/show.html.erb
+++ b/app/views/original_pictures/show.html.erb
@@ -1,3 +1,4 @@
+<%= render 'exist', :exist => Picture.exist_by_md5(@original_picture.md5, @original_picture.id) %>
 <p id="notice"><%= notice %></p>
 
 <p>
@@ -21,6 +22,11 @@
 </p>
 
 <p>
+  <b>md5:</b>
+  <%= @original_picture.md5 %>
+</p>
+
+<p>
   <b>artist:</b>
   <%= @original_picture.artist_id %>
 </p>
@@ -31,18 +37,25 @@
 <a href="<%= @original_picture.url %>">browse picture</a> 
 </p>
 <p>
-<%= link_to '再生成', :action => :refresh, :id => @original_picture.id %>
+<%= link_to 'Select License', :controller => 'original_picture_license_groups', :action => :new, :original_picture_id => @original_picture.id %>
 </p>
-<% if @original_picture.own? @author -%>
+<div>
+  <%= render 'original_picture_license_groups/form' %>
+</div>
 <p>
 Replace picture
 </p>
-  <%= form_for(@original_picture, :html => { :multipart => true }) do |f| %>
-    <label for="file">File to Upload</label> <%= f.file_field "file" %>
-    <div class="actions">
-      <%= f.submit 'replace' %>
-    </div>
-  <% end %>
-<% end -%>
+<%= form_for(@original_picture, :html => { :multipart => true }) do |f| %>
+  <label for="file">File to Upload</label> <%= f.file_field "file" %>
+  <div class="actions">
+    <%= f.submit 'replace' %>
+  </div>
+<% end %>
+<div>
+  <p>
+    History
+  </p>
+  <%= render 'history_list', :history => @original_picture.history %>
+</div>
 
 <%= link_to 'Back', original_pictures_path %>