Added support for using page templates in controllers

Author: pjb3

app/helpers/cms/application_helper.rb

@@ -1,14 +1,6 @@
 # Methods added to this helper will be available to all templates in the cms.
 module Cms
  module ApplicationHelper
-
- def page_title(*args)
- if args.first
- @controller.instance_variable_get("@template").instance_variable_set("@page_title", args.first)
- else
- @controller.instance_variable_get("@template").instance_variable_get("@page_title")
- end
- end
 
  def searchable_sections(selected = nil)
  root = Section.root.first
@@ -165,15 +157,6 @@ def url_with_mode(url, mode)
  end
  end
 
- def tb_iframe(path, options={})
- # The order of the parameters matters. All parameters that should be sent to the server,
- # have to appear before TB_iframe. All parameters that shouldn't be sent to the server and
- # that are just there for Thickbox should be after TB_iframe
- {:height => 600, :width => 600, :modal => true}.merge(options).inject("#{path}&TB_iframe=true") do |s, (k,v)|
- s << "&#{k}=#{CGI::escape(v.to_s)}"
- end
- end
- 
  def determine_order(current_order, order)
  if current_order == order
  if order =~ / desc$/i

app/helpers/cms/page_helper.rb

@@ -1,12 +1,20 @@
 module Cms
  module PageHelper
+ def page_title(*args)
+ if args.first
+ @controller.instance_variable_get("@template").instance_variable_set("@page_title", args.first)
+ else
+ @controller.instance_variable_get("@template").instance_variable_get("@page_title")
+ end
+ end 
+ 
  def current_page
  @page
  end
 
  def container(name)
  content = instance_variable_get("@content_for_#{name}")
- if logged_in? && @mode == "edit"
+ if logged_in? && @page && @mode == "edit"
  render :partial => 'cms/pages/edit_container', :locals => {:name => name, :content => content}
  else
  content

app/helpers/cms/template_support.rb

@@ -0,0 +1,15 @@
+# This is a module, not a helper, that is meant to be included
+# into controllers that want to use page templates for their layout
+module Cms
+ module TemplateSupport
+ def self.included(controller)
+ controller.class_eval do
+ include Cms::Authentication::Controller
+ include Cms::ErrorHandling
+ 
+ helper Cms::PageHelper
+ helper Cms::MenuHelper
+ end
+ end
+ end
+end

browsercms.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
  s.authors = ["BrowserMedia"]
- s.date = %q{2009-06-30}
+ s.date = %q{2009-07-03}
  s.email = %q{github@browsermedia.com}
  s.extra_rdoc_files = [
  "LICENSE.txt",
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
  "app/helpers/cms/page_helper.rb",
  "app/helpers/cms/path_helper.rb",
  "app/helpers/cms/section_nodes_helper.rb",
+ "app/helpers/cms/template_support.rb",
  "app/models/abstract_file_block.rb",
  "app/models/attachment.rb",
  "app/models/category.rb",

lib/cms/init.rb

@@ -12,7 +12,7 @@ def version
  @version = SPEC.version.version
  end
 
- def build_number; 250 end
+ def build_number; 251 end
 
  def load_rake_tasks
  load "#{Cms.root}/lib/tasks/cms.rake"