refinerycms 0.9.5.31 → 0.9.6

data/vendor/plugins/images/app/helpers/admin/images_helper.rb

@@ -14,4 +14,10 @@ module Admin::ImagesHelper
     end
   end
 
+  def images_paginator(collection, dialog = false)
+    will_paginate collection, :previous_label => '« Previous',
+                              :next_label => 'Next »',
+                              :renderer => Refinery::LinkRenderer
+                              #:params => {:controller => "admin/images", :action => "insert", :dialog => dialog }
+  end
 end

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

@@ -1,52 +1,37 @@
 class Image < ActiveRecord::Base
-
-  has_many :pages
-
+	
+	# Docs for attachment_fu http://github.com/technoweenie/attachment_fu
   has_attachment :content_type => :image,
                  :storage => (USE_S3_BACKEND ? :s3 : :file_system),
                  :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/images'),
                  :processor => 'Rmagick',
                  :thumbnails => ((((thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})).is_a?(Hash) ? thumbnails : (RefinerySetting[:image_thumbnails] = {}))) rescue {}),
-                 :max_size => 5.megabytes
-
+                 :max_size => 50.megabytes
+								
+  # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title],
-          :index_file => [RAILS_ROOT,"tmp","index"]
-
-  def validate
-   errors.add_to_base("You must choose a file to upload") unless self.filename
-
-   unless self.filename.nil?
-     [:size].each do |attr_name|
-       enum = attachment_options[attr_name]
-
-       errors.add_to_base("Files should be smaller than 50 MB in size") unless enum.nil? || enum.include?(send(attr_name))
-     end
-   end
-
-  end
-
+          				:index_file => [RAILS_ROOT,"tmp","index"]
+
+	named_scope :thumbnails, :conditions => "parent_id 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
+	
+	# when listing images out in the admin area, how many images should show per page
+	PAGES_PER_ADMIN_INDEX = 20
+	
+	validates_as_attachment
+	
+	# Returns a titleized version of the filename
+	# my_file.jpg returns My File
   def title
     self.filename.gsub(/\.\w+$/, '').titleize
   end
-
+	
+	# How many images per page should be displayed?
   def self.per_page(dialog = false)
-    size = (dialog ? 18 : 20)
-  end
-
-  def self.last_page(images, dialog=false)
-    page = unless images.size <= self.per_page(dialog)
-      (images.size / self.per_page(dialog).to_f).ceil
-    else
-      nil # this must be nil, it can't be 0 as there apparently isn't a 0th page.
-    end
-  end
-
-  def self.thumbnails
-    find(:all, :conditions => "parent_id not null")
-  end
-
-  def self.originals
-    find_all_by_parent_id(nil)
+    dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
   end
 
-end
+end

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

@@ -1,12 +1,12 @@
-<%= error_messages_for :image %>
+<%= error_messages_for(:image).gsub("Content type is not included in the list", "Your image must be either a JPG, PNG or GIF") %>
 
-<% form_for [:admin, @image], :url => @url_override || @url, 
+<% form_for [:admin, @image], :url => @url_override || @url,
                               :html => {:multipart => true, :style => 'float: left; width: 70%'} do |f| %>
   <div class='field'>
     <%= f.label :uploaded_data, 'Image' %>
     <% if params[:action] =~ /(edit)|(update)/ %>
       Use current image
-      <em>or</em>, replace it with this one... 
+      <em>or</em>, replace it with this one...
     <% end %>
     <%= f.file_field :uploaded_data %>
   </div>
@@ -28,4 +28,11 @@
     <label>Current Image</label>
     <%= image_fu @image, :medium, { :class => "brown_border" } %>
   </div>
-<% end %>
+<% end %>
+<% content_for :head do %>
+  <script type='text/javascript'>
+    $(document).ready(function(){
+      image_dialog.init();
+    });
+  </script>
+<% end if from_dialog? %>

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

@@ -8,8 +8,7 @@
          <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(image),
                                  :title => 'Edit this image' %>
          <%= link_to refinery_icon_tag('delete.png'), admin_image_path(image),
-                                  :confirm => "Are you sure you want to delete #{image.title}?",
-                                  :class => "cancel", :method => :delete,
+                                                                    :class => "cancel confirm-delete",
                                   :title => "Remove this image forever" %>
        </span>
      </li>

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

@@ -7,8 +7,7 @@
         <%= 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),
-                               :confirm => "Are you sure you want to delete #{list_view_image.title}?",
-                               :class => "cancel", :method => :delete,
+                               :class => "cancel confirm-delete",
                                :title => "Remove this image forever" %>
       </span>
       <%= list_view_image.title %> <span class="preview">&nbsp;</span>

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

@@ -4,7 +4,7 @@
       <%= render :partial => "/shared/admin/search", :locals => {:url => admin_images_url} %>
     </li>
     <li>
-      <%= link_to "Create New Image", new_admin_image_url, :class => "add_icon" %>
+      <%= link_to "Create New Image", new_admin_image_url(:dialog => true, :width => 600, :height => 300), :class => "add_icon" %>
     </li>
   </ul>
   <ul>

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

@@ -1,13 +1,13 @@
 <div class='clearfix'>
   <div id='dialog_menu_left'>
     <% unless @images.empty? %>
-      <span id='existing_image_radio' class='radio'>
+      <span id="existing_image_radio" class="radio<%= " selected_radio" if @image.errors.empty? || !@images.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.size > 0 %>'>
-      <input type='radio' name='image_type' value='upload_image' id='image_type_upload' <%= "checked='true'" if @images.empty? or !@image.errors.empty? %> />
+    <span id="upload_image_radio" class="radio<%= " selected_radio" if @image.errors.size > 0 || @images.empty? %>">
+      <input type='radio' name='image_type' value='upload_image' id='image_type_upload' <%= "checked='true'" if @images.empty? || !@image.errors.empty? %> />
       <label for='image_type_upload' class='stripped'>New Image</label>
     </span>
   </div>
@@ -25,7 +25,7 @@
             <% end -%>
           </ul>
         </div>
-        <%= will_paginate @images, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/images", :action => "insert", :dialog => @dialog} unless @thickbox %>
+        <%= images_paginator @images, from_dialog? %>
       </div>
     <% end %>
     <div id='upload_image_area' class='dialog_area' <%= "style='display:none;'" unless @images.empty? %>>
@@ -38,76 +38,13 @@
     <%= submit_tag 'Insert', :id => "submit_button" %>
     or
     <%= link_to "Cancel", "", :id => "cancel_button", :class => "close_dialog" %>
-
-    <%= will_paginate @images, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/images", :action => "insert", :dialog => @dialog } %>
   </div>
 <% end %>
+
 <% content_for :head do %>
-  <%= javascript_include_tag 'refinery/parse_url' %>
   <script type='text/javascript'>
-    set_image = function(img)
-    {
-      $$('#existing_image_area_content ul li.selected').each(function(selected)
-      {
-        $(selected).removeClassName('selected');
-      });
-      if (img != null) {
-        $(img.parentNode).addClassName('selected');
-        imageUrl = parseURL(img.src);
-        relevant_src = imageUrl.pathname.replace('_dialog_thumb', '');
-        // Add any alternate image stores that need a absolute URL in the regex below
-        if( imageUrl.hostname.match(/s3.amazonaws.com/) ) {
-          relevant_src = imageUrl.protocol + '//' + imageUrl.host + relevant_src;
-        }
-<% unless @thickbox %>
-        try {
-          parent.document.getElementById('wym_src').value = relevant_src;
-          parent.document.getElementById('wym_title').value = img.title;
-          parent.document.getElementById('wym_alt').value = img.alt;
-        }
-        catch($e){}
-
-<% end %>
-      }
-    }
-
-    FastInit.addOnLoad(function()
-    {
-<% unless @image_id.nil? %>
-      set_image($('image_<%= @image_id %>'));
-<% end %>
-      $$('#existing_image_area_content ul li img').each(function(img)
-      {
-        img.observe('click', function(){set_image(this);});
-      });
-
-<% if @thickbox %>
-      $('dialog-form-actions').down('#submit_button').observe('click', function(e)
-      {
-        selected = null;
-        $$('#existing_image_area_content ul li.selected img').each(function(selected_img)
-        {
-          selected = selected_img;
-        });
-        if (selected != null)
-        {
-  <% unless @field.blank? %>
-          if ((field = parent.document.getElementById('<%= @field %>')) != null)
-          {
-            field.value = selected.id.replace("image_", "");
-          }
-          if ((image = parent.document.getElementById('<%= @update_image %>')) != null)
-          {
-            image.src = selected.src.replace("_dialog_thumb", '<%= "_#{@thumbnail}" unless @thumbnail.blank? %>');
-            $(image).writeAttribute("width", null).writeAttribute("height", null);
-          }
-  <% end %>
-          <%= "self.parent.#{@callback}();" unless @callback.blank? %>
-          self.parent.tb_remove();
-        }
-        e.stop();
-      });
-<% end %>
+    $(document).ready(function(){
+      image_dialog.init();
     });
   </script>
-<% end %>
+<% end %>

data/vendor/plugins/images/images.md

@@ -4,10 +4,9 @@
 
 ## About
 
-All Refinery's images are stored in one place, the images plugin. This plugin: 
+All Refinery's images are stored in one place, the images plugin. You can customise what sized thumbnails are generated when an image is uploaded.
 
-* Reports recent activity on all the core plugins
-* Provides convenient links to common tasks.
+Images and other file uploads are handled using [attachment_fu](http://github.com/technoweenie/attachment_fu)
 
 ## Generating Thumbnails
 
@@ -15,7 +14,7 @@ Refinery lets you generate a range of thumbnails when an image is uploaded so yo
 
 To specify the sizes of your thumbnails edit the "Image Thumbnails" setting.
 
-This setting is stored as a serialize hash and is directly passed to attachment_fu
+This setting is stored as a serialized hash and is directly passed to [attachment_fu](http://github.com/technoweenie/attachment_fu)
 
 Here's what the default looks like
 
@@ -28,16 +27,22 @@ Here's what the default looks like
     :thumb: 50x50
     :side_body: 300x500
 
-Refinery requires some of these so you won't want to delete any, but add new ones to meet your design needs. Each thumbnail is not just a size guide but a RMagick geometry string that allows you to define min and max size too.
+Refinery requires some of these, so you won't want to delete any, but add new ones to meet your design needs. Each thumbnail is not just a size guide but a [RMagick geometry string](http://www.imagemagick.org/RMagick/doc/imusage.html#geometry) that allows you to define min and max size too.
 
-Refinery also extends the geometry string support to allow cropping. Here's some examples
+Refinery also extends the [geometry string](http://www.imagemagick.org/RMagick/doc/imusage.html#geometry) support to allow cropping. Here's some examples
 
     :grid: c135x135
   
-This will crop (_that's what the "c" stands for_) the image down to ``135x135`` exactly without stretching the image.
+This will crop (_that's what the "c" stands for_) the grid thumbnail down to ``135x135`` exactly, without stretching the image.
 
 _Note: you will have to restart your web server after changing this setting for the changes to take effect._
 
+## Using a Thumbnail Size in Your Theme or View
+
+Take the default thumbnails above to use the ``:side_body`` thumbnail I would collect that image out of the database and apply it like this in my view:
+
+    <%= image_tag(@image.public_filename(:side_body)) %>
+
 ## Related Settings
 
 ### "Preferred Image View"

data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb

@@ -1,19 +1,12 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
     <span class='actions'>
-      <% if inquiry.open? %>
-        <%= link_to refinery_icon_tag('accept.png'), {:action => 'toggle_status', :id => inquiry.id},
-                    {:title => "Move this inquiry to closed"} -%>
-      <% else %>
-        <%= link_to refinery_icon_tag('arrow_up.png'), {:action => 'toggle_status', :id => inquiry.id},
-                                                              {:title => "Move this inquiry to open"} -%>
-      <% end %>
-      <%= link_to refinery_icon_tag('email_open.png'), {:action => 'show', :id => inquiry.id},
-                                                              {:title => "Read this inquiry"} -%>
-      <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry),
-                                                        :method => :delete, :class => "cancel",
-                                                        :confirm => "Are you sure you want to delete #{inquiry.name}?",
-                                                        :title => "Remove this inquiry forever" -%>
+      <%= link_to refinery_icon_tag("#{inquiry.open? ? 'accept' : 'arrow_up'}.png"), {:action => "toggle_status", :id => inquiry.id}, 
+                                                    {:title => "Move this inquiry to #{inquiry.open? ? 'closed' : 'open'}"} %>
+      <%= link_to refinery_icon_tag('email_open.png'), {:action => 'show', :id => inquiry.id}, 
+                                                    {:title => "Read this inquiry"} -%>
+      <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry), :class => "cancel confirm-delete", 
+                                                    :title => "Remove this inquiry forever" -%>
     </span>
     <%=h inquiry.name %>
     <span class="preview">

data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb

@@ -19,8 +19,7 @@
             <span class='actions'>
               <%= link_to refinery_icon_tag("application_edit.png", :alt => "Edit"), edit_admin_inquiry_setting_path(setting) %>
               <%= link_to refinery_icon_tag("delete.png", :alt => "Delete"), admin_inquiry_setting_path(setting),
-                                :confirm => "Are you sure you want to delete #{setting.name}?",
-                                :class => "cancel", :method => :delete ,
+                                                                :class => "cancel confirm-delete" ,
                                 :title => "Remove this inquiry setting forever"  if setting.destroyable? %>
             </span>
             <span><%=h setting.name %></span>

data/vendor/plugins/inquiries/inquiries.md

@@ -4,7 +4,7 @@
 
 ## About
 
-Refinery gives you a simple contact form that notifies you and the customer when an inquiry is made.
+__Refinery gives you a simple contact form that notifies you and the customer when an inquiry is made.__
 
 In summary you can:
 
@@ -14,18 +14,18 @@ In summary you can:
 
 When inquiries come in, you and the customer are notified. The inquiry will now show up as an "open" inquiry. The idea is to deal with the inquiry and then "close" it so you know it's been sorted.
 
-== How do I get notified?
+## How do I get Notified?
 
-Go into your inquiries section and click on "Update who gets notified"
+Go into your 'Inquiries' tab in the Refinery admin area and click on "Update who gets notified"
 
-== How do I edit the auto confirmation email
+## How do I Edit the Automatic Confirmation Email
 
-Go into your inquiries section and click on "Edit confirmation email"
+Go into your 'Inquiries' tab in the Refinery admin area and click on "Edit confirmation email"
 
-== But I don't want a contact form how do I kill it?
+## But I don't ant a Contact Form how do I kill it?
 
 Your contact form loads because you have a page in your site that is told to not just render a normal page, but load the contact form instead.
 
-By default this page is called "Contact Us". Go to your "Pages" tab and click the edit icon on "Contact Us". Now  click on "Hide/Show Advanced Options" and you'll see that a "custom URL" is set to ``/inquiries/new``. Simply change this to nothing, or delete the contact us page.
+By default this page is called "Contact Us". Go to your "Pages" tab in the Refinery admin area and click the edit icon on "Contact Us". Now click on "Hide/Show Advanced Options" and you'll see that a "Custom URL" is set to ``/inquiries/new``. Simply change this to nothing, or delete the contact us page.
 
-You might also want to remove the Inquiries plugin from your backend view. To do that, you go to the "Users" tab edit your user, uncheck "Inquiries" from the list of plugins you can access.
+You might also want to remove the Inquiries plugin from your backend view. To do that, you go to the "Users" tab in the Refinery admin area, edit your user, uncheck "Inquiries" from the list of plugins you can access.

data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb

@@ -6,8 +6,7 @@
       <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_news_item_path(news_item),
                   :title => 'Edit this news item' %>
       <%= link_to refinery_icon_tag('delete.png'), admin_news_item_path(news_item),
-                             :confirm => "Are you sure you want to delete #{news_item.title}?",
-                             :class => "cancel", :method => :delete,
+                                                          :class => "cancel confirm-delete",
                              :title => "Remove this news item forever" %>
     </span>
     <%=h news_item.title %> <span class="preview">&nbsp;</span>

data/vendor/plugins/news/news.md

@@ -4,17 +4,17 @@
 
 ## About
 
-Refinery's news plugin allows you to post updates to the news section of your website.
+__Refinery's news plugin allows you to post updates to the news section of your website.__
 
 Key features:
 
 * Default news page shows a summary of recent news posts
 * Detail view shows the full post and also linked to recent news on the "side bar"
 
-## But I don't want a news section, how do I kill it?
+## But I don't want a News Section, how do I kill it?
 
 Your news section loads because you have a page in your site that is told to not just render a normal page, but load the news section instead.
 
-By default this page is called "News". Go to your "Pages" tab and click the edit icon on "News". Now  click on "Hide/Show Advanced Options" and you'll see that a "custom URL" is set to ``/news``. Simply change this to nothing, or delete the "News" page.
+By default this page is called "News". Go to your "Pages" tab in the Refinery admin area and click the edit icon on "News". Now  click on "Hide/Show Advanced Options" and you'll see that a "Custom URL" is set to ``/news``. Simply change this to nothing, or delete the "News" page.
 
-You might also want to remove the News plugin from your backend view. To do that, you go to the "Users" tab edit your user, uncheck "News" from the list of plugins you can access.
+You might also want to remove the News plugin from your backend view. To do that, you go to the "Users" tab in the Refinery admin area, edit your user, uncheck "News" from the list of plugins you can access.

data/vendor/plugins/pages/app/controllers/admin/page_dialogs_controller.rb

@@ -22,25 +22,26 @@ class Admin::PageDialogsController < Admin::DialogsController
 
       response = http.request request
 
-      render :text => case response
-        when Net::HTTPSuccess, Net::HTTPRedirection
-          "<img src='/images/refinery/icons/tick.png' alt='valid url' title='valid url' width='16' height='16' />"
-        else
-          "<img src='/images/refinery/icons/cross.png' alt='invalid url' title='invalid url' width='16' height='16' />"
-        end
+      render :json => case response
+      when Net::HTTPSuccess, Net::HTTPRedirection
+        {:result => 'success'}
+      else
+        {:result => 'failure'}
+      end
     end
 
     rescue
-      render :text => "<img src='/images/refinery/icons/cross.png' alt='invalid url' title='invalid url' width='16' height='16' />"
+      render :json => {:result => 'failure'}
   end
 
   def test_email
     unless params[:email].blank?
       valid = params[:email] =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
-      render :text => if valid
-        "<img src='/images/refinery/icons/tick.png' alt='valid email address' title='valid email address' width='16' height='16' />"
+
+      render :json => if valid
+        {:result => 'success'}
       else
-        "<img src='/images/refinery/icons/cross.png' alt='invalid email address' title='invalid email address' width='16' height='16' />"
+        {:result => 'failure'}
       end
     end
   end