refinerycms-images 2.0.10 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 726ab0771b2270af874c268a53a9260e6e67002a
-  data.tar.gz: 75cebc30239e823057e512aec2a5a014b1db7899
+  metadata.gz: c249ed2d31ca6c37f8eb87228a4465adf9f75602
+  data.tar.gz: d84f1c7b9a53e9f191ced15928ef40a7804740d9
 SHA512:
-  metadata.gz: e296d332629b64ce731b35d1dbad3a41159b7a88110c1a684cf1d2871b6b2a82bf9901b10782253456ddcbde32f3f7df98e27ea73dd031fc3f1337a03850eab1
-  data.tar.gz: 83c4947b02ba3bc9033ea12e287b60371930f580aa4e90482d691033442678ad52d53121e6dbc39b8a3af2e85063118a1357c823571579dde5a99b20b5c3a6b5
+  metadata.gz: 5a895254472271b2ae02268523d879ad0fc6596ae1489a5522955ebaed4a8cdfc355766164d0bcf0eed26a9c6fe5fcf3e34a6dd602608a208adef0246b214a64
+  data.tar.gz: db92a5a44f577ed56cb7a5c0948731ce1077780442660e4261740304d75b444681d64d50fec6a7a1ffc74ab83606943decf1650d92c3856e6da8ff4c8d38b4ec

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

@@ -29,7 +29,7 @@ module Refinery
           extra_condition[1] = nil if extra_condition[1] == "nil"
         end
 
-        find_all_images(({extra_condition[0].to_sym => extra_condition[1]} if extra_condition.present?))
+        find_all_images(({extra_condition[0] => extra_condition[1]} if extra_condition.present?))
         search_all_images if searching?
 
         paginate_images
@@ -70,8 +70,45 @@ module Refinery
           if @images.all?(&:valid?)
             @image_id = @image.id if @image.persisted?
             @image = nil
+          end
+
+          self.insert
+        end
+      end
 
-            self.insert
+      def update
+        attributes_before_assignment = @image.attributes
+        @image.attributes = params[:image]
+        if @image.valid? && @image.save
+          flash.notice = t(
+            'refinery.crudify.updated',
+            :what => "'#{@image.title}'"
+          )
+
+          unless from_dialog?
+            unless params[:continue_editing] =~ /true|on|1/
+              redirect_back_or_default refinery.admin_images_path
+            else
+              unless request.xhr?
+                redirect_to :back
+              else
+                render :partial => '/refinery/message'
+              end
+            end
+          else
+            self.index
+            @dialog_successful = true
+            render :index
+          end
+        else
+          @thumbnail = Image.find params[:id]
+          unless request.xhr?
+            render :action => 'edit'
+          else
+            render :partial => '/refinery/admin/error_messages', :locals => {
+                     :object => @image,
+                     :include_object_name => true
+                   }
           end
         end
       end
@@ -84,6 +121,7 @@ module Refinery
         @update_image = params[:update_image]
         @thumbnail = params[:thumbnail]
         @callback = params[:callback]
+        @multiple = params[:multiple]
         @conditions = params[:conditions]
       end
 
@@ -101,10 +139,6 @@ module Refinery
         super unless action_name == 'insert'
       end
 
-      def store_current_location!
-        super unless action_name == 'insert' or from_dialog?
-      end
-
     end
   end
 end

data/app/helpers/refinery/admin/images_helper.rb

@@ -10,11 +10,11 @@ module Refinery
       def thumbnail_urls(image)
         thumbnail_urls = {
           :"data-original" => asset_paths.compute_public_path(image.url, ''),
-          :"data-grid" => asset_paths.compute_public_path(image.thumbnail('135x135#c').url, '')
+          :"data-grid" => asset_paths.compute_public_path(image.thumbnail(:geometry => '135x135#c').url, '')
         }
 
         Refinery::Images.user_image_sizes.sort_by{|key,geometry| geometry}.each do |size, pixels|
-          thumbnail_urls[:"data-#{size.to_s.parameterize}"] = asset_paths.compute_public_path(image.thumbnail(pixels).url, '')
+          thumbnail_urls[:"data-#{size.to_s.parameterize}"] = asset_paths.compute_public_path(image.thumbnail(:geometry => pixels).url, '')
         end
 
         thumbnail_urls

data/app/models/refinery/image.rb

@@ -10,12 +10,12 @@ module Refinery
 
     validates :image, :presence  => true
     validates_with ImageSizeValidator
-    validates_property :mime_type, :of => :image, :in => ::Refinery::Images.whitelisted_mime_types,
+    validates_with ImageUpdateValidator, :on => :update
+    validates_property :mime_type,
+                       :of => :image,
+                       :in => ::Refinery::Images.whitelisted_mime_types,
                        :message => :incorrect_format
 
-    # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
-    acts_as_indexed :fields => [:title]
-
     # allows Mass-Assignment
     attr_accessible :id, :image, :image_size
 
@@ -36,35 +36,44 @@ module Refinery
       end
     end
 
-    # Get a thumbnail job object given a geometry.
-    def thumbnail(geometry = nil)
-      if geometry.is_a?(Symbol) and Refinery::Images.user_image_sizes.keys.include?(geometry)
-        geometry = Refinery::Images.user_image_sizes[geometry]
+    # Get a thumbnail job object given a geometry and whether to strip image profiles and comments.
+    def thumbnail(options = {})
+      if options.is_a?(String) || options.is_a?(Symbol)
+        Refinery.deprecate 'Refinery::Image#thumbnail(geometry)',
+                           :when => '2.2',
+                           :replacement => 'Refinery::Image#thumbnail(:geometry => value)'
+        options = { :geometry => options }
       end
 
-      if geometry.present? && !geometry.is_a?(Symbol)
-        image.thumb(geometry)
-      else
-        image
-      end
+      options = { :geometry => :no_geometry, :strip => true }.merge(options)
+      geometry = convert_to_geometry(options[:geometry])
+      thumbnail = image
+      thumbnail = thumbnail.thumb(geometry) unless geometry.is_a?(Symbol)
+      thumbnail = thumbnail.strip if options[:strip]
+      thumbnail
     end
 
     # Intelligently works out dimensions for a thumbnail of this image based on the Dragonfly geometry string.
     def thumbnail_dimensions(geometry)
-      geometry = geometry.to_s
+      geometry = if geometry.is_a?(Symbol) && Refinery::Images.user_image_sizes.keys.include?(geometry)
+        Refinery::Images.user_image_sizes[geometry]
+      else
+        geometry.to_s
+      end
+
       width = original_width = self.image_width.to_f
       height = original_height = self.image_height.to_f
       geometry_width, geometry_height = geometry.split(%r{\#{1,2}|\+|>|!|x}im)[0..1].map(&:to_f)
-      if (original_width * original_height > 0) && geometry =~ ::Dragonfly::ImageMagick::Processor::THUMB_GEOMETRY
-        if geometry =~ ::Dragonfly::ImageMagick::Processor::RESIZE_GEOMETRY
-          if geometry !~ %r{\d+x\d+>} || (geometry =~ %r{\d+x\d+>} && (width > geometry_width.to_f || height > geometry_height.to_f))
+      if (original_width * original_height > 0) && ::Dragonfly::ImageMagick::Processor::THUMB_GEOMETRY === geometry
+        if ::Dragonfly::ImageMagick::Processor::RESIZE_GEOMETRY === geometry
+          if geometry !~ %r{\d+x\d+>} || (%r{\d+x\d+>} === geometry && (width > geometry_width.to_f || height > geometry_height.to_f))
             # Try scaling with width factor first. (wf = width factor)
-            wf_width = (original_width * (geometry_width / width)).ceil
-            wf_height = (original_height * (geometry_width / width)).ceil
+            wf_width = (original_width * geometry_width / width).round
+            wf_height = (original_height * geometry_width / width).round
 
             # Scale with height factor (hf = height factor)
-            hf_width = (original_width * (geometry_height / height)).ceil
-            hf_height = (original_height * (geometry_height / height)).ceil
+            hf_width = (original_width * geometry_height / height).round
+            hf_height = (original_height * geometry_height / height).round
 
             # Take the highest value that doesn't exceed either axis limit.
             use_wf = wf_width <= geometry_width && wf_height <= geometry_height
@@ -96,5 +105,15 @@ module Refinery
       CGI::unescape(image_name.to_s).gsub(/\.\w+$/, '').titleize
     end
 
+    private
+
+    def convert_to_geometry(geometry)
+      if geometry.is_a?(Symbol) && Refinery::Images.user_image_sizes.keys.include?(geometry)
+        Refinery::Images.user_image_sizes[geometry]
+      else
+        geometry
+      end
+    end
+
   end
 end

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

@@ -32,7 +32,7 @@
       </p>
       <ul>
         <%
-          Refinery::Images.user_image_sizes.sort_by { |key, geometry| geometry }.each_with_index do |(size, pixels), index|
+          Refinery::Images.user_image_sizes.sort_by { |key, geometry| geometry.to_i }.each_with_index do |(size, pixels), index|
             safe_pixels = pixels.to_s.gsub(/[<>=]/, '')
             # (parndt): ' selected' if size.to_s == 'medium' is not very generic, but I
             # can't think of a decent way of making it so for even sets (e.g. 2,4,6,8,etc image sizes).

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

@@ -45,6 +45,6 @@
 <% if action_name =~ /(edit)|(update)/ %>
   <div id="existing_image">
     <label><%=t('.current_image') %></label>
-    <%= image_fu @image, '225x255>', :class => "brown_border" %>
+    <%= image_fu @thumbnail || @image, '225x255>', :class => 'brown_border' %>
   </div>
 <% end %>

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

@@ -5,12 +5,12 @@
       <span class="actions">
         <%= link_to refinery_icon_tag('eye.png'), image.url,
                     :target => '_blank',
-                    :title => t('.view_live_html') %>
+                    :title => t('view_live_html', :scope => 'refinery.admin.images') %>
         <%= 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),
+                    refinery.admin_image_path(image, params.slice(:page)),
                     :class => 'cancel confirm-delete',
                     :title => t('delete', :scope => 'refinery.admin.images'),
                     :data => {

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

@@ -5,7 +5,7 @@
   <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') %>
+                :title => t('view_live_html', :scope => 'refinery.admin.images') %>
     <%= link_to refinery_icon_tag('application_edit.png'),
                 refinery.edit_admin_image_path(list_view_image),
                 :title => t('edit', :scope => 'refinery.admin.images') %>

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

@@ -1,17 +1,15 @@
-<% if searching? %>
-  <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
-<% end %>
+<%= render 'refinery/admin/search_header', :url => refinery.admin_images_path %>
 <div class="pagination_container">
   <% if @images.any? %>
     <%= render 'images' %>
   <% else %>
     <p>
-      <% unless searching? %>
+      <% if searching? %>
+        <%= t('no_results', :scope => 'refinery.admin.search') %>
+      <% else %>
         <strong>
           <%= t('.no_images_yet') %>
         </strong>
-      <% else %>
-        <%= t('no_results', :scope => 'refinery.admin.search') %>
       <% end %>
     </p>
   <% end %>

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

@@ -38,7 +38,12 @@
 <% content_for :javascripts do %>
   <script>
     $(document).ready(function(){
-      image_dialog.init(<%= @callback.present? ? "self.parent.#{@callback}" : "null" %>);
+      new ImageDialog({
+        callback: <%= @callback.present? ? "self.parent.#{h @callback}" : 'null' %>,
+        multiple: <%= @multiple == 'true' %>
+      }).create();
+
+      $('input[type=radio][value=upload_image]:checked').click();
     });
   </script>
 <% end %>

data/config/locales/bg.yml

@@ -24,8 +24,7 @@ bg:
             switch_to: Преглед като %{view_name}
             list: списък
             grid: решетка
-        grid_view:
-          view_live_html: Преглед на това изображение <br/><em>(ще се отвори в нов прозорец)</em>
+        view_live_html: Преглед на това изображение <br/><em>(ще се отвори в нов прозорец)</em>
         existing_image:
           button_text: Вмъкване
           resize_image: Оразмеряване на изображението?

data/config/locales/cs.yml

@@ -24,8 +24,7 @@ cs:
             switch_to: "Přepnout pohled na: %{view_name}"
             list: seznam
             grid: tabulka
-        grid_view:
-          view_live_html: Zobrazit tento obrázek <br/><em>Otevře se novém okně</em>
+        view_live_html: Zobrazit tento obrázek <br/><em>Otevře se novém okně</em>
         existing_image:
           button_text: Vložit
           resize_image: Změnít velikost?

data/config/locales/da.yml

@@ -24,8 +24,7 @@ da:
             switch_to: Skift til %{view_name}visning
             list: liste
             grid: gitter
-        grid_view:
-          view_live_html: Vis billede<br/><em>(åbner i nyt vindue)</em>
+        view_live_html: Vis billede<br/><em>(åbner i nyt vindue)</em>
         existing_image:
           button_text: Indsæt
           resize_image: Skalér billedet?

data/config/locales/de.yml

@@ -24,8 +24,7 @@ de:
             switch_to: Zur %{view_name}-Ansicht wechseln
             list: Listen
             grid: Gitter
-        grid_view:
-          view_live_html: Dieses Bild betrachten <br/><em>Öffnet sich in einem neuen Fenster</em>
+        view_live_html: Dieses Bild betrachten <br/><em>Öffnet sich in einem neuen Fenster</em>
         existing_image:
           button_text: Einfügen
           resize_image: Bild in der Größe ändern?

data/config/locales/el.yml

@@ -24,8 +24,7 @@ el:
             switch_to: Αλλαγή σε %{view_name} view
             list: λίστα
             grid: πλέγμα
-        grid_view:
-          view_live_html: Δείτε την εικόνα <br/><em>Ανοίγει σε νέο παράθυρο</em>
+        view_live_html: Δείτε την εικόνα <br/><em>Ανοίγει σε νέο παράθυρο</em>
         existing_image:
           button_text: Εισαγωγή
           resize_image: Αλλαγή μεγέθους;

data/config/locales/en.yml

@@ -24,8 +24,7 @@ en:
             switch_to: Switch to %{view_name} view
             list: list
             grid: grid
-        grid_view:
-          view_live_html: View this image <br/><em>Opens in a new window</em>
+        view_live_html: View this image <br/><em>Opens in a new window</em>
         existing_image:
           button_text: Insert
           resize_image: Resize the image?
@@ -42,3 +41,4 @@ en:
           blank: You must specify an image for upload
           too_big: Image should be smaller than %{size} bytes in size
           incorrect_format: 'Your image must be either a JPG, PNG or GIF'
+          different_file_name: New image can't have different file name

data/config/locales/es.yml

@@ -25,8 +25,7 @@ es:
             switch_to: Cambiar a vista %{view_name}
             list: lista
             grid: cuadrícula
-        grid_view:
-          view_live_html: Ver imagen <br/><em>Abre en ventana nueva</em>
+        view_live_html: Ver imagen <br/><em>Abre en ventana nueva</em>
         existing_image:
           button_text: Insertar
           resize_image: ¿Redimensionar la imagen?

data/config/locales/fi.yml

@@ -24,8 +24,7 @@ fi:
             switch_to: "%{view_name}näkymä"
             list: Lista
             grid: Ruudukko
-        grid_view:
-          view_live_html: Katsele tätä kuvaa <br/><em>Avautuu uudessa ikkunassa</em>
+        view_live_html: Katsele tätä kuvaa <br/><em>Avautuu uudessa ikkunassa</em>
         existing_image:
           button_text: Lisää
           resize_image: Suurenna tai pienennä kuvaa?

data/config/locales/fr.yml

@@ -24,8 +24,7 @@ fr:
             switch_to: Afficher sous forme de %{view_name}
             list: liste
             grid: grille
-        grid_view:
-          view_live_html: "Voir cette image<br/><em>Ouvre une nouvelle fenêtre</em>"
+        view_live_html: "Voir cette image<br/><em>Ouvre une nouvelle fenêtre</em>"
         existing_image:
           button_text: Insérer
           resize_image: Redimensionner l'image ?

data/config/locales/hu.yml

@@ -0,0 +1,44 @@
+hu:
+  refinery:
+    plugins:
+      refinery_images:
+        title: Képek
+        description: Képek kezelése
+    admin:
+      images:
+        delete: Kép végleges eltávolítása
+        edit: Kép szerkesztése
+        form:
+          image: Kép
+          use_current_image: Jelenlegi kép használata
+          or: vagy
+          replace_image: " lecserélés a következővel..."
+          current_image: Jelenlegi Kép
+          maximum_image_size: 'A maximum képméret: %{bytes}.'
+        actions:
+          create_new_image: Új kép hozzáadása
+        records:
+          no_images_yet: Még nincsenek képek. Kattints az "Új kép hozzáadása"-ra hogy hozzáadd az első képet.
+        index:
+          view:
+            switch_to: 'Váltás %{view_name} nézetre'
+            list: lista
+            grid: rács
+        view_live_html: Kép megtekintésekor <br/><em>új ablakban nyílik meg</em>
+        existing_image:
+          button_text: Beszúrás
+          resize_image: Kép átméretezése?
+          size: Méret
+        insert:
+          existing_image: Könyvtár
+          new_image: Feltölt
+  activerecord:
+    models:
+      refinery/image: kép
+    errors:
+      models:
+        refinery/image:
+          blank: Meg kell adnod egy feltöltendő képet
+          too_big: A képnek kisebbnek kell lennie mint %{size} bájt
+          incorrect_format: 'A kép formátuma csak JPG, PNG vagy GIF lehet'
+          different_file_name: Új kép nem lehet más néven

data/config/locales/it.yml

@@ -26,7 +26,7 @@ it:
             grid: Griglia
         grid_view:
           edit: Modifica questa immagine
-          view_live_html: Visualizza questa immagine <br/><em>Apri in una nuova finestra</em>
+        view_live_html: Visualizza questa immagine <br/><em>Apri in una nuova finestra</em>
         existing_image:
           button_text: Inserisci
           resize_image: "Ridimensionare l'immagine?"

data/config/locales/ja.yml

@@ -24,8 +24,7 @@ ja:
             switch_to: '%{view_name}表示に切り替え'
             list: リスト
             grid: グリッド
-        grid_view:
-          view_live_html: 'この画像を<br/><em>新しいウィンドウで開く</em>'
+        view_live_html: 'この画像を<br/><em>新しいウィンドウで開く</em>'
         existing_image:
           button_text: 挿入
           resize_image: サイズ変更