RubyGems - refinerycms - Versions diffs - 0.9.6.25 → 0.9.6.26 - Mend

refinerycms 0.9.6.25 → 0.9.6.26

Files changed (10) hide show

data/VERSION CHANGED Viewed

data/config/application.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
-REFINERY_GEM_VERSION = '0.9.6.25' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.26' unless defined? REFINERY_GEM_VERSION
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')

data/lib/refinery/tasks/refinery.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 # So here, we find them (if there are any) and include them into rake.
 extra_rake_tasks = []
 if defined?(Refinery) && Refinery.is_a_gem
-  extra_rake_tasks << Dir[Refinery.root.join("vendor", "plugins", "*", "**", "tasks", "**", "*", "*.rake")].sort
+  extra_rake_tasks << Dir[Refinery.root.join("vendor", "plugins", "*", "**", "tasks", "**", "*", "*.rake").to_s].sort
 end
 # We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:

@@ -41,8 +41,8 @@ class User < ActiveRecord::Base
     unless self.new_record? # don't add plugins when the user_id is NULL.
       self.plugins.delete_all
-      plugin_titles.each do |plugin_title|
-        self.plugins.find_or_create_by_title(plugin_title) if plugin_title.is_a?(String)
+      plugin_titles.each_with_index do |plugin_title, index|
+        self.plugins.create(:title => plugin_title, :position => index) if plugin_title.is_a?(String)
       end
     end
   end

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

@@ -23,7 +23,7 @@ class Page < ActiveRecord::Base
   PAGES_PER_ADMIN_INDEX = 20
   # when collecting the pages path how is each of the pages seperated?
-  PATH_SEPERATOR = " - "
+  PATH_SEPARATOR = " - "
   # Am I allowed to delete this page?
   # If a link_url is set we don't want to break the link so we don't allow them to delete
@@ -65,12 +65,12 @@ class Page < ActiveRecord::Base
   end
   # Used for the browser title to get the full path to this page
-  # It automatically prints out this page title and all of it's parent page titles joined by a PATH_SEPERATOR
+  # It automatically prints out this page title and all of it's parent page titles joined by a PATH_SEPARATOR
   def path(reverse = true)
     unless self.parent.nil?
       parts = [self.title, self.parent.path(reverse)]
       parts.reverse! if reverse
-      parts.join(PATH_SEPERATOR)
+      parts.join(PATH_SEPARATOR)
     else
       self.title
     end

data/vendor/plugins/pages/pages.md CHANGED Viewed

@@ -4,7 +4,7 @@
 ## About
-One core part of is Pages. Plugins such as News and Inquiries hook to pages. The menu is rendered based off the structure of your pages.
+One core part of Refinery is Pages. Plugins such as News and Inquiries hook to pages. The menu is rendered based off the structure of your pages.
 Pages have one key thing about them that is unique - page parts.

@@ -3,11 +3,11 @@
   <%= render :partial => "/admin/head" %>
   <body>
     <div id='tooltip_container'></div>
-    <div id="page_container"<%= " class='login'" unless logged_in? %><%= " class='splash'" if logged_in? and params[:action] == "index" %>>
+    <div id="page_container"<%= " class='login'" unless logged_in? %><%= " class='splash'" if logged_in? and action_name == "index" %>>
       <div id="page">
         <div class="clearfix" id="header">
           <h1>
-            <%= just_installed? ? "Welcome to Refinery" : link_to(RefinerySetting[:site_name].titleize, admin_root_url) %>
+            <%= just_installed? ? "Welcome to Refinery" : link_to(RefinerySetting[:site_name], admin_root_url) %>
           </h1>
           <%= link_to "View public site", "/", :target => "_blank", :id => "site_link" if logged_in? %>
           <%= link_to image_tag("#{"http://www.refinerycms.com/images/" unless local_request?}refinery/logo.png", :alt => "Refinery (tm) Content Manager"), "http://www.refinerycms.com", :target => "_blank", :id => "logo" -%>

@@ -51,7 +51,7 @@ module Refinery::ApplicationHelper
   # 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 = {})
-    object = options.fetch(:object, @page)
+    object = options.fetch(:object, @meta)
     options.delete(:object)
     options = RefinerySetting.find_or_set(:page_title, {
       :chain_page_title => false,

@@ -12,7 +12,7 @@ class Admin::DialogsController < Admin::BaseController
       url_params = params.reject {|key, value| key =~ /(action)|(controller)/}
       @iframe_src = if @dialog_type == 'image'
-        insert_admin_images_url(:dialog => true)
+        insert_admin_images_url(:modal => true)
       elsif @dialog_type == 'link'
         link_to_admin_pages_dialogs_url(url_params)
       end

metadata CHANGED Viewed

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 25
-  version: 0.9.6.25
+  - 26
+  version: 0.9.6.26
 platform: ruby
 authors:
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-04-02 00:00:00 +13:00
+date: 2010-04-08 00:00:00 +12:00
 default_executable:
 dependencies: []