t#29804:fix view for licensing

diff --git a/app/assets/stylesheets/test.css b/app/assets/stylesheets/test.css
index 98a4ac0..2ea13f0 100644 (file)
--- a/app/assets/stylesheets/test.css
+++ b/app/assets/stylesheets/test.css
@@ -1,4 +1,8 @@
-table {
+table.no-border {
+  border: none;
+}
+
+table.no-border td, tr {
   border: none;
 }
 

diff --git a/app/views/original_picture_license_groups/_form.html.erb b/app/views/original_picture_license_groups/_form.html.erb
index 0b8e7b9..e3413f1 100644 (file)
--- a/app/views/original_picture_license_groups/_form.html.erb
+++ b/app/views/original_picture_license_groups/_form.html.erb
@@ -11,14 +11,17 @@
     </div>
   <% end %>
 
-  <div class="field">
-    <%= f.label :license_group_id %><br />
-    <%= f.collection_select :license_group_id, LicenseGroup.list.map {|l| [l.caption, l.id] }, :last, :first %>
-    <%= f.hidden_field :original_picture_id %>
-  </div>
+  <table class="no-border">
+    <tr>
+      <td>License Group</td>
+      <td><%= f.collection_select :license_group_id, LicenseGroup.list.map {|l| [l.caption, l.id] }, :last, :first %></td>
+      <td>+</td>
+    </tr>
+  </table>
+  <%= f.hidden_field :original_picture_id %>
   <%= hidden_field_tag :original_picture_id, @original_picture.id %>
 
   <div class="actions">
-    <%= f.submit %>
+    <%= f.submit 'Next'%>
   </div>
 <% end %>

diff --git a/app/views/original_picture_license_groups/new.html.erb b/app/views/original_picture_license_groups/new.html.erb
index 2d34363..eccae42 100644 (file)
--- a/app/views/original_picture_license_groups/new.html.erb
+++ b/app/views/original_picture_license_groups/new.html.erb
@@ -1 +1,3 @@
+<h1>Select License Group</h1>
+<img src="<%= @original_picture.url -%>">
 <%= render 'form' %>

diff --git a/app/views/original_pictures/_history_list.html.erb b/app/views/original_pictures/_history_list.html.erb
index dfd0a52..1e955fd 100644 (file)
--- a/app/views/original_pictures/_history_list.html.erb
+++ b/app/views/original_pictures/_history_list.html.erb
@@ -1,6 +1,14 @@
 <% history.each do |picture| -%>
   <h3>revision:<%= picture.revision %></h3>
   <div>licensed at <%= picture.created_at %></div>
-  <%= tag(:img, picture.opt_img_tag) -%>
-  <%= render picture.credit_template, :picture => picture %>
+  <table class="no-border">
+    <tr>
+      <td>
+        <%= tag(:img, picture.opt_img_tag) -%>
+      </td>
+      <td>
+        <%= render picture.credit_template, :picture => picture %>
+      </td>
+    </tr>
+  </table>
 <% end -%>

diff --git a/app/views/original_pictures/show.html.erb b/app/views/original_pictures/show.html.erb
index 89ce57c..8fd8863 100644 (file)
--- a/app/views/original_pictures/show.html.erb
+++ b/app/views/original_pictures/show.html.erb
@@ -1,61 +1,64 @@
+<h1>
+Original Picture
+</h1>
 <%= render 'exist', :exist => Picture.exist_by_md5(@original_picture.md5, @original_picture.id) %>
 <p id="notice"><%= notice %></p>
 
-<p>
-  <b>Ext:</b>
-  <%= @original_picture.ext %>
-</p>
-
-<p>
-  <b>Width:</b>
-  <%= @original_picture.width %>
-</p>
-
-<p>
-  <b>Height:</b>
-  <%= @original_picture.height %>
-</p>
-
-<p>
-  <b>filesize:</b>
-  <%= @original_picture.filesize %>
-</p>
-
-<p>
-  <b>md5:</b>
-  <%= @original_picture.md5 %>
-</p>
-
-<p>
-  <b>artist:</b>
-  <%= @original_picture.artist_id %>
-</p>
-
-<img src="<%= @original_picture.url -%>">
-
-<p>
-<a href="<%= @original_picture.url %>">browse picture</a> 
-</p>
-<p>
-<%= link_to 'Select License', :controller => 'original_picture_license_groups', :action => :new, :original_picture_id => @original_picture.id %>
-</p>
-<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 %>
-<div>
-  <p>
-    History
-  </p>
-  <%= render 'history_list', :history => @original_picture.history %>
-</div>
+<table class="no-border">
+  <tr>
+    <td>
+      <p>
+        <b>Ext:</b>
+        <%= @original_picture.ext %>
+      </p>
+
+      <p>
+        <b>Width:</b>
+        <%= @original_picture.width %>
+      </p>
+
+      <p>
+        <b>Height:</b>
+        <%= @original_picture.height %>
+      </p>
+
+      <p>
+        <b>filesize:</b>
+        <%= @original_picture.filesize %>
+      </p>
+
+      <p>
+        <b>md5:</b>
+        <%= @original_picture.md5 %>
+      </p>
+
+      <p>
+        <b>artist:</b>
+        <%= @original_picture.artist_id %>
+      </p>
+
+      <img src="<%= @original_picture.url -%>">
+
+      <h2>
+      <%= link_to 'Select License', :controller => 'original_picture_license_groups', :action => :new, :original_picture_id => @original_picture.id %>
+      </h2>
+      <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 %>
+    </td>
+    <td>
+      <h1>
+        History
+      </h1>
+      <%= render 'history_list', :history => @original_picture.history %>
+    </td>
+  </tr>
+  </table>
 
 <%= link_to 'Back', original_pictures_path %>