refinerycms 0.9.6.2 → 0.9.6.3

data/Rakefile

@@ -17,7 +17,7 @@ require 'tasks/rails'
 
 extra_rake_tasks = []
 # When running Refinery from a gem we lose the rake tasks, so add them back in:
-extra_rake_tasks << Dir[File.join(REFINERY_ROOT, %w(vendor plugins * ** tasks ** *.rake))].sort unless REFINERY_ROOT == RAILS_ROOT
+extra_rake_tasks << Dir[File.join(REFINERY_ROOT, %w(vendor plugins * ** tasks ** *.rake))].sort unless REFINERY_ROOT.to_s == Rails.root.to_s
 # We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:
 extra_rake_tasks << $refinery_gem_plugin_lib_paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort} if defined?($refinery_gem_plugin_lib_paths) && !$refinery_gem_plugin_lib_paths.nil?
 extra_rake_tasks.flatten.compact.uniq.each {|rake| load rake }
@@ -45,7 +45,7 @@ begin
     namespace :bump do
       desc "Bump the gemspec by a build version."
       task :build => [:version_required, :version] do
-        version = Jeweler::VersionHelper.new(RAILS_ROOT)
+        version = Jeweler::VersionHelper.new(Rails.root.to_s)
         version.update_to(version.major, version.minor, version.patch, ((version.build || 0).to_i + 1))
         version.write
         $stdout.puts "Updated version: #{version.to_s}"

data/VERSION

@@ -1 +1 @@
-0.9.6.2
+0.9.6.3

data/config/preinitializer.rb

@@ -1,6 +1,6 @@
 # pick the refinery root path
-if File.exist?("#{RAILS_ROOT}/lib/refinery_initializer.rb")
-  require "#{RAILS_ROOT}/lib/refinery_initializer.rb"
+if File.exist?(File.join(%W(#{RAILS_ROOT} lib refinery_initializer.rb)))
+  require File.join(%W(#{RAILS_ROOT} lib refinery_initializer.rb))
 else
   require 'rubygems'
   version = if defined? REFINERY_GEM_VERSION
@@ -21,7 +21,7 @@ else
 end
 
 
-REFINERY_ROOT = RAILS_ROOT unless defined? REFINERY_ROOT
+REFINERY_ROOT = Rails.root.to_s unless defined? REFINERY_ROOT
 
 # Set to true in your environment specific file (e.g. production.rb) to use Amazon's Simple
 # Storage Service instead of the default file system for resources and images

data/db/seeds.rb

@@ -118,7 +118,7 @@ Page.create(:title => "Down for maintenance",
             })
 
 # Install default themes.
-FileUtils::mkdir File.join(%W(#{RAILS_ROOT} themes)) unless File.directory? File.join(%W(#{RAILS_ROOT} themes))
+FileUtils::mkdir Rails.root.join(themes) unless Rails.root.join("themes").directory?
 Dir[File.join(%W(#{REFINERY_ROOT} themes *.zip))].each do |theme|
   Theme.create(:uploaded_data => {
     "size" => File.size(theme),

data/lib/refinery_initializer.rb

@@ -6,4 +6,4 @@ unless REFINERY_ROOT == RAILS_ROOT # e.g. only if we're in a gem.
 
   require 'refinery'
   require 'refinery/initializer'
-end
+end

data/public/javascripts/refinery/admin.js

@@ -35,15 +35,16 @@ init_modal_dialogs = function(){
   $('a[href*="dialog=true"]').each(function(i, anchor)
   {
     $(anchor).click(function(e){
-      iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "'></iframe>");
-      iframe.dialog({
+      $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "'></iframe>").dialog({
         title: $(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null,
         modal: true,
         resizable: false,
         autoOpen: true,
         width: (parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0))||928),
-        height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473)
+        height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473),
+        beforeclose: function(){$(document.body).removeClass('hide-overflow')}
       });
+      $(document.body).addClass('hide-overflow');
       e.preventDefault();
     });
   });
@@ -143,6 +144,7 @@ var link_dialog = {
     this.test_url = test_url;
     this.test_email = test_email;
     this.init_tabs();
+    this.init_resources_submit();
     this.init_close();
     this.page_tab();
     this.web_tab();
@@ -161,6 +163,41 @@ var link_dialog = {
     link_dialog.switch_area(selected);
   },
 
+  init_resources_submit: function(){
+    $('#dialog-form-actions #submit_button').click(function(e){
+      e.preventDefault();
+      if((resource_selected = $('#existing_resource_area_content ul li.linked a')).length > 0) {
+        resourceUrl = parseURL(resource_selected.attr('href'));
+        relevant_href = resourceUrl.pathname;
+        if (resourceUrl.protocol == "" && resourceUrl.hostname == "system") {
+          relevant_href = "/system" + relevant_href;
+        }
+
+        // Add any alternate resource stores that need a absolute URL in the regex below
+        if( resourceUrl.hostname.match(/s3.amazonaws.com/) ) {
+          relevant_href = resourceUrl.protocol + '//' + resourceUrl.host + relevant_href;
+        }
+
+        if (typeof(resource_picker.callback) == "function") {
+          resource_picker.callback({
+            id: resource_selected.attr('id').replace("resource_", "")
+            , href: relevant_href
+            , html: resource_selected.html()
+          });
+        }
+      }
+
+      if(parent && typeof(parent.tb_remove) == "function"){
+        parent.tb_remove();
+      }
+    });
+
+    $('#dialog-form-actions #cancel_button').click(function(e){
+      e.preventDefault();
+      parent.tb_remove();
+    });
+  },
+
   init_close: function(){
     $('#TB_title .close_dialog, #dialog_container .close_dialog').click(function(e) {
       e.preventDefault();
@@ -235,7 +272,7 @@ var link_dialog = {
 
   },
 
-  email_tab: function(){
+  email_tab: function() {
     $('#email_address_text, #email_default_subject_text, #email_default_body_text').change(function(e){
       var default_subject = $('#email_default_subject_text').val(),
           default_body = $('#email_default_body_text').val(),
@@ -272,14 +309,21 @@ var link_dialog = {
     });
   },
 
-  update_parent: function(url, title, target){
-      parent.document.getElementById('wym_href').value = url;
-      parent.document.getElementById('wym_title').value = title;
-      parent.document.getElementById('wym_target').value = target || '';
+  update_parent: function(url, title, target) {
+    if (parent != null) {
+      if ((wym_href = parent.document.getElementById('wym_href')) != null) {
+        wym_href.value = url;
+      }
+      if ((wym_title = parent.document.getElementById('wym_title')) != null) {
+        wym_title.value = title;
+      }
+      if ((wym_target = parent.document.getElementById('wym_target')) != null) {
+        wym_target.value = target || "";
+      }
+    }
   }
 }
 
-
 var page_options = {
   init: function(enable_parts, new_part_url, del_part_url){
     this.enable_parts = enable_parts;
@@ -513,7 +557,7 @@ var list_reorder = {
 			, 'items': 'li'
 			, 'axis': 'y'
     });
-    
+
     $('#reorder_action').hide();
     $('#reorder_action_done').show();
   }
@@ -596,6 +640,14 @@ var image_picker = {
   }
 }
 
+var resource_picker = {
+  callback: null
+
+  , init: function(callback) {
+    this.callback = callback;
+  }
+}
+
 //parse a URL to form an object of properties
 parseURL = function(url)
 {

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -1365,7 +1365,7 @@ WYMeditor.editor.prototype.paste = function(sData) {
   wym.format_block();
 
   var sTmp;
-  replaceable = jQuery(wym._doc.body).find('#replace_me_with_' + wym._current_unique_stamp);
+  replaceable = $(wym._doc.body).find('#replace_me_with_' + wym._current_unique_stamp);
 
   // replaceable doesn't actually get replaced here, it's just used as a marker for where the cursor was.
   var container = replaceable.get(0) || this.selected();
@@ -1380,10 +1380,10 @@ WYMeditor.editor.prototype.paste = function(sData) {
       sTmp = aP[x];
       //simple newlines are replaced by a break
       sTmp = sTmp.replace(rExp, "<br />");
-      if (x == 0 && jQuery(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
-        jQuery(container).html(sTmp);
+      if (x == 0 && $(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
+        $(container).html(sTmp);
       } else {
-        jQuery(container).after("<p>" + sTmp + "</p>");
+        $(container).after("<p>" + sTmp + "</p>");
       }
     }
   } else {
@@ -1391,10 +1391,10 @@ WYMeditor.editor.prototype.paste = function(sData) {
       sTmp = aP[x];
       //simple newlines are replaced by a break
       sTmp = sTmp.replace(rExp, "<br />");
-      if (x == 0 && jQuery(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
-        jQuery(container).html(sTmp);
+      if (x == 0 && $(container).html().replace(/<br\ ?\/?>/, "").length == 0) {
+        $(container).html(sTmp);
       } else {
-        jQuery(wym._doc.body).append("<p>" + sTmp + "</p>");
+        $(wym._doc.body).append("<p>" + sTmp + "</p>");
       }
     }
   }
@@ -4312,7 +4312,7 @@ WYMeditor.WymClassMozilla.prototype.initIframe = function(iframe) {
     $(this._doc).bind("keyup", this.keyup);
 
     //bind editor paste events
-    jQuery(this._doc).bind("paste", this.intercept_paste);
+    $(this._doc).bind("paste", this.intercept_paste);
 
     //bind editor focus events (used to reset designmode - Gecko bug)
     $(this._doc).bind("focus", this.enableDesignMode);
@@ -4596,7 +4596,7 @@ WYMeditor.WymClassOpera.prototype.initIframe = function(iframe) {
     $(this._doc).bind("keyup", this.keyup);
 
     // bind paste events for when this is supported.
-    jQuery(this._doc).bind("paste", this.intercept_paste);
+    $(this._doc).bind("paste", this.intercept_paste);
 
     //post-init functions
     if($.isFunction(this._options.postInit)) this._options.postInit(this);
@@ -4725,7 +4725,7 @@ WYMeditor.WymClassSafari.prototype.initIframe = function(iframe) {
     $(this._doc).bind("keyup", this.keyup);
 
     // bind paste events
-    jQuery(this._doc).bind("paste", this.intercept_paste);
+    $(this._doc).bind("paste", this.intercept_paste);
 
     //post-init functions
     if($.isFunction(this._options.postInit)) this._options.postInit(this);

data/public/stylesheets/refinery/refinery.css

@@ -1217,4 +1217,13 @@ ul#plugins li {
 	margin-top:1px;
 	_margin-bottom:1px;
 	width: 100% !important;
+}
+
+.hide-overflow {
+    overflow: hidden;
+}
+#remove_resource {
+    margin-top:8px;
+    display:inline-block;
+    width:auto;
 }

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

@@ -1,5 +1,5 @@
 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),
@@ -7,31 +7,31 @@ class Image < ActiveRecord::Base
                  :processor => 'Rmagick',
                  :thumbnails => ((((thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})).is_a?(Hash) ? thumbnails : (RefinerySetting[:image_thumbnails] = {}))) rescue {}),
                  :max_size => 50.megabytes
-								
+
+ 	validates_as_attachment
+
   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title],
-          				:index_file => [RAILS_ROOT,"tmp","index"]
+          				:index_file => [Rails.root.to_s, "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)
     dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
   end
+  
+  # Returns a titleized version of the filename
+	# my_file.jpg returns My File
+  def title
+    self.filename.gsub(/\.\w+$/, '').titleize
+  end
 
 end

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

@@ -6,7 +6,7 @@ class Inquiry < ActiveRecord::Base
                       :message => 'must be valid'
 
   acts_as_indexed :fields => [:name, :email, :message, :phone],
-          :index_file => [RAILS_ROOT,"tmp","index"]
+                  :index_file => [Rails.root.to_s, "tmp", "index"]
 
   def self.closed
     find_all_by_open(false, :order => "created_at DESC")

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

@@ -3,10 +3,10 @@ class NewsItem < ActiveRecord::Base
   validates_presence_of :title, :content
   alias_attribute :content, :body
 
-  has_friendly_id :title, :use_slug => true, :strip_diacritics => true
+  has_friendly_id :title, :use_slug => true
 
   acts_as_indexed :fields => [:title, :body],
-          :index_file => [RAILS_ROOT,"tmp","index"]
+                  :index_file => [Rails.root.to_s, "tmp", "index"]
 
   def self.latest(amount = 10)
     find(:all, :order => "publish_date DESC", :limit => amount,

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

@@ -3,25 +3,25 @@ class Page < ActiveRecord::Base
   validates_presence_of :title
 
   acts_as_tree :order => "position ASC", :include => [:children, :slugs]
-	
+
 	# Docs for friendly_id http://github.com/norman/friendly_id
-  has_friendly_id :title, :use_slug => true, :strip_diacritics => true
+  has_friendly_id :title, :use_slug => true
 
   has_many :parts, :class_name => "PagePart", :order => "position ASC"
   accepts_nested_attributes_for :parts, :allow_destroy => true
-	
+
 	# Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title, :meta_keywords, :meta_description, :custom_title, :browser_title, :all_page_part_content],
-          			  :index_file => %W(#{RAILS_ROOT} tmp index)
+          			  :index_file => [Rails.root.to_s, "tmp", "index"]
 
   before_destroy :deletable?
 
 	# when a dialog pops up to link to a page, how many pages per page should there be
 	PAGES_PER_DIALOG = 14
-	
+
 	# when listing pages out in the admin area, how many pages should show per page
 	PAGES_PER_ADMIN_INDEX = 20
-	
+
 	# when collecting the pages path how is each of the pages seperated?
 	PATH_SEPERATOR = " - "
 
@@ -45,7 +45,7 @@ class Page < ActiveRecord::Base
 	      puts "unset .menu_match," if self.menu_match.present?
 	      puts "set .deletable to true" unless self.deletable
 			end
-		
+
       return false
     end
   end
@@ -75,11 +75,11 @@ class Page < ActiveRecord::Base
       self.title
     end
   end
-	
+
 	# When this page is rendered in the navigation, where should it link?
 	# If a custom "link_url" is set, it uses that otherwise it defaults to a normal page URL.
 	# The "link_url" is often used to link to a plugin rather than a page.
-	# 
+	#
 	# For example if I had a "Contact Us" page I don't want it to just render a contact us page
 	# I want it to show the Inquiries form so I can collect inquiries. So I would set the "link_url"
 	# to "/inquiries/new"
@@ -90,29 +90,29 @@ class Page < ActiveRecord::Base
       "/pages/#{self.to_param}"
     end
   end
-	
+
 	# Returns true if this page is "published"
   def live?
     not self.draft?
   end
-	
-	# Return true if this page can be shown in the navigation. If it's a draft or is set to not show in the menu it will return false.
+
+	# Return true if this page can be shown in the navigation.
+	# If it's a draft or is set to not show in the menu it will return false.
+	# If any of the page's ancestors aren't to be shown in the menu then this page is not either.
   def in_menu?
-    is_in_menu = self.live? && self.show_in_menu?
-    self.ancestors.each {|a| is_in_menu = false unless a.in_menu? }
-    is_in_menu
+    self.live? && self.show_in_menu? && !self.ancestors.any? { |a| !a.in_menu? }
   end
-	
+
 	# Returns true if this page is the home page or links to it.
   def home?
     self.link_url == "/"
   end
-	
+
 	# Returns all visible sibling pages that can be rendered for the menu
   def shown_siblings
     self.siblings.reject { |sibling| not sibling.in_menu? }
   end
-	
+
 	# Returns all the top level pages, usually to render the top level navigation.
   def self.top_level(include_children = false)
     include_associations = [:parts]
@@ -120,10 +120,10 @@ class Page < ActiveRecord::Base
     include_associations.push(:children) if include_children
     find_all_by_parent_id(nil,:conditions => {:show_in_menu => true, :draft => false}, :order => "position ASC", :include => include_associations)
   end
-	
+
 	# Accessor method to get a page part from a page.
 	# Example:
-	#     
+	#
 	#    Page.first[:body]
 	#
 	# Will return the body page part of the first page.
@@ -139,13 +139,13 @@ class Page < ActiveRecord::Base
 
     super_value
   end
-	
+
 	# In the admin area we use a slightly different title to inform the which pages are draft or hidden pages
   def title_with_meta
 		title = self.title
 		title << " <em>(hidden)</em>" unless self.show_in_menu?
 		title << " <em>(draft)</em>" if self.draft?
-		
+
 		title.strip
   end
 
@@ -153,7 +153,7 @@ class Page < ActiveRecord::Base
   def all_page_part_content
     self.parts.collect {|p| p.body}.join(" ")
   end
-	
+
 	# Returns how many pages per page should there be when paginating pages
   def self.per_page(dialog = false)
     dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX

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

@@ -5,6 +5,6 @@ class PagePart < ActiveRecord::Base
   validates_presence_of :title
   alias_attribute :content, :body
 
-  has_friendly_id :title, :use_slug => true, :strip_diacritics => true
+  has_friendly_id :title, :use_slug => true
 
 end

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

@@ -14,6 +14,5 @@
   <%= javascript_include_tag 'jquery', 'jquery-ui-1.8rc1.min.js', :cache => (use_caching ? "cache/libraries" : nil) if !using_google_libs or local_request? %>
   <%= javascript_include_tag 'admin', 'thickbox', '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) -%>
-  <%= "<script type='text/javascript'>jQuery(document).ready(function(){ jQuery('#flash').fadeIn(550); });</script>" unless flash.empty? -%>
   <%= yield :head %>
 </head>

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

@@ -2,8 +2,9 @@
 <head>
   <title><%= browser_title(yield(:title)) %></title>
   <%= render :partial => 'shared/google_analytics' unless local_request? %>
-  <%= stylesheet_link_tag "#{'theme/' if theme}application", "#{'theme/' if theme}formatting", "theme" %>
-  <%= stylesheet_link_tag "#{'theme/' if theme}home" if home_page? %>
+  <%= stylesheet_link_tag "application", "formatting", :theme => theme %>
+  <%= stylesheet_link_tag "theme" %>
+  <%= stylesheet_link_tag "home", :theme => theme if home_page? %>
   <%= "<!--[if IE 7]>#{stylesheet_link_tag 'ie7'}<![endif]-->" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
   <%= auto_discovery_link_tag(:rss, news_items_url(:format => 'rss')) %>
   <link rel="shortcut icon" href="/favicon.ico" />

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

@@ -1,40 +1,52 @@
 <%= f.hidden_field field %>
 <div>
-  <a id='current_resource_link' href="<%= insert_admin_resources_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=<%= "#{f.object.class.name.underscore.downcase}_#{field}" %><%= "&amp;current_link=#{resource.public_filename if resource.present?}" %>&amp;update_resource=current_resource&amp;update_text=current_resource_text&amp;callback=resource_changed&amp;KeepThis=true&amp;TB_iframe=true&amp;width=<%= width ||= 950 %>&amp;height=<%= height ||= 510 %>" style='border: 0px' title='Add <%= (description ||= "resource").titleize %>' name='Add <%= (description ||= "resource").titleize %>' class='thickbox'>
-    <span id='no_resource_selected' <%= "style='display: none;'" if resource.present? %>>
-      There is currently no <%= description ||= "resource" %> selected, click here to add one.
-    </span>
-  </a>
+  <%= 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',
+                  :field => "#{f.object.class.name.underscore.downcase}_#{field}",
+                  :current_link => "#{resource.public_filename if resource.present?}"),
+                :name => "Add #{(description ||= 'resource').titleize}",
+                :id => "current_resource_link"
+  %>
   <div id='current_resource_container' <%= "style='display:none'" unless resource.present? %>>
-    Current <%= description ||= "resource" %>:
+    <span id='current_resource_tag'>Current <%= description ||= "resource" %>:</span>
     <span id='current_resource_text'>
       <%= "#{resource.title} (#{resource.public_filename})" if resource.present? %>
     </span>
     <br/>
-    <%= link_to "#{refinery_icon_tag("page_white_put.png")} Download current #{description ||= "resource"} (<em>Opens in a new window</em>)", "#{resource.public_filename unless resource.nil?}",
+    <%= link_to "#{refinery_icon_tag("page_white_put.png")} Download current #{description ||= "resource"} (<em>Opens in a new window</em>)", "#{resource.public_filename if resource.present?}",
             :id => "current_resource",
             :target => "_blank" %>
   </div>
   <br/>
   <%= link_to "Remove current #{description ||= "resource"}", "",
                 :id => "remove_resource",
-                :style => "margin-top:8px;display:inline-block;width:auto;#{"display:none;" if resource.nil?}" %>
+                :style => "#{"display:none;" unless resource.present?}" %>
 </div>
 
 <% content_for :head do %>
   <script type='text/javascript'>
-    resource_changed = function() {
-      $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=" + $('#current_resource').attr('href') + "&"));
+    resource_changed = function(callback_args) {
       $('#remove_resource').show();
       $('#current_resource_container').show();
       $('#no_resource_selected').hide();
+      $('iframe#dialog_iframe').dialog("close");
+      $('iframe#dialog_iframe').remove().parents(".ui-dialog").remove();
+      $('#<%= f.object.class.name.underscore.downcase %>_<%= field %>').val(callback_args.id);
+      $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=" + callback_args.href + "&"));
+      $("#current_resource").attr('href', callback_args.href);
+      $('#current_resource_text').html(callback_args.html);
     }
 
     $(document).ready(function(e) {
       $('#remove_resource').click(function(e) {
-        $('#<%= f.object.class.name.underscore.downcase %>_<%= field %>').value = "";
+        $('#<%= f.object.class.name.underscore.downcase %>_<%= field %>').val("");
         $('#current_resource_container').hide();
-        $('#current_resource_text').innerHTML = '';
+        $('#current_resource_text').html('');
         $('#no_resource_selected').show();
         $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=&"));
         $(this).hide();
@@ -42,4 +54,4 @@
       });
     });
   </script>
-<% end %>
+<% end %>

data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb

@@ -1,7 +1,7 @@
 class <%= class_name %> < ActiveRecord::Base
 
   acts_as_indexed :fields => [:<%= attributes.collect{ |attribute| attribute.name if attribute.type.to_s =~ /string|text/ }.compact.uniq.join(", :") %>],
-                  :index_file => %W(#{RAILS_ROOT} tmp index)
+                  :index_file => [Rails.root.to_s, "tmp", "index"]
 
   validates_presence_of :<%= attributes.first.name %>
   validates_uniqueness_of :<%= attributes.first.name %>

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

@@ -44,7 +44,7 @@ class Refinery::ApplicationController < ActionController::Base
 protected
 
 	def setup_theme
-	  self.view_paths = ::ActionController::Base.view_paths.dup.unshift(File.join(%W(#{RAILS_ROOT} themes #{RefinerySetting[:theme]} views)))
+	  self.view_paths = ::ActionController::Base.view_paths.dup.unshift(Rails.root.join("themes", RefinerySetting[:theme], "views").to_s)
 	end
 
   def take_down_for_maintenance?

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

@@ -3,10 +3,6 @@ module Refinery::ApplicationHelper
 
   include Refinery::HtmlTruncationHelper
 
-  def setup
-    logger.warn("*** Refinery::ApplicationHelper::setup has now been deprecated from the Refinery API. ***")
-  end
-
   def browser_title(yield_title=nil)
     [
       yield_title.present? ? yield_title : nil,
@@ -15,6 +11,47 @@ module Refinery::ApplicationHelper
     ].compact.join(" - ")
   end
 
+  # replace all system images with a thumbnail version of them (handy for all images inside a page part)
+  def content_fu(content, thumbnail)
+    content.scan(/\/system\/images([^\"\ ]*)/).flatten.each do |match|
+      parts = match.split(".")
+      extension = parts.pop
+      content.gsub!(match, "#{parts.join(".")}_#{thumbnail}.#{extension}")
+    end
+
+    return content
+  end
+
+  def descendant_page_selected?(page)
+    page.descendants.any? {|descendant| selected_page?(descendant) }
+  end
+
+  def image_fu(image, thumbnail = nil , options={})
+    if image.present?
+      image_thumbnail = image.thumbnails.detect {|t| t.thumbnail == thumbnail.to_s}
+      image_thumbnail = image unless image_thumbnail.present?
+      image_tag image_thumbnail.public_filename, {:alt => image.title, :width => image_thumbnail.width, :height => image_thumbnail.height}.merge!(options)
+    end
+  end
+
+  def image_tag(source, options={})
+    theme = (options.delete(:theme) == true)
+    tag = super
+    # inject /theme/ into the image tag src if this is themed.
+    tag.gsub!(/src=[\"|\']/) { |m| "#{m}/theme/" }.gsub!("//", "/") if theme
+
+    tag
+  end
+
+  def javascript_include_tag(*sources)
+    theme = (arguments = sources.dup).extract_options![:theme] == true # don't ruin the current sources object
+    tag = super
+    # inject /theme/ into the javascript include tag src if this is themed.
+    tag.gsub!(/\/javascripts\//, "/theme/javascripts/").gsub!(/theme=(.+?)\ /, '') if theme
+
+    tag
+  end
+
   # you can override the object used for the title by supplying options[:object]
   # this object must support custom_title_type if you want custom titles.
   def page_title(options = {})
@@ -64,36 +101,25 @@ module Refinery::ApplicationHelper
     end
   end
 
-  def descendant_page_selected?(page)
-    page.descendants.any? {|descendant| selected_page?(descendant) }
+  def refinery_icon_tag(filename, options = {})
+    image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge!(options)
   end
 
   def selected_page?(page)
     selected = current_page?(page) or (request.path =~ Regexp.new(page.menu_match) unless page.menu_match.blank?) or (request.path == page.link_url)
   end
 
-  def image_fu(image, thumbnail = nil , options={})
-    begin
-      image_thumbnail = thumbnail.nil? ? image : image.thumbnails.collect {|t| t if t.thumbnail == thumbnail.to_s}.compact.first
-      image_tag image_thumbnail.public_filename, {:alt => image.title, :width => image_thumbnail.width, :height => image_thumbnail.height}.merge!(options)
-    rescue
-      image_tag image.public_filename(thumbnail), {:alt => image.title}.merge!(options)
-    end
-  end
+  def stylesheet_link_tag(*sources)
+    theme = (arguments = sources.dup).extract_options![:theme] == true # don't ruin the current sources object
+    tag = super
+    # inject /theme/ into the stylesheet link tag href if this is themed.
+    tag.gsub!(/\/stylesheets\//, "/theme/stylesheets/").gsub!(/theme=(.+?)\ /, '') if theme
 
-  def refinery_icon_tag(filename, options = {})
-    image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge!(options)
+    tag
   end
 
-  # replace all system images with a thumbnail version of them (handy for all images inside a page part)
-  def content_fu(content, thumbnail)
-    content.scan(/\/system\/images([^\"\ ]*)/).flatten.each do |match|
-      parts = match.split(".")
-      extension = parts.pop
-      content.gsub!(match, "#{parts.join(".")}_#{thumbnail}.#{extension}")
-    end
-
-    return content
+  def setup
+    logger.warn("*** Refinery::ApplicationHelper::setup has now been deprecated from the Refinery API. ***")
   end
 
-end
+end

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

@@ -1,6 +1,6 @@
 begin
   # Try to include the rails initializer. If this isn't in a gem, this will fail.
-  require 'initializer' unless REFINERY_ROOT == RAILS_ROOT # A Refinery gem install's RAILS_ROOT is not the REFINERY_ROOT.
+  require 'initializer' unless REFINERY_ROOT == RAILS_ROOT # A Refinery gem install's Rails.root is not the REFINERY_ROOT.
 rescue LoadError => load_error
 end
 
@@ -21,7 +21,7 @@ module Refinery
         # add plugin lib paths to the $LOAD_PATH so that rake tasks etc. can be run when using a gem for refinery or gems for plugins.
         search_for = Regexp.new(File.join(%W(\( #{REFINERY_ROOT} vendor plugins \)? .+? lib)))
         paths = plugins.collect{ |plugin| plugin.load_paths }.flatten.reject{|path| path.scan(search_for).empty? or path.include?('/rails-') }
-        paths = paths.reject{ |path| path.include?(REFINERY_ROOT) } if REFINERY_ROOT == RAILS_ROOT # superfluous when not in gem.
+        paths = paths.reject{ |path| path.include?(REFINERY_ROOT) } if REFINERY_ROOT == Rails.root.to_s # superfluous when not in gem.
         ($refinery_gem_plugin_lib_paths = paths).each do |path|
           $LOAD_PATH.unshift path
         end
@@ -34,7 +34,6 @@ module Refinery
     class Initializer < Rails::Initializer
       def self.run(command = :process, configuration = Configuration.new)
         Rails.configuration = configuration
-        #configuration.reload_plugins = true if RAILS_ENV =~ /development/ and REFINERY_ROOT == RAILS_ROOT # seems to work, don't in gem.
         configuration.plugin_loader = Refinery::PluginLoader
         super
       end

data/vendor/plugins/refinery/lib/tasks/refinery.rake

@@ -4,8 +4,8 @@ namespace :refinery do
   task :override => :environment do
     dirs = ["app", "app/views", "app/views/layouts", "app/views/admin", "app/views/shared", "app/controllers", "app/models", "app/controllers/admin", "app/helpers", "app/helpers/admin"]
 		dirs.each do |dir|
-			dir = File.join([RAILS_ROOT] | dir.split('/'))
-			Dir.mkdir dir unless File.directory? dir
+			dir = Rails.root.join(dir.split('/').join(File::SEPARATOR))
+			dir.mkdir unless dir.directory?
 		end
   end
 
@@ -26,8 +26,8 @@ namespace :refinery do
   namespace :cache do
     desc "Eliminate existing cache files for javascript and stylesheet resources in default directories"
     task :clear => :environment do
-      FileUtils.rm(Dir[File.join(RAILS_ROOT, %w(public javascripts cache [^.]*))])
-      FileUtils.rm(Dir[File.join(RAILS_ROOT, %w(public stylesheets cache [^.]*))])
+      FileUtils.rm(Dir[Rails.root.join("public", "javascripts", "cache", "[^.]*")])
+      FileUtils.rm(Dir[Rails.root.join("public", "stylesheets", "cache", "[^.]*")])
     end
   end
 

data/vendor/plugins/refinery/plugins.md

@@ -169,7 +169,7 @@ In our example above we extended Refinery to manage a products area. The problem
 
 To achieve this all you need to do is open up the product model (found in ``/vendor/plugins/products/app/models/product.rb``) and add the following line inside your class:
 
-    has_friendly_id :title, :use_slug => true, :strip_diacritics => true
+    has_friendly_id :title, :use_slug => true
   
 Note you want to change ``:title`` to the field which you want to show up in the URL.
 

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

@@ -9,6 +9,6 @@ end
 require_dependency 'refinery/form_helpers'
 require_dependency 'refinery/base_presenter'
 
-presenters_path = "#{RAILS_ROOT}/app/presenters/"
+presenters_path = Rails.root.join("app", "presenters").to_s
 $LOAD_PATH << presenters_path
 ::ActiveSupport::Dependencies.load_paths << presenters_path

data/vendor/plugins/resources/app/models/resource.rb

@@ -1,24 +1,25 @@
 class Resource < ActiveRecord::Base
 
+	# Docs for attachment_fu http://github.com/technoweenie/attachment_fu
   has_attachment :storage => (USE_S3_BACKEND ? :s3 : :file_system),
                  :size => 0.kilobytes..50.megabytes,
                  :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/resources')
 
+  validates_as_attachment
+
+  # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title, :type_of_content],
-          :index_file => [RAILS_ROOT,"tmp","index"]
+                  :index_file => [Rails.root.to_s, "tmp", "index"]
 
-  def validate
-    errors.add_to_base("You must choose a file to upload") unless self.filename
+	# when a dialog pops up with images, how many images per page should there be
+	PAGES_PER_DIALOG = 12
 
-    unless self.filename.nil?
-      [:size].each do |attr_name|
-        enum = attachment_options[attr_name]
-        unless enum.nil? || enum.include?(send(attr_name))
-          errors.add_to_base("Files should be smaller than 50 MB in size")
-        end
-      end
-    end
+	# when listing images out in the admin area, how many images should show per page
+	PAGES_PER_ADMIN_INDEX = 20
 
+	# How many images per page should be displayed?
+  def self.per_page(dialog = false)
+    dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
   end
 
   # used for searching
@@ -26,12 +27,10 @@ class Resource < ActiveRecord::Base
     self.content_type.split("/").join(" ")
   end
 
+  # Returns a titleized version of the filename
+	# my_file.pdf returns My File
   def title
-    (split_filename = self[:filename].split('.')).pop and return split_filename.join('.').titleize
-  end
-
-  def self.per_page(dialog = false)
-    size = (dialog ? 12 : 20)
+    self.filename.gsub(/\.\w+$/, '').titleize
   end
 
 end

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

@@ -1,7 +1,7 @@
 <div class='clearfix'>
   <div id='dialog_menu_left'>
     <% unless @resources.empty? %>
-      <span id='existing_resource_radio' class='radio'>
+      <span id='existing_resource_radio' class='radio<%= " selected_radio" if @resource.errors.empty? and @resources.size > 0 %>'>
         <input type='radio' name='resource_type' value='existing_resource' id='resource_type_existing' <%= "checked='true'" if @resource.errors.empty? %> />
         <label for='resource_type_existing' class='stripped'>Existing File</label>
       </span>
@@ -44,8 +44,6 @@
 <% if @thickbox %>
   <div id='dialog-form-actions' class='form-actions'>
     <%= submit_tag 'Insert', :id => "submit_button" %>
-    or
-    <%= link_to "Cancel", "", :id => "cancel_button", :class => "close_dialog" %>
 
     <%= will_paginate @resources,
                           :previous_label => '&laquo; Previous',
@@ -59,6 +57,7 @@
   <script type='text/javascript'>
     $(document).ready(function(){
       link_dialog.init();
+      resource_picker.init(<%= @callback.present? ? "self.parent.#{@callback}" : "null" %>);
     });
   </script>
 <% end %>

data/vendor/plugins/themes/app/controllers/themes_controller.rb

@@ -1,28 +1,27 @@
 class ThemesController < ApplicationController
- 
+
   def stylesheets
     render_theme_item(:stylesheets, params[:filepath])
-  end                                                
-                                                     
-  def javascripts                                    
+  end
+
+  def javascripts
     render_theme_item(:javascripts, params[:filepath])
   end
- 
+
   def images
     render_theme_item(:images, params[:filepath])
   end
- 
+
 protected
- 
+
   def render_theme_item(type, relative_path)
-    file_path = File.join(RAILS_ROOT, "themes", RefinerySetting[:theme], type.to_s, relative_path)
- 		if File.exists? file_path
+    if File.exist?(file_path = File.join(Rails.root, "themes", RefinerySetting[:theme], type.to_s, relative_path))
     	send_file(file_path, :type => mime_for(relative_path), :disposition => 'inline', :stream => true)
 		else
 			return error_404
 		end
   end
- 
+
   def mime_for(filename)
 		# could we use the built in Rails mime types to work this out?
     case filename.last.downcase

data/vendor/plugins/themes/app/models/theme.rb

@@ -36,7 +36,7 @@ class Theme < ActiveRecord::Base
 	end
 
 	def theme_path
-		File.join(RAILS_ROOT, "themes", folder_title)
+		Rails.root.join("themes", folder_title).to_s
 	end
 
 	def preview_image
@@ -50,7 +50,7 @@ class Theme < ActiveRecord::Base
 	end
 
 	def self.directory_is_writable?
-		File.writable? File.join(RAILS_ROOT, "themes") # Heroku users (or users with read-only filesystem) will receive false here
+		Rails.root.join("themes").writable? # Heroku users (or users with read-only filesystem) will receive false here
 	end
 
 end

data/vendor/plugins/themes/config/routes.rb

@@ -5,8 +5,8 @@ ActionController::Routing::Routes.draw do |map|
   end
 
 	# allows theme files that are not in the Rails public directory to be served back to the client
-  map.connect 'stylesheets/theme/*filepath', :controller => 'themes', :action => 'stylesheets'
-  map.connect 'javascripts/theme/*filepath', :controller => 'themes', :action => 'javascripts'
-  map.connect 'images/theme/*filepath', :controller => 'themes', :action => 'images'
+  map.connect 'theme/stylesheets/*filepath', :controller => 'themes', :action => 'stylesheets'
+  map.connect 'theme/javascripts/*filepath', :controller => 'themes', :action => 'javascripts'
+  map.connect 'theme/images/*filepath', :controller => 'themes', :action => 'images'
 
 end

data/vendor/plugins/themes/themes.md

@@ -119,7 +119,7 @@ You need to update the URL so it requests ``/images/themes`` instead of just ``/
 So the result is simply:
 
     #footer {
-      background: url('/images/theme/footer_background.png') repeat-x;
+      background: url('/theme/images/footer_background.png') repeat-x;
     }
 
 This is the same with linking to Javascript and Stylesheets in your view. Say our ``application.html.erb`` layout had something like this:
@@ -128,7 +128,7 @@ This is the same with linking to Javascript and Stylesheets in your view. Say ou
 
 You just need to change that to:
 
-    <%= stylesheet_link_tag 'theme/application' %>
+    <%= stylesheet_link_tag 'application', :theme => true %>
     
 ## I'm Stuck, is there an Example Theme?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.2
+  version: 0.9.6.3
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 +13:00
+date: 2010-02-08 00:00:00 +13:00
 default_executable: 
 dependencies: []