refinerycms 0.9.6.25 → 0.9.6.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. data/VERSION +1 -1
  2. data/config/application.rb +1 -1
  3. data/lib/refinery/tasks/refinery.rb +1 -1
  4. data/vendor/plugins/authentication/app/models/user.rb +2 -2
  5. data/vendor/plugins/pages/app/models/page.rb +3 -3
  6. data/vendor/plugins/pages/pages.md +1 -1
  7. data/vendor/plugins/refinery/app/views/layouts/admin.html.erb +2 -2
  8. data/vendor/plugins/refinery/lib/refinery/application_helper.rb +1 -1
  9. data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb +1 -1
  10. metadata +3 -3
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.9.6.25
1
+ 0.9.6.26
data/config/application.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
3
3
 
4
4
  # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
5
- REFINERY_GEM_VERSION = '0.9.6.25' unless defined? REFINERY_GEM_VERSION
5
+ REFINERY_GEM_VERSION = '0.9.6.26' unless defined? REFINERY_GEM_VERSION
6
6
 
7
7
  # Boot Rails
8
8
  require File.join(File.dirname(__FILE__), 'boot')
data/lib/refinery/tasks/refinery.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  # So here, we find them (if there are any) and include them into rake.
3
3
  extra_rake_tasks = []
4
4
  if defined?(Refinery) && Refinery.is_a_gem
5
- extra_rake_tasks << Dir[Refinery.root.join("vendor", "plugins", "*", "**", "tasks", "**", "*", "*.rake")].sort
5
+ extra_rake_tasks << Dir[Refinery.root.join("vendor", "plugins", "*", "**", "tasks", "**", "*", "*.rake").to_s].sort
6
6
  end
7
7
 
8
8
  # We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:
data/vendor/plugins/authentication/app/models/user.rb CHANGED
@@ -41,8 +41,8 @@ class User < ActiveRecord::Base
41
41
  unless self.new_record? # don't add plugins when the user_id is NULL.
42
42
  self.plugins.delete_all
43
43
 
44
- plugin_titles.each do |plugin_title|
45
- self.plugins.find_or_create_by_title(plugin_title) if plugin_title.is_a?(String)
44
+ plugin_titles.each_with_index do |plugin_title, index|
45
+ self.plugins.create(:title => plugin_title, :position => index) if plugin_title.is_a?(String)
46
46
  end
47
47
  end
48
48
  end
data/vendor/plugins/pages/app/models/page.rb CHANGED
@@ -23,7 +23,7 @@ class Page < ActiveRecord::Base
23
23
  PAGES_PER_ADMIN_INDEX = 20
24
24
 
25
25
  # when collecting the pages path how is each of the pages seperated?
26
- PATH_SEPERATOR = " - "
26
+ PATH_SEPARATOR = " - "
27
27
 
28
28
  # Am I allowed to delete this page?
29
29
  # 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
65
65
  end
66
66
 
67
67
  # Used for the browser title to get the full path to this page
68
- # It automatically prints out this page title and all of it's parent page titles joined by a PATH_SEPERATOR
68
+ # It automatically prints out this page title and all of it's parent page titles joined by a PATH_SEPARATOR
69
69
  def path(reverse = true)
70
70
  unless self.parent.nil?
71
71
  parts = [self.title, self.parent.path(reverse)]
72
72
  parts.reverse! if reverse
73
- parts.join(PATH_SEPERATOR)
73
+ parts.join(PATH_SEPARATOR)
74
74
  else
75
75
  self.title
76
76
  end
data/vendor/plugins/pages/pages.md CHANGED
@@ -4,7 +4,7 @@
4
4
 
5
5
  ## About
6
6
 
7
- 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.
7
+ 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.
8
8
 
9
9
  Pages have one key thing about them that is unique - page parts.
10
10
 
data/vendor/plugins/refinery/app/views/layouts/admin.html.erb CHANGED
@@ -3,11 +3,11 @@
3
3
  <%= render :partial => "/admin/head" %>
4
4
  <body>
5
5
  <div id='tooltip_container'></div>
6
- <div id="page_container"<%= " class='login'" unless logged_in? %><%= " class='splash'" if logged_in? and params[:action] == "index" %>>
6
+ <div id="page_container"<%= " class='login'" unless logged_in? %><%= " class='splash'" if logged_in? and action_name == "index" %>>
7
7
  <div id="page">
8
8
  <div class="clearfix" id="header">
9
9
  <h1>
10
- <%= just_installed? ? "Welcome to Refinery" : link_to(RefinerySetting[:site_name].titleize, admin_root_url) %>
10
+ <%= just_installed? ? "Welcome to Refinery" : link_to(RefinerySetting[:site_name], admin_root_url) %>
11
11
  </h1>
12
12
  <%= link_to "View public site", "/", :target => "_blank", :id => "site_link" if logged_in? %>
13
13
  <%= 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" -%>
data/vendor/plugins/refinery/lib/refinery/application_helper.rb CHANGED
@@ -51,7 +51,7 @@ module Refinery::ApplicationHelper
51
51
  # you can override the object used for the title by supplying options[:object]
52
52
  # this object must support custom_title_type if you want custom titles.
53
53
  def page_title(options = {})
54
- object = options.fetch(:object, @page)
54
+ object = options.fetch(:object, @meta)
55
55
  options.delete(:object)
56
56
  options = RefinerySetting.find_or_set(:page_title, {
57
57
  :chain_page_title => false,
data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb CHANGED
@@ -12,7 +12,7 @@ class Admin::DialogsController < Admin::BaseController
12
12
  url_params = params.reject {|key, value| key =~ /(action)|(controller)/}
13
13
 
14
14
  @iframe_src = if @dialog_type == 'image'
15
- insert_admin_images_url(:dialog => true)
15
+ insert_admin_images_url(:modal => true)
16
16
  elsif @dialog_type == 'link'
17
17
  link_to_admin_pages_dialogs_url(url_params)
18
18
  end
metadata CHANGED
@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
6
6
  - 0
7
7
  - 9
8
8
  - 6
9
- - 25
10
- version: 0.9.6.25
9
+ - 26
10
+ version: 0.9.6.26
11
11
  platform: ruby
12
12
  authors:
13
13
  - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2010-04-02 00:00:00 +13:00
20
+ date: 2010-04-08 00:00:00 +12:00
21
21
  default_executable:
22
22
  dependencies: []
23
23