refinerycms 0.9.6.34 → 0.9.7

data/vendor/plugins/i18n/lib/routing_filter/routing_filter/pagination.rb

@@ -0,0 +1,33 @@
+require 'routing_filter/base'
+
+module RoutingFilter
+  class Pagination < Base
+    def around_recognize(path, env, &block)
+      page = extract_page!(path)
+      returning yield(path, env) do |params|
+        params[:page] = page.to_i if page
+      end
+    end
+
+    def around_generate(*args, &block)
+      page = args.extract_options!.delete(:page)
+      returning yield do |result|
+        if page && page != 1
+          url = result.is_a?(Array) ? result.first : result
+          append_page!(url, page)
+        end
+      end
+    end
+
+    protected
+
+      def extract_page!(path)
+        path.sub! %r(/pages/([\d]+)/?$), ''
+        $1
+      end
+
+      def append_page!(url, page)
+        url.sub!(/($|\?)/) { "/pages/#{page}#{$1}" }
+      end
+  end
+end

data/vendor/plugins/i18n/lib/routing_filter/routing_filter/uuid_token.rb

@@ -0,0 +1,78 @@
+# This is a routing filter that extracts UUIDs from urls and exposes them via
+# params[:uuid_token]
+#
+# URL scheme: http://example.com/d00fbbd1-82b6-4c1a-a57d-098d529d6854/your_route
+#
+# To enable this filter add map.filter :uuid_token to your routes.rb
+#
+# To make your restful path helpers use this :uuid_token use:
+# new_post_path(:uuid_token => params[:uuid_token])
+#
+# If don't want to pass the :uuid_token manually you can add a custom module
+# like this to your RAILS_ROOT/lib directory:
+#
+#   module AccessToken
+#
+#     class << self
+#       def current=(token)
+#         Thread.current[:uuid_token] = token
+#       end
+#
+#       def current
+#         Thread.current[:uuid_token] ||= ""
+#       end
+#     end
+#
+#   end
+#
+# Now in your application_controller you can set a before_filter which sets that
+# token for every request:
+#
+#   before_filter :set_token
+#
+#   protected
+#
+#     def set_token
+#       AccessToken.current = params[:uuid_token] if params[:uuid_token]
+#     end
+#
+# As you can see below in the around_generate method, if you don't provide a
+# :uuid_token argument for your restful path helpers it will try to get the
+# current :uuid_token from the AccessToken module.
+
+require 'routing_filter/base'
+
+module RoutingFilter
+  class UuidToken < Base
+
+    def around_recognize(path, env, &block)
+      token = extract_token!(path)                              # remove the token from the beginning of the path
+      returning yield do |params|                               # invoke the given block (calls more filters and finally routing)
+        params[:uuid_token] = token if token                    # set recognized token to the resulting params hash
+      end
+    end
+
+    def around_generate(*args, &block)
+      token = args.extract_options!.delete(:uuid_token)         # extract the passed :token option
+      token = AccessToken.current if AccessToken && token.nil?  # default to AccessToken.current when token is nil (could also be false)
+
+      returning yield do |result|
+        if token
+          url = result.is_a?(Array) ? result.first : result
+          prepend_token!(url, token)
+        end
+      end
+    end
+
+    protected
+
+      def extract_token!(path)
+        path.sub! /([a-z\d]{8}\-[a-z\d]{4}\-[a-z\d]{4}\-[a-z\d]{4}\-[a-z\d]{12})\//, ''
+        $1
+      end
+
+      def prepend_token!(url, token)
+        url.sub!(%r(^(http.?://[^/]*)?(.*))) { "#{$1}/#{token}#{$2}" }
+      end
+  end
+end

data/vendor/plugins/i18n/rails/init.rb

@@ -0,0 +1,4 @@
+lib_dir = Pathname.new(__FILE__).parent.parent.join("lib")
+%w(i18n.rb routing_filter/routing_filter.rb routing_filter/routing_filter/base.rb i18n_filter.rb).each do |file|
+  require lib_dir.join(file).to_s if lib_dir.join(file).exist?
+end

data/vendor/plugins/images/app/controllers/admin/images_controller.rb

@@ -18,12 +18,7 @@ class Admin::ImagesController < Admin::BaseController
     end
 
     if RefinerySetting.find_or_set(:group_images_by_date_uploaded, true)
-      @grouped_images = []
-      @images.each do |image|
-        key = image.created_at.strftime("%Y-%m-%d")
-        image_group = @grouped_images.collect{|images| images.last if images.first == key }.flatten.compact << image
-        (@grouped_images.delete_if {|i| i.first == key}) << [key, image_group]
-      end
+      @grouped_images = group_by_date(@images)
     end
   end
 
@@ -57,7 +52,7 @@ class Admin::ImagesController < Admin::BaseController
 
     unless params[:insert]
       if @image.valid?
-        flash[:notice] = "'#{@image.title}' was successfully created."
+        flash[:notice] = t('refinery.crudify.created', :what => "'#{@image.title}'")
         unless from_dialog?
           redirect_to :action => 'index'
         else
@@ -95,4 +90,8 @@ protected
                                :include => :thumbnails
   end
 
+  def store_current_location!
+    super unless action_name == 'insert' or from_dialog?
+  end
+
 end

data/vendor/plugins/images/app/models/image.rb

@@ -17,28 +17,28 @@ class Image < ActiveRecord::Base
   # This is a known problem when using attachment_fu
   def validate
     if self.filename.nil?
-      errors.add_to_base("You must choose an image to upload")
+      errors.add_to_base(I18n.translate('no_file_chosen')) unless self.filename
     else
       [:size, :content_type].each do |attr_name|
         enum = attachment_options[attr_name]
 
         unless enum.nil? || enum.include?(send(attr_name))
-          errors.add_to_base("Images should be smaller than #{MAX_SIZE_IN_MB} MB in size") if attr_name == :size
-          errors.add_to_base("Your image must be either a JPG, PNG or GIF") if attr_name == :content_type
+          errors.add_to_base(I18n.translate('file_should_be_smaller_than_max_image_size',
+                              :max_image_size => ActionController::Base.helpers.number_to_human_size(MAX_SIZE_IN_MB) ))
+          errors.add_to_base(I18n.translate('file_must_be_these_formats')) if attr_name == :content_type
         end
       end
     end
   end
 
   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
-  acts_as_indexed :fields => [:title],
-                  :index_file => [Rails.root.to_s, "tmp", "index"]
+  acts_as_indexed :fields => [:title]
 
   named_scope :thumbnails, :conditions => "parent_id IS NOT NULL"
   named_scope :originals, :conditions => {:parent_id => nil}
 
   # when a dialog pops up with images, how many images per page should there be
-  PAGES_PER_DIALOG = 18
+  PAGES_PER_DIALOG = 12
 
   # when listing images out in the admin area, how many images should show per page
   PAGES_PER_ADMIN_INDEX = 20
@@ -54,4 +54,22 @@ class Image < ActiveRecord::Base
     CGI::unescape(self.filename).gsub(/\.\w+$/, '').titleize
   end
 
+  # Rebuild thumbnails, for rake tasks
+  def rebuild_thumbnails!
+    build_thumbnails!
+  end
+
+  def rebuild_missing_thumbnails!
+    build_thumbnails!(true)
+  end
+
+private
+  def build_thumbnails!(only_missing = false)
+    tmp = create_temp_file
+    attachment_options[:thumbnails].each do |thumbnail, size|
+      unless only_missing and !Image.find(:first, :conditions => {:thumbnail => thumbnail, :parent_id => self.id}).nil?
+        self.create_or_update_thumbnail(tmp, thumbnail, *size)
+      end
+    end unless self.parent_id
+  end
 end

data/vendor/plugins/images/app/views/admin/images/_existing_image.erb

@@ -0,0 +1,50 @@
+<div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" if @image.errors.any? %>>
+  <input type='hidden' name='selected_image' id='selected_image' />
+  <div id='existing_image_area_content' class='clearfix'>
+    <ul>
+      <% @images.each do |image| %>
+        <li<%= " class='selected'" if @image_id == image.id %>>
+          <%= image_fu image, :dialog_thumb, {:alt => image.title, :title => image.title, :id => "image_#{image.id}"} -%>
+        </li>
+      <% end -%>
+    </ul>
+  </div>
+  <%= images_paginator @images, from_dialog? %>
+  <% unless @app_dialog %>
+    <div id='existing_image_size_area' class='clearfix'>
+      <input type='hidden' name='selected_image_size' id='selected_image_size' />
+      <h2>Size</h2>
+      <p>
+        <label>
+          <input type="checkbox" id="wants_to_resize_image" name="wants_to_resize_image" value="1" checked="checked" />
+          Resize the image? <em>(Recommended)</em>
+        </label>
+      </p>
+      <ul>
+        <%
+          thumbnail_sizes = RefinerySetting.find_or_set(:image_thumbnails, {})
+          (sizes = RefinerySetting.find_or_set(:image_dialogue_sizes, [:small, :medium, :large])).each_with_index do |size, index|
+            if thumbnail_sizes.keys.include?(size) and (pixels = thumbnail_sizes[size]).present?
+              pixels.to_s.gsub!(/[<>=]/, '')
+        -%>
+              <li id="image_dialog_size_<%= index %>" class="image_dialog_size <%= 'selected' if size == :medium %>">
+                <%= link_to size.to_s, "##{size}",
+                            :rel => size.to_s,
+                            :title   => "#{size} image (#{pixels} px)",
+                            :tooltip => "#{size} image (#{pixels} px)" %>
+              </li>
+        <%  end
+          end -%>
+      </ul>
+    </div>
+  <% end %>
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => nil,
+               :cancel_url => '',
+               :submit_button_text => t('.submit_insert'),
+               :hide_cancel => false,
+               :hide_delete => true,
+               :cancel_title => ''
+             } if @app_dialog or @images.any? %>
+</div>

data/vendor/plugins/images/app/views/admin/images/_form.html.erb

@@ -1,17 +1,25 @@
-<%= error_messages_for :image %>
-
 <% form_for [:admin, @image], :url => @url_override || @url,
                               :html => {:multipart => true, :style => 'float: left; width: 70%'} do |f| %>
+  <%= f.error_messages %>
+
   <div class='field'>
-    <%= f.label :uploaded_data, 'Image' %>
     <% if action_name =~ /(edit)|(update)/ %>
-      Use current image
-      <em>or</em>, replace it with this one...
+      <%= t('.use_current_image') %>
+      <em><%= t('.or') %></em>, <%= t('.replace_image') %>
     <% end %>
     <%= f.file_field :uploaded_data %>
   </div>
 
-  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_cancel => (@app_dialog or action_name == "insert")} %>
+  <div class='field'>
+    <label><%= t('.maximum_image_size', :megabytes => (Image.attachment_options[:max_size] / 1024 / 1024)) %></label>
+  </div>
+
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => f,
+               :continue_editing => false,
+               :hide_cancel => (@app_dialog or action_name == "insert" or from_dialog?)
+             } %>
 
   <% if @app_dialog %>
     <input type='hidden' name='app_dialog' value='<%= @app_dialog %>' />
@@ -25,7 +33,7 @@
 
 <% if action_name =~ /(edit)|(update)/ %>
   <div style='float: right; width: 25%;'>
-    <label>Current Image</label>
+    <label><%=t('.current_image') %></label>
     <%= image_fu @image, :medium, { :class => "brown_border" } %>
   </div>
 <% end %>

data/vendor/plugins/images/app/views/admin/images/_grid_view.html.erb

@@ -1,16 +1,16 @@
 <ul id="image_grid" class="clearfix">
-  <% @images.each do |image| -%>
-    <li id="image_<%= image.id %>" <%= "class='row-end'" if (@images.index(image)+1) % 4 == 0 %>>
+  <% @images.each_with_index do |image, index| -%>
+    <li id="image_<%= image.id %>" class='image_<%= index % 5 %>'>
       <%= image_fu image, :grid, :title => image.title %>
       <span class='actions'>
         <%= link_to refinery_icon_tag('eye.png'), image.public_filename,
                     :target => "_blank",
-                    :title => "Click to view '#{image.title}'<br/><em>Opens in a new window</em>" %>
+                    :title => t('.view_live') %>
         <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(image),
-                    :title => 'Edit this image' %>
+                    :title => t('.edit') %>
         <%= link_to refinery_icon_tag('delete.png'), admin_image_path(image),
                     :class => "cancel confirm-delete",
-                    :title => "Remove this image forever" %>
+                    :title => t('.confirm_delete.title') %>
       </span>
     </li>
   <% end -%>

data/vendor/plugins/images/app/views/admin/images/_list_view.html.erb

@@ -1,6 +1,8 @@
 <% if RefinerySetting.find_or_set(:group_images_by_date_uploaded, true) %>
   <% @grouped_images.each do |container| %>
-    <h3><%= (image_group = container.last).first.created_at.strftime("%A, %d %B %Y") %></h3>
+    <% date_time = (image_group = container.last).first.created_at %>
+    <% date = Date.parse(date_time.to_s) %>
+    <h3><%= l(date, :format => :long ) %></h3>
     <ul>
       <%= render :partial => 'list_view_image', :collection => image_group %>
     </ul>

data/vendor/plugins/images/app/views/admin/images/_list_view_image.html.erb

@@ -2,16 +2,16 @@
   <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 class='actions'>
-        <%= link_to refinery_icon_tag('eye.png'), list_view_image.public_filename,
-                    :target => "_blank",
-                    :title => "#{image_fu list_view_image, :preview}" %>
-        <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(list_view_image),
-                    :title => 'Edit this image' %>
-        <%= link_to refinery_icon_tag('delete.png'), admin_image_path(list_view_image),
-                    :class => "cancel confirm-delete",
-                    :title => "Remove this image forever" %>
-      </span>
+    </span>
+    <span class='actions'>
+      <%= link_to refinery_icon_tag('eye.png'), list_view_image.public_filename,
+                  :target => "_blank",
+                  :title => "#{image_fu list_view_image, :preview}" %>
+      <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(list_view_image),
+                  :title => t('.edit_this_image') %>
+      <%= link_to refinery_icon_tag('delete.png'), admin_image_path(list_view_image),
+                  :class => "cancel confirm-delete",
+                  :title => t('.delete.title') %>
     </span>
   </li>
 <% end %>

data/vendor/plugins/images/app/views/admin/images/index.html.erb

@@ -4,13 +4,11 @@
       <%= render :partial => "/shared/admin/search", :locals => {:url => admin_images_url} %>
     </li>
     <li>
-      <%= link_to "Create New Image", new_admin_image_url(:dialog => true, :width => 600, :height => 300), :class => "add_icon" %>
+      <%= link_to t('.create_new_image'), new_admin_image_url(:dialog => true, :width => 600, :height => 300), :class => "add_icon" %>
     </li>
-  </ul>
-  <ul>
     <% other_image_views.each do |image_view| %>
       <li>
-        <%= link_to "Switch to #{image_view.to_s.titleize} View",
+        <%= link_to t('.view.switch_to', :view_name => t('.view.' + image_view.to_s)),
           admin_images_url(:view => image_view, :page => params[:page]),
           :class => "reorder_icon"  %>
       </li>
@@ -19,11 +17,11 @@
 </div>
 <div id='records'>
   <% if searching? %>
-    <h2>Search Results for "<%= params[:search] %>"</h2>
+    <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
     <% if @images.any? %>
       <%= render :partial => "#{current_image_view}_view" %>
     <% else %>
-      <p>Sorry, no results found.</p>
+      <p><%= t('admin.no_results_found') %></p>
     <% end %>
   <% else %>
     <% if @images.any? %>
@@ -33,8 +31,7 @@
     <% else %>
       <p>
         <strong>
-          There are no images yet.
-          Click "Create New Image" to add your first image.
+          <%= t('.no_images_yet') %>
         </strong>
       </p>
     <% end %>

data/vendor/plugins/images/app/views/admin/images/insert.html.erb

@@ -1,45 +1,23 @@
-<div class='clearfix'>
-  <div id='dialog_menu_left'>
-    <% if @images.any? %>
-      <span id="existing_image_radio" class="radio<%= " selected_radio" if @image.errors.empty? %>">
-        <input type='radio' name='image_type' value='existing_image' id='image_type_existing' <%= "checked='true'" if @image.errors.empty? %> />
-        <label for='image_type_existing' class='stripped'>Existing Image</label>
-      </span>
-    <% end %>
-    <span id="upload_image_radio" class="radio<%= " selected_radio" if @image.errors.any? or @images.empty? %>">
-      <input type='radio' name='image_type' value='upload_image' id='image_type_upload' <%= "checked='true'" if @images.empty? || @image.errors.any? %> />
-      <label for='image_type_upload' class='stripped'>New Image</label>
+<div id='dialog_menu_left'>
+  <% if @images.any? %>
+    <span id="existing_image_radio" class="radio<%= " selected_radio" if @image.errors.empty? %>">
+      <input type='radio' name='image_type' value='existing_image' id='image_type_existing' <%= "checked='true'" if @image.errors.empty? %> />
+      <label for='image_type_existing' class='stripped'><%=t('.existing_image')%></label>
     </span>
-  </div>
+  <% end %>
+  <span id="upload_image_radio" class="radio<%= " selected_radio" if @image.errors.any? or @images.empty? %>">
+    <input type='radio' name='image_type' value='upload_image' id='image_type_upload' <%= "checked='true'" if @images.empty? || @image.errors.any? %> />
+    <label for='image_type_upload' class='stripped'><%= t('.new_image') %></label>
+  </span>
+</div>
+
+<div id='dialog_main'>
+  <%= render :partial => "existing_image" if @images.any? %>
 
-  <div id='dialog_main'>
-    <% if @images.any? %>
-      <div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" if @image.errors.any? %>>
-        <input type='hidden' name='selected_image' id='selected_image' />
-        <div id='existing_image_area_content' class='clearfix'>
-          <ul>
-            <% @images.each do |image| %>
-              <li<%= " class='selected'" if @image_id == image.id %>>
-                <%= image_fu image, :dialog_thumb, {:alt => image.title, :title => image.title, :id => "image_#{image.id}"} -%>
-              </li>
-            <% end -%>
-          </ul>
-        </div>
-        <%= images_paginator @images, from_dialog? %>
-      </div>
-    <% end %>
-    <div id='upload_image_area' class='dialog_area' <%= "style='display:none;'" if @images.any? and @image.errors.empty? %>>
-      <%= render :partial => "form", :locals => {:insert => true} %>
-    </div>
+  <div id='upload_image_area' class='dialog_area' <%= "style='display:none;'" if @images.any? and @image.errors.empty? %>>
+    <%= render :partial => "form", :locals => {:insert => true} %>
   </div>
 </div>
-<% if @app_dialog %>
-  <div id='dialog-form-actions' class='form-actions'>
-    <%= submit_tag 'Insert', :id => "submit_button" %>
-    or
-    <%= link_to "Cancel", "", :id => "cancel_button", :class => "close_dialog" %>
-  </div>
-<% end %>
 
 <% content_for :head do %>
   <script type='text/javascript'>