refinerycms-images 2.0.8 → 2.0.9

data/app/controllers/refinery/admin/images_controller.rb

@@ -44,7 +44,7 @@ module Refinery
             @images << (@image = ::Refinery::Image.create(params[:image]))
           else
             params[:image][:image].each do |image|
-              @images << (@image = ::Refinery::Image.create(:image => image))
+              @images << (@image = ::Refinery::Image.create({:image => image}.merge(params[:image].except(:image))))
             end
           end
         rescue Dragonfly::FunctionManager::UnableToHandle

data/app/views/refinery/admin/images/_actions.html.erb

@@ -3,13 +3,13 @@
     <%= render '/refinery/admin/search', :url => refinery.admin_images_path %>
   </li>
   <li>
-    <%= link_to t('.create_new_image'), refinery.new_admin_image_path(:dialog => true), :class => "add_icon" %>
+    <%= link_to t('.create_new_image'), refinery.new_admin_image_path(:dialog => true), :class => 'add_icon' %>
   </li>
   <% other_image_views.each do |image_view| %>
     <li>
       <%= link_to t('switch_to', :scope => 'refinery.admin.images.index.view', :view_name => t("#{image_view}", :scope => 'refinery.admin.images.index.view')),
                   refinery.admin_images_path(:view => image_view, :page => params[:page]),
-                  :class => "reorder_icon"  %>
+                  :class => 'reorder_icon'  %>
     </li>
   <% end %>
 </ul>

data/app/views/refinery/admin/images/_existing_image.html.erb

@@ -1,11 +1,11 @@
-<div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" if @image.errors.any? %>>
+<div id="existing_image_area" class="dialog_area" <%= 'style="display:none;"'.html_safe if @image.errors.any? %>>
   <%= render '/refinery/admin/search', :url => refinery.insert_admin_images_path(params.dup.except('image')) %>
-  <input type='hidden' name='selected_image' id='selected_image' />
-  <div id='existing_image_area_content' class='clearfix'>
+  <input type="hidden" name="selected_image" id="selected_image" />
+  <div id="existing_image_area_content" class="clearfix">
 <% if @images.any? %>
     <ul>
       <% @images.each do |image| -%>
-        <li<%= " class='selected'" if @image_id == image.id %>>
+        <li<%= ' class="selected"'.html_safe if @image_id == image.id %>>
           <%= image_fu(image, '106x106#c', {
                          :alt => image.title,
                          :title => image.title,
@@ -19,15 +19,14 @@
     <%= t('no_results', :scope => 'refinery.admin.search') %>
 <% end %>
   </div>
-
-  <%= will_paginate @images, :params => params.dup %>
+  <%= will_paginate @images, :params => params.dup.merge(:action => "insert") %>
 
   <% unless @app_dialog or @images.empty? %>
-    <div id='existing_image_size_area' class='clearfix'>
-      <input type='hidden' name='selected_image_size' id='selected_image_size' />
+    <div id="existing_image_size_area" class="clearfix">
+      <input type="hidden" name="selected_image_size" id="selected_image_size" />
       <p>
         <input type="checkbox" id="wants_to_resize_image" name="wants_to_resize_image" value="1" checked="checked" />
-        <label for='wants_to_resize_image' class='stripped' style='font-weight: bold;'>
+        <label for="wants_to_resize_image" class="stripped" style="font-weight: bold;">
           <%= t('.resize_image') %>
         </label>
       </p>

data/app/views/refinery/admin/images/_form.html.erb

@@ -5,7 +5,7 @@
              :object => @image,
              :include_object_name => false %>
 
-  <div class='field'>
+  <div class="field">
     <% if action_name =~ /(edit)|(update)/ %>
       <p>
         <%= t('.use_current_image') %>
@@ -20,30 +20,30 @@
     <% end %>
   </div>
 
-  <div class='field'>
+  <div class="field">
     <label><%= t('.maximum_image_size', :bytes => number_to_human_size(Refinery::Images.max_image_size)) %></label>
   </div>
 
-  <input type='hidden' name='wymeditor' value='<%= params[:wymeditor] %>'>
+  <input type="hidden" name="wymeditor" value="<%= params[:wymeditor] %>">
 
   <%= render '/refinery/admin/form_actions', :f => f,
              :continue_editing => false,
-             :hide_cancel => (@app_dialog or action_name == "insert" or from_dialog?),
+             :hide_cancel => (@app_dialog or action_name == 'insert' or from_dialog?),
              :delete_title => t('delete', :scope => 'refinery.admin.images'),
              :delete_confirmation => t('message', :scope => 'refinery.admin.delete', :title => @image.image_name) -%>
 
   <% if @app_dialog %>
-    <input type='hidden' name='app_dialog' value='<%= @app_dialog %>' />
-    <input type='hidden' name='field' value='<%= @field %>' />
-    <input type='hidden' name='update_image' value='<%= @update_image %>' />
-    <input type='hidden' name='thumbnail' value='<%= @thumbnail %>' />
-    <input type='hidden' name='callback' value='<%= @callback %>' />
-    <input type='hidden' name='conditions' value='<%= @conditions %>' />
+    <input type="hidden" name="app_dialog" value="<%= @app_dialog %>" />
+    <input type="hidden" name="field" value="<%= @field %>" />
+    <input type="hidden" name="update_image" value="<%= @update_image %>" />
+    <input type="hidden" name="thumbnail" value="<%= @thumbnail %>" />
+    <input type="hidden" name="callback" value="<%= @callback %>" />
+    <input type="hidden" name="conditions" value="<%= @conditions %>" />
   <% end %>
 <% end %>
 
 <% if action_name =~ /(edit)|(update)/ %>
-  <div id='existing_image'>
+  <div id="existing_image">
     <label><%=t('.current_image') %></label>
     <%= image_fu @image, '225x255>', :class => "brown_border" %>
   </div>

data/app/views/refinery/admin/images/_grid_view.html.erb

@@ -1,17 +1,17 @@
 <ul id="image_grid" class="<%= ['clearfix', 'pagination_frame', pagination_css_class].compact.join(' ') %>">
   <% @images.each_with_index do |image, index| -%>
-    <li id="image_<%= image.id %>" class='image_<%= index % 5 %>'>
+    <li id="image_<%= image.id %>" class="image_<%= index % 5 %>">
       <%= image_fu image, '135x135#c', :title => image.title %>
-      <span class='actions'>
+      <span class="actions">
         <%= link_to refinery_icon_tag('eye.png'), image.url,
-                    :target => "_blank",
+                    :target => '_blank',
                     :title => t('.view_live_html') %>
         <%= link_to refinery_icon_tag('application_edit.png'),
                     refinery.edit_admin_image_path(image),
                     :title => t('edit', :scope => 'refinery.admin.images') %>
         <%= link_to refinery_icon_tag('delete.png'),
                     refinery.admin_image_path(image),
-                    :class => "cancel confirm-delete",
+                    :class => 'cancel confirm-delete',
                     :title => t('delete', :scope => 'refinery.admin.images'),
                     :data => {
                       :confirm => t('message', :scope => 'refinery.admin.delete', :title => image.title)

data/app/views/refinery/admin/images/_list_view_image.html.erb

@@ -1,17 +1,17 @@
-<li id="sortable_<%= list_view_image.id %>" class='clearfix record <%= cycle("on", "on-hover") %>'>
-  <span class='title'>
+<li id="sortable_<%= list_view_image.id %>" class="clearfix record <%= cycle('on', 'on-hover') %>">
+  <span class="title">
     <%= list_view_image.title %> <span class="preview">&nbsp;</span>
   </span>
-  <span class='actions'>
+  <span class="actions">
     <%= link_to refinery_icon_tag('eye.png'), list_view_image.url,
-                :target => "_blank",
-                :title => "#{image_fu list_view_image, '96x96#c', :size => '96x96'}" %>
+                :target => '_blank',
+                :title => image_fu(list_view_image, '96x96#c', :size => '96x96') %>
     <%= link_to refinery_icon_tag('application_edit.png'),
                 refinery.edit_admin_image_path(list_view_image),
                 :title => t('edit', :scope => 'refinery.admin.images') %>
     <%= link_to refinery_icon_tag('delete.png'),
                 refinery.admin_image_path(list_view_image),
-                :class => "cancel confirm-delete",
+                :class => 'cancel confirm-delete',
                 :title => t('delete', :scope => 'refinery.admin.images'),
                 :data => {
                   :confirm => t('message', :scope => 'refinery.admin.delete', :title => list_view_image.title)

data/app/views/refinery/admin/images/_records.html.erb

@@ -1,7 +1,7 @@
 <% if searching? %>
   <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
 <% end %>
-<div class='pagination_container'>
+<div class="pagination_container">
   <% if @images.any? %>
     <%= render 'images' %>
   <% else %>

data/app/views/refinery/admin/images/index.html.erb

@@ -1,6 +1,6 @@
-<section id='records'>
+<section id="records">
   <%= render 'records' %>
 </section>
-<section id='actions'>
+<section id="actions">
   <%= render 'actions' %>
 </section>

data/app/views/refinery/admin/images/insert.html.erb

@@ -1,25 +1,25 @@
-<% user_can_modify_images = ::Refinery::Plugins.active.names.include?("refinery_images") %>
-<div id='dialog_menu_left'>
+<% user_can_modify_images = ::Refinery::Plugins.active.names.include?('refinery_images') %>
+<div id="dialog_menu_left">
   <% if (any_images = @images.any?) or searching? %>
-    <span id="existing_image_radio" class="radio<%= " selected_radio" if (no_errors = @image.errors.empty?) %>">
-      <input type='radio' name='image_type' value='existing_image' id='image_type_existing'<%= " checked='true'" if no_errors or searching? %> />
-      <label for='image_type_existing' class='stripped'><%= t('.existing_image') %></label>
+    <span id="existing_image_radio" class="radio<%= ' selected_radio' if (no_errors = @image.errors.empty?) %>">
+      <input type="radio" name="image_type" value="existing_image" id="image_type_existing"<%= ' checked="true"'.html_safe if no_errors or searching? %> />
+      <label for="image_type_existing" class="stripped"><%= t('.existing_image') %></label>
     </span>
   <% end %>
   <% if user_can_modify_images %>
-    <span id="upload_image_radio" class="radio<%= " selected_radio" if !no_errors and !any_images %>">
-      <input type='radio' name='image_type' value='upload_image' id='image_type_upload'<%= " checked='true'" if (!any_images or !no_errors) and !searching? %> />
-      <label for='image_type_upload' class='stripped'><%= t('.new_image') %></label>
+    <span id="upload_image_radio" class="radio<%= ' selected_radio' if !no_errors and !any_images %>">
+      <input type="radio" name="image_type" value="upload_image" id="image_type_upload"<%= ' checked="true"'.html_safe if (!any_images or !no_errors) and !searching? %> />
+      <label for="image_type_upload" class="stripped"><%= t('.new_image') %></label>
     </span>
   <% end %>
 </div>
 
-<div id='dialog_main'>
+<div id="dialog_main">
   <% if any_images or user_can_modify_images %>
     <%= render 'existing_image' if any_images or searching? %>
 
     <% if user_can_modify_images %>
-      <div id='upload_image_area' class='dialog_area'<%= " style='display:none;'" if any_images and (no_errors or searching?) %>>
+      <div id="upload_image_area" class="dialog_area"<%= ' style="display:none;"'.html_safe if any_images and (no_errors or searching?) %>>
         <%= render 'form', :insert => true %>
       </div>
     <% end %>

data/config/locales/fr.yml

@@ -42,3 +42,4 @@ fr:
           blank: Vous devez sélectionner une image à télécharger
           too_big: L'image doit être plus petite que %{size} megaoctets
           incorrect_format: 'Seules les images aux formats JPG, PNG or GIF sont acceptées'
+          different_file_name: La nouvelle image ne peut pas avoir un nom de fichier différent

data/config/locales/sk.yml

@@ -42,3 +42,4 @@ sk:
           blank: Musíte zadať obrázok ktorý chcete nahrať.
           too_big: Maximálna veľkosť obrázku %{size}MB in size.
           incorrect_format: 'Obrázok musí byť vo formáte JPG, PNG alebo GIF.'
+          different_file_name: Nový obrázok nesmie mať odlišný názov súboru

data/lib/generators/refinery/images/templates/config/initializers/refinery/images.rb.erb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 Refinery::Images.configure do |config|
   # Configures the maximum allowed upload size (in bytes) for an image
   # config.max_image_size = <%= Refinery::Images.max_image_size.inspect %>

data/refinerycms-images.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
-  
+
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 

metadata

@@ -1,19 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-images
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
 - Philip Arndt
 - Uģis Ozols
 - Rob Yurkowski
-- David Jones
-- Steven Heidel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -54,7 +52,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +60,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
 description: Handles all image upload and processing functionality in Refinery CMS.
 email: info@refinerycms.com
 executables: []
@@ -145,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -902752083579033952
+      hash: -69282291348797146
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,10 +152,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -902752083579033952
+      hash: -69282291348797146
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Images extension for Refinery CMS