browsercms 3.1.5 → 3.3.0.beta

data/app/controllers/cms/base_controller.rb

@@ -6,8 +6,8 @@ class Cms::BaseController < Cms::ApplicationController
 
   layout 'cms/application'
     
-  verify :method => :post, :only => [:create]
-  verify :method => :put, :only => [:update]
-  verify :method => :delete, :only => [:destroy]
+#  verify :method => :post, :only => [:create]
+#  verify :method => :put, :only => [:update]
+#  verify :method => :delete, :only => [:destroy]
     
 end

data/app/controllers/cms/content_block_controller.rb

@@ -121,8 +121,8 @@ class Cms::ContentBlockController < Cms::BaseController
     def load_blocks
       options = {}
       if params[:section_id] && params[:section_id] != 'all'
-        options[:include] = { :attachment =>  :section_node }
-        options[:conditions] = ["section_nodes.ancestry = ?", Section.find(params[:section_id]).ancestry_path]
+        options[:include] = { :attachment => { :section_node => :section }} 
+        options[:conditions] = ["sections.id = ?", params[:section_id]]
       end
       options[:page] = params[:page]    
       options[:order] = model_class.default_order if model_class.respond_to?(:default_order)

data/app/controllers/cms/content_controller.rb

@@ -51,8 +51,8 @@ class Cms::ContentController < Cms::ApplicationController
   
   # ----- Before Filters -------------------------------------------------------
   def construct_path
-    @paths = params[:page_path] || params[:path] || []
-    @path = "/#{@paths.join("/")}"
+    @path = "/#{params[:path]}"
+    @paths = @path.split("/")
   end
   
   def construct_path_from_route
@@ -90,7 +90,7 @@ class Cms::ContentController < Cms::ApplicationController
   
   def try_to_redirect
     if redirect = Redirect.find_by_from_path(@path)
-      redirect_to redirect.to_path, :status=>:moved_permanently
+      redirect_to redirect.to_path
     end    
   end
 
@@ -111,6 +111,7 @@ class Cms::ContentController < Cms::ApplicationController
 
         #Stream the file if it exists
         if @path != "/" && File.exists?(@file)
+          logger.warn "Sending file #{@file}"
           send_file(@file, 
             :filename => @attachment.file_name,
             :type => @attachment.file_type,
@@ -125,7 +126,7 @@ class Cms::ContentController < Cms::ApplicationController
   def check_access_to_page
     set_page_mode
     if current_user.able_to?(:edit_content, :publish_content, :administrate)
-      logger.info "..... Displaying draft version of page"
+      logger.debug "Displaying draft version of page"
       if page = Page.first(:conditions => {:path => @path})
         @page = page.as_of_draft_version
       else

data/app/controllers/cms/error_handling.rb

@@ -2,7 +2,7 @@ module Cms
   module ErrorHandling
     def self.included(controller)
       controller.class_eval do
-        rescue_from Exception, :with => :handle_server_error unless RAILS_ENV == "test"
+        rescue_from Exception, :with => :handle_server_error unless Rails.env == "test"
         rescue_from Cms::Errors::AccessDenied, :with => :handle_access_denied
       end
     end

data/app/controllers/cms/routes_controller.rb

@@ -10,11 +10,10 @@ class Cms::RoutesController < Cms::BaseController
       @route = ActionController::Routing::Routes.recognize_path(@path)
     end
     
-    @routes = ActionController::Routing::Routes.routes.collect do |route|
-      name = ActionController::Routing::Routes.named_routes.routes.index(route).to_s
-      verb = route.conditions[:method].to_s.upcase
-      segs = route.segments.inject("") { |str,s| str << s.to_s }
-      segs.chop! if segs.length > 1
+    @routes = Rails.application.routes.routes.collect do |route|
+      name = route.name.to_s
+      verb = route.verb
+      segs = route.path
       reqs = route.requirements.empty? ? "" : route.requirements.inspect
       {:name => name, :verb => verb, :segs => segs, :reqs => reqs}
     end

data/app/controllers/cms/section_nodes_controller.rb

@@ -3,12 +3,7 @@ class Cms::SectionNodesController < Cms::BaseController
   
   def index
     @toolbar_tab = :sitemap
-    @modifiable_sections = current_user.modifiable_sections
-    @public_sections = Group.guest.sections.all # Load once here so that every section doesn't need to.
-
-    @sitemap = Section.sitemap
-    @root_section_node = @sitemap.keys.first
-    @section = @root_section_node.node
+    @section = Section.root.first
   end
   def move_before
     move(:before)

data/app/controllers/cms/sections_controller.rb

@@ -16,7 +16,7 @@ class Cms::SectionsController < Cms::BaseController
   end
   
   def new
-    @section = @parent.build_section
+    @section = @parent.sections.build
     @section.groups = @parent.groups
   end
   
@@ -104,7 +104,6 @@ class Cms::SectionsController < Cms::BaseController
     end
     
     def render_file_browser
-      headers['Content-Type'] = "text/xml"
       @files = case params[:Type].downcase
                when "file"
                  FileBlock.by_section(@section)
@@ -117,7 +116,7 @@ class Cms::SectionsController < Cms::BaseController
     end
 
     def public_groups
-      @public_groups ||= Group.public.all(:order => "groups.name")
+      @public_groups ||= Group.public_groups.all(:order => "groups.name")
     end
 
     def cms_groups

data/app/controllers/cms/tasks_controller.rb

@@ -38,6 +38,9 @@ class Cms::TasksController < Cms::BaseController
       end
       redirect_to @task.page.path
     end
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = "No tasks were marked for completion"
+    redirect_to cms_dashboard_path
   end
   
   private

data/app/controllers/cms/users_controller.rb

@@ -8,7 +8,7 @@ class Cms::UsersController < Cms::ResourceController
   after_filter :update_group_membership, :only => [:update, :create]
   after_filter :update_flash, :only => [ :update, :create ]
   
-  verify :method => :put, :only => [ :enable, :disable, :update_password ]
+#  verify :method => :put, :only => [ :enable, :disable, :update_password ]
   
   def index
     query, conditions = [], []

data/app/helpers/cms/application_helper.rb

@@ -4,7 +4,7 @@ module Cms
 
     def require_stylesheet_link(sources=(), content_area=:html_head)
       @required_stylesheet_links ||= []
-      new_links = sources.to_a - @required_stylesheet_links
+      new_links                  = Array(sources) - @required_stylesheet_links
       if !new_links.empty?
         @required_stylesheet_links |= new_links
         content_for(content_area, stylesheet_link_tag(new_links))
@@ -13,17 +13,17 @@ module Cms
 
     def require_javascript_include(sources=(), content_area=:html_head)
       @required_javascript_includes ||= []
-      new_links = sources.to_a - @required_javascript_includes
+      new_links                     = Array(sources) - @required_javascript_includes
       if !new_links.empty?
         @required_javascript_includes |= new_links
         content_for(content_area, javascript_include_tag(new_links))
       end
     end
-    
+
     def searchable_sections(selected = nil)
-      root = Section.root.first
+      root    = Section.root.first
       options = [['All sections', 'all'], [root.name, root.id]]
-      root.master_section_list.each { |s|  options << [s.full_path, s.id] }
+      root.all_children_with_name.each { |s| options << [s.full_path, s.id] }
       options_for_select(options, selected.to_i)
     end
 
@@ -33,10 +33,10 @@ module Cms
     end
 
     def page_versions(page)
-      text = select_tag(:version, 
-                        options_for_select(page.versions.all(:order => "version desc").map { |r| 
-                                             ["v#{r.version}: #{r.version_comment} by #{r.updated_by.login} at #{time_on_date(r.updated_at)}", r.version] 
-                                           }, page.version), 
+      text = select_tag(:version,
+                        options_for_select(page.versions.all(:order => "version desc").map { |r|
+                          ["v#{r.version}: #{r.version_comment} by #{r.updated_by.login} at #{time_on_date(r.updated_at)}", r.version]
+                        },                 page.version),
                         :onchange => 'this.form.submit(); return false')
       text << javascript_tag("$('version').selectedIndex = 0") if page.live?
       text
@@ -45,7 +45,7 @@ module Cms
     def action_icon_src(name)
       "cms/icons/actions/#{name}.png"
     end
-    
+
     def action_icon(name, options={})
       image_tag action_icon_src(name), {:alt => name.to_s.titleize}.merge(options)
     end
@@ -53,7 +53,7 @@ module Cms
     def status_icon(status, options={})
       image_tag "cms/icons/status/#{status.to_s.underscore}.gif", {:alt => status.to_s.titleize}.merge(options)
     end
-    
+
     def link_to_usages(block)
       count = block.connected_pages.count
       if count > 0
@@ -64,7 +64,7 @@ module Cms
         count
       end
     end
-    
+
     def time_on_date(time)
       time && "#{time.strftime("%l:%M %p")} on #{time.strftime("%b %e, %Y")}"
     end
@@ -72,21 +72,69 @@ module Cms
     def format_date(time)
       time && "#{time.strftime("%b %e, %Y")}"
     end
-    
+
+    # Renders two links that will check/uncheck a set of checkboxes.
+    #
+    # @param [String] selector The CSS selector for the checkboxes that should be mass checked/unchecked.
+    def check_uncheck_tag(selector)
+      check_id   = to_id(selector, "check")
+      uncheck_id = to_id(selector, "uncheck")
+      content_for :html_head do
+        html = <<HTML
+jQuery(function($) {
+  $('a##{check_id}').click(function() {
+    $('#{selector}').attr('checked', true);
+  });
+
+  $('a##{uncheck_id}').click(function() {
+    $('#{selector}').attr('checked', false);
+  });
+})
+HTML
+        javascript_tag html
+      end
+
+      "#{link_to "Check All", '#', :id=>check_id}, #{link_to "Uncheck All", '#', :id=>uncheck_id}".html_safe
+    end
+
+    # @deprecated Use check_uncheck_tag instead. Retained for backwards compatibility w/ CMS implementations.
     def link_to_check_all(selector, name="Check All")
-      link_to_function name, "$('#{selector}').attr('checked', true)"
+      id = to_id(selector, "check")
+      content_for :html_head do
+        html = <<HTML
+jQuery(function($) {
+  $('a##{id}').click(function() {
+    $('#{selector}').attr('checked', true);
+  });
+})
+HTML
+        javascript_tag html
+      end
+      link_to name, '#', :id=>id
     end
 
+    # @deprecated Use check_uncheck_tag instead. Retained for backwards compatibility w/ CMS implementations.
     def link_to_uncheck_all(selector, name="Uncheck All")
-      link_to_function name, "$('#{selector}').attr('checked', false)"
+      id = to_id(selector, "uncheck")
+      content_for :html_head do
+        html = <<HTML
+jQuery(function($) {
+  $('a##{id}').click(function() {
+    $('#{selector}').attr('checked', false);
+  });
+})
+HTML
+        javascript_tag html
+      end
+      link_to name, '#', :id=>id
     end
-    
-    
+
     def span_tag(content)
       content_tag :span, content
     end
+
     def lt_button_wrapper(content)
-<<LBW
+      button = <<LBW
   <div class="lt_button">
     <img src="/images/cms/lt_button_l.gif" alt="" />
     <div class="lt_button_content">
@@ -95,50 +143,52 @@ module Cms
     <img src="/images/cms/lt_button_r.gif" alt="" style="margin-right: 10px;" />
   </div>
 LBW
+      button.html_safe
     end
 
     def dk_button_wrapper(content)
-      lt_button_wrapper(content).gsub("lt_button_","dk_button_")
+      lt_button_wrapper(content).gsub("lt_button_", "dk_button_")
     end
+
     def group_ids
       (params[:group_ids] || @user.group_ids).collect { |g| g.to_i }
     end
 
     def group_filter
       select_tag("group_id", options_from_collection_for_select(Group.all.insert(0, Group.new(:id => nil, :name => "Show All Groups")), "id", "name", params[:group_id].to_i))
-    end	  	  
-    
+    end
+
     def categories_for(category_type_name, order="name")
       cat_type = CategoryType.named(category_type_name).first
       cat_type ? cat_type.category_list(order) : []
-    end	  
-    
+    end
+
     def render_pagination(collection, collection_name, options={})
       if collection.blank?
         content_tag(:div, "No Content", :class => "pagination")
       else
         render :partial => "cms/shared/pagination", :locals => {
-          :collection => collection,
-          :first_page_path => send("cms_#{collection_name}_path", {:page => 1}.merge(options)),
-          :previous_page_path => send("cms_#{collection_name}_path", {:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
-          :current_page_path => send("cms_#{collection_name}_path", options),
-          :next_page_path => send("cms_#{collection_name}_path", {:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
-          :last_page_path => send("cms_#{collection_name}_path", {:page => collection.total_pages}.merge(options))
+            :collection         => collection,
+            :first_page_path    => send("cms_#{collection_name}_path", {:page => 1}.merge(options)),
+            :previous_page_path => send("cms_#{collection_name}_path", {:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
+            :current_page_path  => send("cms_#{collection_name}_path", options),
+            :next_page_path     => send("cms_#{collection_name}_path", {:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
+            :last_page_path     => send("cms_#{collection_name}_path", {:page => collection.total_pages}.merge(options))
         }
       end
-    end	  
+    end
 
     def url_with_mode(url, mode)
       uri = URI.parse(url)
       if uri.query =~ /mode=[^&]*/
-        "#{uri.path}?#{uri.query.gsub(/((^|&)mode=)[^&]*/) {|s| "#{$1}#{mode}" }}"
+        "#{uri.path}?#{uri.query.gsub(/((^|&)mode=)[^&]*/) { |s| "#{$1}#{mode}" }}"
       elsif uri.query
         "#{uri.path}?#{uri.query}&mode=#{mode}"
       else
         "#{uri.path}?mode=#{mode}"
       end
     end
-    
+
     def determine_order(current_order, order)
       if current_order == order
         if order =~ / desc$/i
@@ -148,8 +198,61 @@ LBW
         end
       else
         order
-      end 
+      end
+    end
+
+    # Render a CMS styled 'X Delete' button. This button will appear on tool bars, typically set apart visually from other buttons.
+    # Has a 'confirm?' popup attached to it as well.
+    # Assumes that javascript code to handle the 'confirm' has already been included in the page.
+    #
+    # @param [Hash] options The options for this tag
+    # @option options [String or Boolean] :title Title for 'confirm' popup. If specified as 'true' or with a string value a standard 'confirm yes/no' window should be used. If true is specified, its assume that the javascript popup handles the title.
+    # @option options [Path] :path The path or URL to link_to. Takes same types at url_for or link_to. Defaults to '#' if not specified.
+    # @option options [Boolean] :enabled If false, the button will be marked disabled. Default to false.
+    def delete_button(options={})
+      classes = "button"
+      classes << " disabled" if !options[:enabled]
+      classes << " delete_button"
+      classes << " http_delete confirm_with_title" if options[:title]
+
+      link_to_path = options[:path] ? options[:path] : "#"
+
+      span_options = {:id => 'delete_button', :class => classes}
+      span_options[:title] = options[:title] if (!options[:title].blank? && options[:title].class == String)
+      link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete".html_safe), link_to_path, span_options
+    end
+
+    # Render a CMS styled 'Edit' button. This button will appear on tool bars, typically set apart visually from other buttons.
+    #
+    # @param [Hash] options The options for this tag
+    # @option options [Path] :path The path or URL to link_to. Takes same types at url_for or link_to. Defaults to '#' if not specified.
+    # @option options [Boolean] :enabled If false, the button will be marked disabled. Default to false.
+    def edit_button(options={})
+      classes = "button"
+      classes << " disabled" if !options[:enabled]
+
+      link_to_path = options[:path] ? options[:path] : "#"
+      span_options = {:id => 'edit_button', :class => classes}
+      link_to span_tag("&nbsp;Edit&nbsp;".html_safe), link_to_path, span_options
+
+    end
+
+    # Render a CMS styled 'Add' button. This button will appear on tool bars, typically set apart visually from other buttons.
+    #
+    # @param [Path] The path or URL to link_to. Takes same types at url_for or link_to.
+    def add_button(path, options={})
+      classes      = "button"
+      span_options = {:class => classes}
+      link_to span_tag("&nbsp;Add&nbsp;".html_safe), path, span_options
+    end
+
+    private
+
+    # Converts a CSS jQuery selector into something that can be suitably used as a CSS id element.
+    def to_id(selector, suffix=nil)
+      id = selector.gsub(".", "_")
+      id = id + "_#{suffix}" if suffix
+      id
     end
-    
   end
 end

data/app/helpers/cms/form_builder.rb

@@ -12,21 +12,21 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
   #   * :width - The width for the select (defaults to 455px).
   #
   def drop_down(method, choices, options = {}, html_options = {})
-    select_class = "#{@object_name}_#{method}"
-    h_opts = add_tabindex!(@default_options.merge(html_options))
+    select_class   = "#{@object_name}_#{method}"
+    h_opts         = add_tabindex!(@default_options.merge(html_options))
     h_opts[:class] = select_class
 
-    opts = objectify_options(options)
+    opts           = objectify_options(options)
     set_default_value!(method, options)
-    cms_options = options.extract!(:default_value, :width)
+    cms_options = options.extract_only!(:default_value, :width)
     render_cms_form_partial :fancy_drop_down,
                             :object_name => @object_name, :method => method,
-                            :choices => choices, :options => opts,
+                            :choices     => choices, :options => opts,
                             :cms_options => cms_options, :html_options => h_opts
   end
 
   def date_picker(method, options={})
-    text_field(method, {:size => 10, :class => "date_picker"}.merge(options))
+    text_field(method, {:size => 10, :class => "date_picker", :value=>Cms::DatePicker.format_for_ui(@object.send(method))}.merge(options))
   end
 
   def tag_list(options={})
@@ -54,17 +54,17 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
   def cms_drop_down(method, choices, options={}, html_options={})
     add_tabindex!(html_options)
     set_default_value!(method, options)
-    cms_options = options.extract!(:label, :instructions, :default_value)
+    cms_options = options.extract_only!(:label, :instructions, :default_value)
     render_cms_form_partial :drop_down,
                             :object_name => @object_name, :method => method,
-                            :choices => choices, :options => options,
+                            :choices     => choices, :options => options,
                             :cms_options => cms_options, :html_options => html_options
   end
 
   def cms_tag_list(options={})
     add_tabindex!(options)
     set_default_value!(:tag_list, options)
-    cms_options = options.extract!(:label, :instructions, :default_value)
+    cms_options = options.extract_only!(:label, :instructions, :default_value)
     render_cms_form_partial :tag_list,
                             :options => options, :cms_options => cms_options
   end
@@ -74,22 +74,22 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
   #
   def text_editor(method, options = {})
     @template.send(
-            "text_editor",
-            @object_name,
-            method,
-            objectify_options(options))
+        "text_editor",
+        @object_name,
+        method,
+        objectify_options(options))
   end
 
   # Renders a WYWIWYG editor with the 'type' selector. 
   def cms_text_editor(method, options = {})
     add_tabindex!(options)
     set_default_value!(method, options)
-    cms_options = options.extract!(:label, :instructions, :default_value)
+    cms_options = options.extract_only!(:label, :instructions, :default_value)
     render_cms_form_partial :text_editor,
-                            :id => (options[:id] || "#{@object_name}_#{method}"),
+                            :id             => (options[:id] || "#{@object_name}_#{method}"),
                             :editor_enabled => (cookies["editorEnabled"].blank? ? true : (cookies["editorEnabled"] == 'true' || cookies["editorEnabled"] == ['true'])),
-                            :object_name => @object_name, :method => method,
-                            :options => options, :cms_options => cms_options
+                            :object_name    => @object_name, :method => method,
+                            :options        => options, :cms_options => cms_options
   end
 
   # Renders instructions for a given field below the field itself. Instructions can be used to provide helpful
@@ -114,7 +114,7 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
   def cms_check_box(method, options={})
     add_tabindex!(options)
     set_default_value!(method, options)
-    cms_options = options.extract!(:label, :instructions, :default_value)
+    cms_options = options.extract_only!(:label, :instructions, :default_value)
     render_cms_form_partial "check_box", :method=>method, :options => options, :cms_options => cms_options
   end
 
@@ -139,14 +139,26 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
       set_default_value!(method, options)
       options[:default_handler] = "erb" unless options[:default_handler]
 
-      cms_options = options.extract!(:label, :instructions)
-      dropdown_options = options.extract!(:default_handler)
+      cms_options      = options.extract_only!(:label, :instructions)
+      dropdown_options = options.extract_only!(:default_handler)
       add_tabindex!(options)
       render_cms_form_partial :template_editor, :method=>method, :dropdown_options=>dropdown_options, :options => options, :cms_options=>cms_options
     end
   end
 
 
+  # Basic replacement for the error_messages provided by Rails 2, which were deprecated/removed in Rails 3.
+  def cms_error_messages
+    return unless object.respond_to?(:errors) && object.errors.any?
+
+    errors_list = ""
+    errors_list << @template.content_tag(:h2, "#{object.errors.size} error prohibited this #{object_name.humanize} from being saved.".html_safe)
+    errors_list << @template.content_tag(:p, "There were problems with the following fields:")
+    errors_list << @template.content_tag(:ul, object.errors.full_messages.map { |message| @template.content_tag(:li, message).html_safe }.join("\n").html_safe).html_safe
+
+    @template.content_tag(:div, errors_list.html_safe, :class => "errorExplanation", :id=>"errorExplanation")
+  end
+
   private
 
   def set_default_value!(method, options={})
@@ -171,7 +183,7 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
 
   def render_cms_form_partial(field_type_name, locals)
     @template.render :partial => "cms/form_builder/cms_#{field_type_name}",
-                     :locals => {:f => self}.merge(locals)
+                     :locals  => {:f => self}.merge(locals)
   end
 
 end