t#29183#29182:add magic number for thumbnail

diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index d558bc7..6903d48 100644 (file)
--- a/app/models/resource_picture.rb
+++ b/app/models/resource_picture.rb
@@ -70,7 +70,7 @@ class ResourcePicture < ActiveRecord::Base
   end
   
   def thumbnail(rimg)
-    tw, th = ResourcePicture.fix_size_both(64, 64, rimg.columns, rimg.rows)
+    tw, th = ResourcePicture.fix_size_both(MagicNumber['thumbnail_width'], MagicNumber['thumbnail_height'], rimg.columns, rimg.rows)
     ResourcePicture.resize(rimg.to_blob, tw, th).to_blob
   end
   

diff --git a/app/views/original_picture_license_groups/_allform.html.erb b/app/views/original_picture_license_groups/_allform.html.erb
new file mode 100644 (file)
index 0000000..0b8e7b9
--- /dev/null
+++ b/app/views/original_picture_license_groups/_allform.html.erb
@@ -0,0 +1,24 @@
+<%= form_for(@original_picture_license_group) do |f| %>
+  <% if @original_picture_license_group.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@original_picture_license_group.errors.count, "error") %> prohibited this comic from being saved:</h2>
+
+      <ul>
+      <% @original_picture_license_group.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </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>
+  <%= hidden_field_tag :original_picture_id, @original_picture.id %>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

diff --git a/app/views/resource_pictures/index.html.erb b/app/views/resource_pictures/index.html.erb
index daef41e..76defae 100644 (file)
--- a/app/views/resource_pictures/index.html.erb
+++ b/app/views/resource_pictures/index.html.erb
@@ -3,7 +3,7 @@
   <% @resource_picture = resource_picture %>
   <div>
     <%= link_to resource_picture.filename, resource_picture_path(resource_picture) %>
-    <img src="<%= resource_picture.url -%>">
+    <%= tag :img, :src => resource_picture.url, :width => MagicNumber['thumbnail_width'], :height => MagicNumber['thumbnail_height'] %>
     <%= resource_picture.width %>x<%= resource_picture.height %>
     <%= resource_picture.filesize %>bytes
     <%= render resource_picture.credit_template, :picture => resource_picture %>

diff --git a/config/application.rb b/config/application.rb
index 8abef64..3e3c7cc 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -67,7 +67,7 @@ config.assets.initialize_on_precompile = false
   end
 end
 Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.yml').read)
-
+MagicNumber = YAML.load(open(Rails.root + 'config/magic_number.yml').read)
 y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
 require y[Rails.env]["adapter"]
 pio = PictureIO.const_get y[Rails.env]["io"]

diff --git a/config/magic_number.yml b/config/magic_number.yml
new file mode 100644 (file)
index 0000000..b551a62
--- /dev/null
+++ b/config/magic_number.yml
@@ -0,0 +1,2 @@
+  thumbnail_width: 64
+  thumbnail_height: 64