pettanr_public_domain_v01_licenses 0.0.1 → 0.0.2

data/app/controllers/pettanr_public_domain_v01_licenses/attributes_controller.rb

@@ -2,7 +2,7 @@ require_dependency "pettanr_public_domain_v01_licenses/application_controller"
 
 module PettanrPublicDomainV01Licenses
   class AttributesController < ApplicationController
-    layout 'test' if Pettanr::TestLayout
+    layout 'test' if MagicNumber['test_layout']
     before_filter :authenticate_user!, :only => [:new, :create]
     before_filter :authenticate_artist, :only => [:new, :create]
     
@@ -25,6 +25,7 @@ module PettanrPublicDomainV01Licenses
       @license = License.show @public_domain_license.license_id
       @resource_picture = @original_picture.resource_picture || ResourcePicture.new
       @resource_picture.attributes = @public_domain_license.resource_picture_attributes @original_picture
+      @resource_picture.overwrite @original_picture
       respond_to do |format|
         if @public_domain_license.valid?
           format.html { render main_app.new_resource_picture_path }

data/app/views/pettanr_public_domain_v01_licenses/attributes/_confirm.html.erb

@@ -1,26 +1,25 @@
+<%= render @resource_picture.credit_template, :picture => @resource_picture %>
 <div>
-<% @sp = SystemPicture.find(@resource_picture.credit_data["system_picture_id"]) %>
-<%= content_tag(:a, 
-  tag(:img, :src => @sp.url, :alt => h(@license_group.caption.to_s + '[' + @license.caption.to_s + ']')), 
-  :href => @license.url )
-%>
-</div>
-<%= h @resource_picture.credit_data['caption'] %>
- by 
-<%= link_to_unless @resource_picture.credit_data['artist_url'].blank?, h(@resource_picture.artist_name), @resource_picture.credit_data['artist_url'] %>
-is licensed under a
-<%= link_to h(@license_group.caption), @license_group.url %>
-<%= link_to h(@license.caption), @license.url %>
-<% unless @resource_picture.credit_data['source_url'].blank? %>
-  <div>
-    <%= link_to 'base', @resource_picture.credit_data['source_url'] %>
-  </div>
-<% end %>
-<% unless @resource_picture.credit_data['note'].blank? %>
-  <div>
-    note:<%= h @resource_picture.credit_data['note'] %>
-  </div>
-<% end %>
-<div>
-  MD5:<%= @resource_picture.original_picture.md5 %>
+  <table class="no-border">
+    <tr>
+      <td>License Group</td>
+      <td><%= h @license_group.caption -%></td>
+    </tr>
+    <tr>
+      <td>License</td>
+      <td><%= h @license.caption -%></td>
+    </tr>
+    <tr>
+      <td>Artist Name</td>
+      <td><%= h @resource_picture.artist_name -%></td>
+    </tr>
+    <tr>
+      <td>source picture's url</td>
+      <td><%= h @resource_picture.credit_data['source_url'] -%></td>
+    </tr>
+    <tr>
+      <td>note</td>
+      <td><%= h @resource_picture.credit_data['note'] -%></td>
+    </tr>
+  </table>
 </div>

data/app/views/pettanr_public_domain_v01_licenses/attributes/_credit.html.erb

@@ -1,25 +1,32 @@
-<div>
-<%= content_tag(:a, 
-  tag(:img, :src => picture.license.system_picture.url, :alt => h(picture.license.license_group.caption.to_s + '[' + picture.license.caption.to_s + ']')), 
-  :href => picture.license.url )
-%>
-</div>
-<%= h picture.credit_data['caption'] %>
- by 
-<%= link_to_unless picture.credit_data['artist_url'].blank?, h(picture.artist_name), picture.credit_data['artist_url'] %>
-is licensed under a
-<%= link_to h(picture.license.license_group.caption), picture.license.license_group.url %>
-<%= link_to h(picture.license.caption), picture.license.url %>
-<% unless picture.credit_data['source_url'].blank? %>
-  <div>
-    <%= link_to 'base', picture.credit_data['source_url'] %>
-  </div>
-<% end %>
-<% unless picture.credit_data['note'].blank? %>
-  <div>
-    note:<%= h picture.credit_data['note'] %>
-  </div>
-<% end %>
-<div>
-  <%= picture.md5 %>
-</div>
+<table class="no-border">
+  <tr>
+    <td width="1px">
+      <%= content_tag(:a, 
+        tag(:img, :src => picture.license.system_picture.url, :alt => h(picture.license.license_group.caption.to_s + '[' + picture.license.caption.to_s + ']'), :width => picture.license.system_picture.width, :height => picture.license.system_picture.height), 
+        :href => picture.license.url )
+      %>
+    </td>
+    <td>
+      <% unless picture.artist_name.blank? %>
+        <div class="md5">
+          <%= h picture.artist_name %>
+        </div>
+      <% end %>
+      <% unless picture.credit_data['source_url'].blank? %>
+        <div class="md5">
+          <%= link_to 'Source', picture.credit_data['source_url'] %>
+        </div>
+      <% end %>
+      <% unless picture.credit_data['note'].blank? %>
+        <div class="md5">
+          <%= h picture.credit_data['note'] %>
+        </div>
+      <% end %>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <div class="md5">MD5:<%= picture.md5 %></div>
+    </td>
+  </tr>
+</table>

data/app/views/pettanr_public_domain_v01_licenses/attributes/_form.html.erb

@@ -17,19 +17,39 @@
     </div>
   <% end %>
 
-  <div class="field">
-    <%= collection_select :public_domain_license, :license_id, @license_group.licenses.map {|l| [l.caption, l.id] }, :last, :first %>
-    <%= text_field_tag 'public_domain_license[artist_name]', @public_domain_license.artist_name %>
-<p>source picture's url</p>
-    <%= text_field_tag 'public_domain_license[source_url]', @public_domain_license.source_url %>
-<p>note</p>
-    <%= text_field_tag 'public_domain_license[note]', @public_domain_license.note %>
-  </div>
+  <table class="no-border">
+    <tr>
+      <td>License Group</td>
+      <td><%= h @license_group.caption -%></td>
+      <td>selected</td>
+    </tr>
+    <tr>
+      <td>License</td>
+      <td><%= collection_select :public_domain_license, :license_id, @license_group.licenses.map {|l| [l.caption, l.id] }, :last, :first -%></td>
+      <td>+</td>
+    </tr>
+    <tr>
+      <td>Artist Name</td>
+      <td><%= text_field_tag 'public_domain_license[artist_name]', @public_domain_license.artist_name -%></td>
+      <td>+</td>
+    </tr>
+    <tr>
+      <td>source picture's url</td>
+      <td><%= text_field_tag 'public_domain_license[source_url]', @public_domain_license.source_url -%></td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>note</td>
+      <td><%= text_field_tag 'public_domain_license[note]', @public_domain_license.note -%></td>
+      <td></td>
+    </tr>
+  </table>
+
   <%= hidden_field_tag :original_picture_id, @original_picture.id %>
   <%= hidden_field_tag 'original_picture_license_group[original_picture_id]', @original_picture_license_group.original_picture_id %>
   <%= hidden_field_tag 'original_picture_license_group[license_group_id]', @original_picture_license_group.license_group_id %>
 
   <div class="actions">
-    <%= submit_tag %>
+    <%= submit_tag 'Next' %>
   </div>
 <% end %>

data/app/views/pettanr_public_domain_v01_licenses/attributes/_note.html.erb

@@ -0,0 +1,2 @@
+<h1>Select license (and more info)</h1>
+<img src="<%= @original_picture.url -%>">

data/app/views/pettanr_public_domain_v01_licenses/attributes/new.html.erb

@@ -1 +1,2 @@
+<%= render 'pettanr_public_domain_v01_licenses/attributes/note' %>
 <%= render 'pettanr_public_domain_v01_licenses/attributes/form' %>

data/lib/pettanr_public_domain_v01_licenses/version.rb

@@ -1,3 +1,3 @@
 module PettanrPublicDomainV01Licenses
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pettanr_public_domain_v01_licenses
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19999992 !ruby/object:Gem::Requirement
+  requirement: &21159408 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *19999992
+  version_requirements: *21159408
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19997712 !ruby/object:Gem::Requirement
+  requirement: &21158976 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19997712
+  version_requirements: *21158976
 description: This software is a license plugin for PettanR
 email:
 - yasusiito@gmail.com
@@ -55,6 +55,7 @@ files:
 - app/views/pettanr_public_domain_v01_licenses/attributes/_confirm.html.erb
 - app/views/pettanr_public_domain_v01_licenses/attributes/_credit.html.erb
 - app/views/pettanr_public_domain_v01_licenses/attributes/_form.html.erb
+- app/views/pettanr_public_domain_v01_licenses/attributes/_note.html.erb
 - config/routes.rb
 - db/Copyleft.png
 - db/migrate/20121008000901_create_pettanr_public_domain_v01_licenses_attributes.rb