refinerycms 0.9.6.14 → 0.9.6.15

data/test/unit/resource_test.rb

@@ -17,7 +17,7 @@ class ResourceTest < ActiveSupport::TestCase
   def test_attachment_fu_options
     assert_equal 50.megabytes, Resource.attachment_options[:max_size]
 
-    if USE_S3_BACKEND 
+    if Refinery.s3_backend
       assert_equal :s3, Resource.attachment_options[:storage]
       assert_nil Resource.attachment_options[:path_prefix]
     else
@@ -25,9 +25,9 @@ class ResourceTest < ActiveSupport::TestCase
       assert_equal 'public/system/resources', Resource.attachment_options[:path_prefix]
     end
   end
-  
+
   def test_type_of_content
     assert_equal "application pdf", resources(:pdf_document).type_of_content
   end
 
-end
+end

data/themes/demolicious/views/layouts/application.html.erb

@@ -17,4 +17,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

data/themes/demolicious/views/pages/home.html.erb

@@ -1 +1 @@
-<%= render :partial => "/shared/content_page", :locals => {:show_submenu => false} %>
+<%= render :partial => "/shared/content_page", :locals => {:show_submenu => false} %>

data/themes/demolicious/views/pages/show.html.erb

@@ -1 +1 @@
-<%= render :partial => "/shared/content_page" %>
+<%= render :partial => "/shared/content_page" %>

data/themes/hemingway/views/layouts/application.html.erb

@@ -52,4 +52,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb

@@ -2,7 +2,7 @@ class Admin::DashboardController < Admin::BaseController
 
   def index
     @recent_activity = []
-    
+
     Refinery::Plugins.active.each do |plugin|
       begin
         plugin.activity.each do |activity|

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

@@ -3,4 +3,4 @@ Refinery::Plugin.register do |plugin|
   plugin.description = "Gives an overview of activity in Refinery"
   plugin.version = 1.0
   plugin.always_allow_access = true
-end
+end

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

@@ -79,7 +79,7 @@ class Admin::ImagesController < Admin::BaseController
 protected
 
   def init_dialog
-    @thickbox = params[:thickbox].present?
+    @app_dialog = params[:app_dialog].present?
     @field = params[:field]
     @update_image = params[:update_image]
     @thumbnail = params[:thumbnail]
@@ -92,7 +92,7 @@ protected
                                :conditions => {:parent_id => nil}.merge!(conditions),
                                :order => 'created_at DESC',
                                :per_page => Image.per_page(from_dialog?),
-                              :include => :thumbnails
+                               :include => :thumbnails
   end
 
 end

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

@@ -8,6 +8,10 @@ module Admin::ImagesHelper
     RefinerySetting.find_or_set(:preferred_image_view, :list)
   end
 
+  def other_image_views
+    image_views.reject {|image_view| image_view.to_s == current_image_view.to_s }
+  end
+
   def change_list_mode_if_specified
     unless params[:action] != "index" or params[:view].blank? or !image_views.include? params[:view].to_sym
       RefinerySetting[:preferred_image_view] = params[:view]
@@ -18,6 +22,6 @@ module Admin::ImagesHelper
     will_paginate collection, :previous_label => '« Previous',
                               :next_label => 'Next »',
                               :renderer => Refinery::LinkRenderer
-                              #:params => {:controller => "admin/images", :action => "insert", :dialog => dialog }
   end
-end
+  
+end

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

@@ -5,8 +5,8 @@ class Image < ActiveRecord::Base
 
   # 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'),
+                 :storage => (Refinery.s3_backend ? :s3 : :file_system),
+                 :path_prefix => (Refinery.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 => MAX_SIZE_IN_MB.megabytes
@@ -21,7 +21,7 @@ class Image < ActiveRecord::Base
     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

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

@@ -11,10 +11,10 @@
     <%= f.file_field :uploaded_data %>
   </div>
 
-  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_cancel => (@thickbox or params[:action] == "insert")} %>
+  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_cancel => (@app_dialog or params[:action] == "insert")} %>
 
-  <% if @thickbox %>
-    <input type='hidden' name='thickbox' value='<%= @thickbox %>' />
+  <% 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 %>' />
@@ -28,4 +28,4 @@
     <label>Current Image</label>
     <%= image_fu @image, :medium, { :class => "brown_border" } %>
   </div>
-<% end %>
+<% end %>

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

@@ -8,7 +8,7 @@
     </li>
   </ul>
   <ul>
-    <% image_views.delete_if {|image_view| image_view.to_s == current_image_view.to_s }.each do |image_view| %>
+    <% other_image_views.each do |image_view| %>
       <li>
         <%= link_to "Switch to #{image_view.to_s.titleize} View",
           admin_images_url(:view => image_view, :page => params[:page]),
@@ -39,4 +39,4 @@
       </p>
     <% end %>
   <% end %>
-</div>
+</div>

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

@@ -33,7 +33,7 @@
     </div>
   </div>
 </div>
-<% if @thickbox %>
+<% if @app_dialog %>
   <div id='dialog-form-actions' class='form-actions'>
     <%= submit_tag 'Insert', :id => "submit_button" %>
     or

data/vendor/plugins/inquiries/app/models/inquiry.rb

@@ -7,10 +7,10 @@ class Inquiry < ActiveRecord::Base
 
   acts_as_indexed :fields => [:name, :email, :message, :phone],
                   :index_file => [Rails.root.to_s, "tmp", "index"]
-  
+
   default_scope :order => 'created_at DESC'
-  
+
   named_scope :closed, :conditions => {:open => false}
   named_scope :open, :conditions => {:open => true}
 
-end
+end

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

@@ -54,7 +54,7 @@
       </td>
       <td>
         <p style='margin-top: 0px'>
-          <%=h @inquiry.message.gsub("\r\n\r\n", "\r\n").gsub("\r\n", "</p><p>") %>
+          <%= h(@inquiry.message).gsub("\r\n\r\n", "\r\n").gsub("\r\n", "</p><p>") %>
         </p>
       </td>
     </tr>

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

@@ -10,4 +10,4 @@ Refinery::Plugin.register do |plugin|
 end
 
 # Set the actionmailer root so that it'll work for delivering emails from this plugin.
-ActionMailer::Base.template_root = Refinery.root.join("vendor", "plugins", "inquiries", "app", "views").to_s
+ActionMailer::Base.template_root = Refinery.root.join("vendor", "plugins", "inquiries", "app", "views").to_s

data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb

@@ -2,4 +2,4 @@ class Admin::NewsItemsController < Admin::BaseController
 
   crudify :news_item, :order => "created_at DESC"
 
-end
+end

data/vendor/plugins/news/app/controllers/news_items_controller.rb

@@ -17,4 +17,4 @@ protected
     @page = Page.find_by_link_url("/news", :include => [:parts, :slugs])
   end
 
-end
+end

data/vendor/plugins/news/app/models/news_item.rb

@@ -6,7 +6,7 @@ class NewsItem < ActiveRecord::Base
 
   acts_as_indexed :fields => [:title, :body],
                   :index_file => [Rails.root.to_s, "tmp", "index"]
-  
+
   default_scope :order => "publish_date DESC"
   named_scope :latest, :conditions => ["publish_date < ?", Time.now], :limit => 10
   named_scope :published, :conditions => ["publish_date < ?", Time.now]
@@ -19,4 +19,4 @@ class NewsItem < ActiveRecord::Base
     20
   end
 
-end
+end

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

@@ -12,4 +12,4 @@
     </span>
     <%=h news_item.title %> <span class="preview">&nbsp;</span>
   </span>
-</li>
+</li>

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

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

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

@@ -1,6 +1,7 @@
 class Admin::PagesController < Admin::BaseController
 
   crudify :page, :conditions => "parent_id IS NULL", :order => "position ASC", :include => [:parts, :slugs, :children], :paging => false
+  before_filter :find_pages_for_parents_list, :only => [:new, :create, :edit, :update]
   after_filter :expire_menu_fragment_caching, :only => [:create, :update, :destroy]
 
   def new
@@ -15,4 +16,16 @@ protected
     expire_fragment(%r{site_menu})
   end
 
+  # This finds all of the pages that could possibly be assigned as the current page's parent.
+  def find_pages_for_parents_list
+    @pages_for_parents_list = Page.find(:all, :order => "parent_id, position ASC")
+
+    # We need to remove all references to the current page or any of its decendants or we get a nightmare.
+    unless @page.nil? or @page.new_record?
+      @pages_for_parents_list.reject! do |page|
+        page.id == @page.id or @page.descendants.include?(page)
+      end
+    end
+  end
+
 end

data/vendor/plugins/pages/app/models/page_part.rb

@@ -5,6 +5,8 @@ class PagePart < ActiveRecord::Base
   validates_presence_of :title
   alias_attribute :content, :body
 
-  has_friendly_id :title, :use_slug => true
+  def to_param
+    "page_part_#{self.title.downcase.gsub(" ", "_")}"
+  end
 
 end

data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb

@@ -1,5 +1,5 @@
-<% linked = (page_link.url == params[:current_link]) if params[:current_link].present? %>
+<% linked = (url_for(page_link.url) == params[:current_link]) if params[:current_link].present? %>
 <li class='clearfix<%= " child#{child}" if child %><%= " linked" if linked%>' id="<%= dom_id(page_link) -%>">
   <%= link_to page_link.title_with_meta, page_link.url, :title => 'Link to this Page', :rel => page_link.title, :class => 'page_link' %>
 </li>
-<%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} if page_link.children.any? %>
+<%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} if page_link.children.any? %>

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

@@ -9,7 +9,7 @@
     <ul id="page_parts">
     <% @page.parts.each_with_index do |part, part_index| %>
       <li>
-        <%= link_to part.title, "##{@page.new_record? ? "page_part_new_#{part_index}" : dom_id(part)}" %>
+        <%= link_to part.title, "##{@page.new_record? ? "page_part_new_#{part_index}" : part.to_param}" %>
       </li>
     <% end %>
     </ul>
@@ -41,7 +41,7 @@
   <div id='more_options' style="display:none;">
     <div class='field'>
       <%= f.label :parent_id %>
-      <%= f.collection_select :parent_id, Page.find(:all, :order => "parent_id, position ASC"), :id, :indented_title, :include_blank => true %>
+      <%= f.collection_select :parent_id, @pages_for_parents_list, :id, :indented_title, :include_blank => true %>
     </div>
     <div class='field'>
       <%= label_tag :custom_title %>

data/vendor/plugins/pages/app/views/admin/pages/_page_part_field.html.erb

@@ -1,4 +1,4 @@
-<div class='page_part field' id='<%= new_part ? "page_part_new_#{part_index}" : dom_id(part) %>'>
+<div class='page_part field' id='<%= new_part ? "page_part_new_#{part_index}" : part.to_param %>'>
   <%= hidden_field_tag "page[parts_attributes][#{part_index}][title]", part.title if new_part %>
   <%= text_area_tag "page[parts_attributes][#{part_index}][body]", part.body, :rows => 20, :cols => 140, :class => 'wymeditor' %>
 </div>

data/vendor/plugins/refinery/app/views/admin/_head.html.erb

@@ -2,10 +2,10 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery</title>
-  <%= stylesheet_link_tag 'refinery/thickbox', 'refinery/refinery', 'refinery/tooltips', :cache => (use_caching ? "cache/refinery" : false) %>
+  <%= stylesheet_link_tag 'refinery/refinery', 'refinery/tooltips', :cache => (use_caching ? "cache/refinery" : false) %>
   <%= render :partial => "/shared/admin/head_before_javascript_libraries" -%>
   <%= jquery_include_tags(use_caching) %>
-  <%= javascript_include_tag 'admin', 'thickbox', 'wymeditor/jquery.refinery.wymeditor.js', 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
+  <%= javascript_include_tag 'admin', 'wymeditor/jquery.refinery.wymeditor.js', 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
   <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>
   <%= yield :head %>
-</head>
+</head>

data/vendor/plugins/refinery/app/views/admin/_menu.html.erb

@@ -1,14 +1,10 @@
 <ul id="menu">
-  <%
-  Refinery::Plugins.active.each do |plugin|
-    unless plugin.hide_from_menu
-  -%>
+  <% Refinery::Plugins.active.in_menu.each do |plugin| -%>
     <li class='tab' id='plugin_<%= plugin.title %>'>
       <%= link_to plugin.title, plugin.url, :class => (plugin.highlighted?(params) ? "active" : "") %>
     </li>
-  <% end
-  end -%>
-  <% if Refinery::Plugins.active.in_menu.size > 1 -%>
+  <% end -%>
+  <% if Refinery::Plugins.active.in_menu.many? -%>
     <li>
       <%= link_to "&nbsp;", "", :id => "menu_reorder", :title => "Reorder menu" %>
       <%= link_to "&nbsp;", "", :id => "menu_reorder_done", :title => "I'm done reordering the menu", :style => "display: none;" %>

data/vendor/plugins/refinery/app/views/shared/_menu.html.erb

@@ -1,4 +1,4 @@
-<% cache(:action_suffix => "site_menu") do %>
+<% cache(:action_suffix => RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")) do %>
   <ul id='<%= dom_id ||= "menu" %>' class='menu clearfix'>
     <%= render :partial => "/shared/menu_branch", :collection => @menu_pages, :locals => {
       :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),

data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb

@@ -6,8 +6,10 @@
   <% end -%>
   <% unless (hide_cancel ||= from_dialog?) -%>
     or
-    <%= link_to "Cancel", (cancel_url ||= send("admin_#{f.object.class.name.pluralize.underscore}_url")),
-          :title => (title ||= "Cancelling will lose all changes you've made to this #{f.object.class.name.underscore.gsub("_", " ")}"),
-          :id => "#{cancel_button_id ||= "cancel_button"}", :class => "close_dialog" %>
+    <%= link_to "Cancel",
+                (cancel_url ||= ((back=url_for(:back)).include?('javascript') ? send("admin_#{f.object.class.name.pluralize.underscore}_url") : back)),
+                :title => (title ||= "Cancelling will lose all changes you've made to this #{f.object.class.name.underscore.gsub("_", " ")}"),
+                :id => "#{cancel_button_id ||= "cancel_button"}",
+                :class => "close_dialog" %>
   <% end -%>
 </div>

data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb

@@ -8,7 +8,7 @@
 <%= f.hidden_field field, :id => "current_image_id_#{randomiser}" -%>
 
 <div id='current_image_container_<%= randomiser %>'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
-  <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;callback=image_picker_<%= randomiser %>_changed&amp;KeepThis=true&amp;TB_iframe=true&amp;width=958&amp;height=510" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='thickbox'>
+  <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url %>?dialog=true&amp;modal=true&amp;titlebar=true&amp;callback=image_picker_<%= randomiser %>_changed&amp;KeepThis=true&amp;TB_iframe=true&amp;width=958&amp;height=510" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='dialog'>
     <% unless image.nil? -%>
       <%= image_fu image, nil, {:class => "brown_border", :id => "current_picked_image_#{randomiser}"} %>
     <% else -%>

data/vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb

@@ -3,7 +3,6 @@
   <%= link_to "<span id='no_resource_selected' #{"style='display: none;'" if resource.present?}>
         There is currently no #{description ||= resource} selected, click here to add one.
       </span>", insert_admin_resources_url(:dialog => true,
-                  :thickbox => true,
                   :update_resource => 'current_resource',
                   :update_text => 'current_resource_text',
                   :callback => 'resource_changed',

data/vendor/plugins/refinery/lib/refinery.rb

@@ -1,11 +1,18 @@
 module Refinery
 
   class << self
-    attr_accessor :root
+    attr_accessor :is_a_gem, :root, :s3_backend
+    def is_a_gem
+      @is_a_gem ||= false
+    end
+
     def root
       @root ||= Pathname.new(File.dirname(__FILE__).split("vendor").first.to_s)
     end
-    attr_accessor :is_a_gem
+
+    def s3_backend
+      @s3_backend ||= false
+    end
   end
 
 end

data/vendor/plugins/refinery/lib/refinery/application_controller.rb

@@ -77,4 +77,4 @@ protected
     super
   end
 
-end
+end

data/vendor/plugins/refinery/lib/refinery/deprecations.rb

@@ -0,0 +1,46 @@
+require 'active_support/string_inquirer'
+require 'active_support/deprecation'
+
+# Set up deprecation warnings:
+Refinery.s3_backend = USE_S3_BACKEND if defined?(USE_S3_BACKEND) # map it before we deprecate it incase it's already in use
+USE_S3_BACKEND = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
+  cattr_accessor :warned
+  self.warned = false
+
+  def target(*args)
+    Refinery.s3_backend
+  end
+
+  def replace(*args)
+    warn(caller, :replace, *args)
+  end
+
+  def warn(callstack, called, args)
+    unless self.warned
+      puts (msg = "USE_S3_BACKEND is deprecated! Use Refinery.s3_backend instead")
+      ActiveSupport::Deprecation.warn(msg, callstack)
+      self.warned = true
+    end
+  end
+end).new
+
+REFINERY_ROOT = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
+  cattr_accessor :warned
+  self.warned = false
+
+  def target
+    Refinery.root
+  end
+
+  def replace(*args)
+    warn(caller, :replace, *args)
+  end
+
+  def warn(callstack, called, args)
+    unless warned
+      puts (msg = "REFINERY_ROOT is deprecated! Use Refinery.root instead")
+      ActiveSupport::Deprecation.warn(msg, callstack)
+      self.warned = true
+    end
+  end
+end).new