browsercms 3.3.4 → 3.4.0.rc1

data/app/controllers/cms/sessions_controller.rb

@@ -1,5 +1,6 @@
 # This controller handles the login/logout function of the site.  
-class Cms::SessionsController < Cms::ApplicationController
+module Cms
+class SessionsController < Cms::ApplicationController
 
   before_filter :redirect_to_cms_site, :only => [:new]
   layout "cms/login"
@@ -24,7 +25,7 @@ class Cms::SessionsController < Cms::ApplicationController
         redirect_to((!params[:success_url].blank? && params[:success_url]) || session[:return_to] || "/")
         session[:return_to] = nil
       else
-        redirect_back_or_default(cms_home_url)
+        redirect_back_or_default(cms.home_url)
       end
     else
       note_failed_signin
@@ -69,3 +70,4 @@ class Cms::SessionsController < Cms::ApplicationController
   end
 
 end
+end

data/app/controllers/cms/tags_controller.rb

@@ -1,4 +1,5 @@
-class Cms::TagsController < Cms::ContentBlockController
+module Cms
+class TagsController < Cms::ContentBlockController
   def index
     load_blocks
     respond_to do |format| 
@@ -6,7 +7,10 @@ class Cms::TagsController < Cms::ContentBlockController
       format.js { render :inline => "var tags = #{@blocks.map{|e| e.name}.to_json}" }
     end
   end
+  
   def show
     redirect_to cms_tags_url
   end
+  
 end
+end

data/app/controllers/cms/tasks_controller.rb

@@ -1,4 +1,5 @@
-class Cms::TasksController < Cms::BaseController
+module Cms
+class TasksController < Cms::BaseController
   
   before_filter :set_toolbar_tab
   before_filter :load_page, :only => [:new, :create]
@@ -8,7 +9,7 @@ class Cms::TasksController < Cms::BaseController
   end
   
   def create
-    @task = @page.tasks.build(params[:task])
+    @task = @page.tasks.build(params[:cms_task])
     @task.assigned_by = current_user
     if @task.save
       flash[:notice] = "Page was assigned to '#{@task.assigned_to.login}'"
@@ -26,7 +27,7 @@ class Cms::TasksController < Cms::BaseController
         end
       end
       flash[:notice] = "Tasks marked as complete"
-      redirect_to cms_dashboard_path
+      redirect_to dashboard_path
     else
       @task = Task.find(params[:id])
       if @task.assigned_to == current_user
@@ -40,7 +41,7 @@ class Cms::TasksController < Cms::BaseController
     end
   rescue ActiveRecord::RecordNotFound
     flash[:error] = "No tasks were marked for completion"
-    redirect_to cms_dashboard_path
+    redirect_to dashboard_path
   end
   
   private
@@ -52,4 +53,5 @@ class Cms::TasksController < Cms::BaseController
       @toolbar_tab = :sitemap
     end  
   
+end
 end

data/app/controllers/cms/toolbar_controller.rb

@@ -1,4 +1,5 @@
-class Cms::ToolbarController < Cms::BaseController
+module Cms
+class ToolbarController < Cms::BaseController
 
   def index
     if params[:page_toolbar] != "0"
@@ -6,7 +7,8 @@ class Cms::ToolbarController < Cms::BaseController
       @page_toolbar_enabled = true
     end
     @page_version = params[:page_version]    
-    @page = Page.find(params[:page_id]).as_of_version(params[:page_version])
+    @page = Page.find(params[:page_id]).as_of_version(params[:page_version]) if params[:page_id]
   end  
   
 end
+end

data/app/controllers/cms/users_controller.rb

@@ -1,4 +1,5 @@
-class Cms::UsersController < Cms::ResourceController
+module Cms
+class UsersController < Cms::ResourceController
   layout 'cms/administration'
 
   check_permissions :administrate, :except => [:show, :change_password, :update_password]
@@ -24,7 +25,7 @@ class Cms::UsersController < Cms::ResourceController
     end
     
     unless params[:group_id].to_i == 0
-      query << "user_group_memberships.group_id = ?"
+      query << "#{UserGroupMembership.table_name}.group_id = ?"
       conditions << params[:group_id]
     end
     
@@ -40,9 +41,9 @@ class Cms::UsersController < Cms::ResourceController
   end
 
   def update_password
-    if user.update_attributes(params[:user])
+    if user.update_attributes(params[:cms_user])
       flash[:notice] = "Password for '#{user.login}' was changed"
-      redirect_to(current_user.able_to?(:administrate) ? cms_users_path : cms_user_path(user))
+      redirect_to(current_user.able_to?(:administrate) ? users_path : user_path(user))
     else
       render :action => 'change_password'
     end
@@ -55,12 +56,12 @@ class Cms::UsersController < Cms::ResourceController
     rescue Exception => e
       flash[:error] = e.message
     end
-    redirect_to cms_users_path
+    redirect_to users_path
   end
   
   def enable
     user.enable!
-    redirect_to cms_users_path
+    redirect_to users_path
   end
 
   protected
@@ -98,3 +99,4 @@ class Cms::UsersController < Cms::ResourceController
       raise Cms::Errors::AccessDenied if !current_user.able_to?(:administrate) && params[:id].to_i != current_user.id
     end
 end
+end

data/app/helpers/cms/application_helper.rb

@@ -2,22 +2,10 @@
 module Cms
   module ApplicationHelper
 
-    def require_stylesheet_link(sources=(), content_area=:html_head)
-      @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))
-      end
-    end
-
-    def require_javascript_include(sources=(), content_area=:html_head)
-      @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
+    # Help with deprecations messages
+    # @deprecated
+    def cms_handler_path(*args)
+      raise "The #cms_handler_path helper method has been removed from BrowserCMS. Use '#handler_path instead'."
     end
 
     def searchable_sections(selected = nil)
@@ -58,7 +46,7 @@ module Cms
       count = block.connected_pages.count
       if count > 0
         # Would love a cleaner solution to this problem, see http://stackoverflow.com/questions/702728
-        path = Portlet === block ? usages_cms_portlet_path(block) : [:usages, :cms, block]
+        path = Portlet === block ? usages_portlet_path(block) : [:usages, block]
         link_to count, path, :id => block.id, :block_type => block.content_block_type
       else
         count
@@ -136,11 +124,11 @@ HTML
     def lt_button_wrapper(content)
       button = <<LBW
   <div class="lt_button">
-    <img src="/images/cms/lt_button_l.gif" alt="" />
+    #{image_tag "cms/lt_button_l.gif"}
     <div class="lt_button_content">
       <span>#{ content }</span>
     </div>
-    <img src="/images/cms/lt_button_r.gif" alt="" style="margin-right: 10px;" />
+    #{image_tag "cms/lt_button_r.gif", :style=>"margin-right: 10px;"}
   </div>
 LBW
       button.html_safe
@@ -158,27 +146,31 @@ LBW
       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
 
+    # Fetches a list of categories for a cms_drop_down. Will prompt users to create Categories/Categories types if the proper ones don't exist.
     def categories_for(category_type_name, order="name")
       cat_type = CategoryType.named(category_type_name).first
-      cat_type ? cat_type.category_list(order) : []
+      categories = cat_type ? cat_type.category_list(order) : [Category.new(:name=>"-- You must first create a 'Category Type' named '#{category_type_name}'")]
+      categories.empty? ? [Category.new(:name=>"-- You must first create a Category with a Category Type of '#{category_type_name}'.")]: categories
     end
 
     def render_pagination(collection, collection_name, options={})
       if collection.blank?
         content_tag(:div, "No Content", :class => "pagination")
       else
+        collection_path = "#{collection_name}_path"
         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))
+            :first_page_path    => send(collection_path, {:page => 1}.merge(options)),
+            :previous_page_path => send(collection_path, {:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
+            :current_page_path  => send(collection_path, options),
+            :next_page_path     => send(collection_path, {:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
+            :last_page_path     => send(collection_path, {:page => collection.total_pages}.merge(options))
         }
       end
     end
 
     def url_with_mode(url, mode)
+      url = "" unless url # Handles cases where request.referrer is nil (see cms/_page_toolbar.html.erb for an example)
       uri = URI.parse(url)
       if uri.query =~ /mode=[^&]*/
         "#{uri.path}?#{uri.query.gsub(/((^|&)mode=)[^&]*/) { |s| "#{$1}#{mode}" }}"

data/app/helpers/cms/content_block_helper.rb

@@ -1,6 +1,8 @@
 module Cms
   module ContentBlockHelper
 
+    # From 3.3.x (Performance)
+    # Delete once we confirm that content_block_tr_tag below works.
 
     # Prints the <tr> for each block. Adds classes based on:
     # * Name/id of the block
@@ -20,6 +22,31 @@ module Cms
       tag "tr", options, true
     end
 
+    # From 3.4.x (Namespaced and using Data elements to clean up JS in pages)
+    
+    # For each row in content block table, we need to output all the paths for the actions in a way that JS can read them.
+    # We use 'data-' elements here to avoid duplication of path calculations.
+    def content_block_tr_tag(block)
+      cname = class_name_for(block)
+      can_modify = current_user.able_to_modify?(block)
+
+      options = {}
+      data = options[:data] = {}
+      data[:status] = block.class.publishable? && !block.published? ? ' draft' : ' published'
+
+      options[:id] = "#{cname}_#{block.id}"
+      options[:class] = [cname]
+      options[:class] << 'non-editable' unless can_modify && current_user.able_to?(:edit_content)
+      options[:class] << 'non-publishable' unless can_modify && current_user.able_to?(:publish_content)
+      options['data-new_path'] = url_for(new_block_path(block))
+      options['data-view_path'] = url_for(block_path(block))
+      options['data-edit_path'] = url_for(block_path(block, :edit))
+      options['data-versions_path'] = url_for(block_path(block, :versions)) if block.class.versioned?
+      options['data-delete_path'] = url_for(block_path(block))
+      options['data-publish_path'] = url_for(block_path(block, :publish)) if block.class.publishable?
+      tag "tr", options, true
+    end
+
     def class_name_for(block)
       block.class.name.underscore
     end

data/app/helpers/cms/menu_helper.rb

@@ -130,7 +130,7 @@ module Cms
           node = section_node.node
           
           item = {}
-          item[:id] = "#{section_node.node_type.underscore}_#{section_node.node_id}"
+          item[:id] = "#{section_node.node_type.gsub("::","_").underscore}_#{section_node.node_id}"
           
           # If we are showing a section item, we want to use the path for the first page
           page_or_link = section_node.section? ? node.first_page_or_link : node

data/app/helpers/cms/page_helper.rb

@@ -1,6 +1,13 @@
 module Cms
   module PageHelper
 
+    # Return the JS file to load the configured default WYSIWYG editor
+    #
+    # Ideally, this could be improved if sprockets allows for dynamically determining which js library to use.
+    def cms_content_editor
+      "bcms/#{Cms.content_editor}"
+    end
+
     # Outputs the title for this page. Used by both internal CMS pages, as well as page templates. If not explicitily set,
     #   returns the title of the page.
     #
@@ -19,24 +26,18 @@ module Cms
       @page
     end
 
-
     # Outputs the content of a particular container. If the user is in 'edit' mode the container and block controls will
     # be rendered.
     #
-    # Note: As of Jan 19, 2010, all render.html.erb templates must handle marking their content as 'html_safe'. This is
-    # bit of a pain, but I can't figure out how (or if) i can globally do that or not.
-    #
     # @return [String] The HTML content for the container.
     def container(name)
-      page_content = instance_variable_get("@_content_for")
-      content = page_content[name]
+      content = content_for(name)
       if logged_in? && @page && @mode == "edit" && current_user.able_to_edit?(@page)
         render :partial => 'cms/pages/edit_container', :locals => {:name => name, :content => content}
       else
         content
       end
-    end
-    
+    end    
     # Determine if a given container has any blocks within it. Useful for determine if markup should be conditionally included
     # when a block is present, but not shown if no block was added. For example:
     #
@@ -62,7 +63,7 @@ module Cms
     # Add the code to render the CMS toolbar.
     def cms_toolbar
       toolbar = <<HTML
-<iframe src="#{cms_toolbar_path(:page_id => @page.id, :page_version => @page.version, :mode => @mode, :page_toolbar => @show_page_toolbar ? 1 : 0) }" width="100%" height="#{@show_page_toolbar ? 159 : 100 }px" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" name="cms_toolbar"></iframe>
+<iframe src="#{cms.toolbar_path(:page_id => @page.id, :page_version => @page.version, :mode => @mode, :page_toolbar => @show_page_toolbar ? 1 : 0) }" width="100%" height="#{@show_page_toolbar ? 159 : 100 }px" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" name="cms_toolbar"></iframe>
 HTML
       toolbar.html_safe if @show_toolbar
     end
@@ -94,12 +95,12 @@ HTML
       items = []
       ancestors[start..ancestors.size].each_with_index do |sec,i|
         items << content_tag(:li, 
-          link_to(h(sec.name), sec.actual_path), (i == 0 ? {:class => "first"} : {}))
+          link_to(sec.name, sec.actual_path), (i == 0 ? {:class => "first"} : {}))
       end
       if !show_parent && current_page.section.path == current_page.path
-        items[items.size-1] = content_tag(:li, h(current_page.section.name))
+        items[items.size-1] = content_tag(:li, current_page.section.name)
       else
-        items << content_tag(:li, h(current_page.page_title))
+        items << content_tag(:li, current_page.page_title)
       end
       content_tag(:ul, "\n  #{items.join("\n  ")}\n".html_safe, :class => "breadcrumbs")
     end

data/app/helpers/cms/path_helper.rb

@@ -1,48 +1,83 @@
 module Cms
+
+  # @todo All methods really need to be renamed to match conventions for Engines.
+  # In CMS::Engine, shouldn't have cms_ in method name.
+  # From app, should be cms.xyz_path
   module PathHelper
+
     def cms_index_path_for(resource, options={})
-      send("cms_#{resource_collection_name(resource).pluralize}_path", options)
+      polymorphic_path(build_path_for(resource), options)
     end
-    
+
+    # @deprecated Remove all usages of this in favor of cms_index_path_for ()
     def cms_index_url_for(resource, options={})
-      send("cms_#{resource_collection_name(resource).pluralize}_url", options)
+      send("#{resource_collection_name(resource).underscore.pluralize.gsub('/', '_')}_url", options)
     end
-    
+
     def cms_new_path_for(resource, options={})
-      send("new_cms_#{resource_collection_name(resource)}_path", options)
+      new_polymorphic_path(build_path_for(resource), options)
     end
-    
+
+    # @deprecated Remove all usages of this in favor of cms_new_path_for ()
     def cms_new_url_for(resource, options={})
-      send("new_cms_#{resource_collection_name(resource)}_url", options)
+      send("new_#{resource_collection_name(resource).underscore.gsub('/', '_')}_url", options)
     end
-    
+
     def cms_connectable_path(connectable, options={})
       if Portlet === connectable
-        cms_portlet_path(connectable)
+        cms.portlet_path(connectable)
       else
-        [:cms, connectable]
+        connectable
       end
     end
-    
+
+    # @todo Really needs to be renamed to match conventions for Engines.
+    # In CMS::Engine, should be edit_connectable_path
+    # From app, should be cms.edit_connectable_path
     def edit_cms_connectable_path(connectable, options={})
       if Portlet === connectable
-        edit_cms_portlet_path(connectable, options)
+        edit_portlet_path(connectable, options)
       else
-        polymorphic_path([:edit, :cms, connectable], options)        
+        polymorphic_path([:edit, connectable], options)
       end
     end
-    
+
+    # Returns the Engine Proxy that this resource is from.
+    def engine_for(resource)
+      EngineHelper.decorate(resource)
+      send(resource.engine_name)
+    end
+
+    def path_elements_for(resource)
+      EngineHelper.decorate(resource)
+      resource.path_elements
+    end
+
     private
-      # Returns the name of the collection that this resource belongs to
-      # the resource can be a ContentType, ActiveRecord::Base instance
-      # or just a string or symbol
-      def resource_collection_name(resource)
-        collection_name = case resource
-          when ContentType then resource.name.underscore
-          when ActiveRecord::Base then resource.class.name.underscore
-          else resource.to_s
-        end
+
+    def build_path_for(model_or_class_or_content_type)
+      path = []
+      path << engine_for(model_or_class_or_content_type)
+      path.concat path_elements_for(model_or_class_or_content_type)
+      path
+    end
+
+    # Returns the name of the collection that this resource belongs to
+    # the resource can be a ContentType, ActiveRecord::Base instance
+    # or just a string or symbol
+    def resource_collection_name(resource)
+      if resource.respond_to?(:resource_collection_name)
+        return resource.resource_collection_name
       end
-        
+      case resource
+        when ContentType then
+          resource.route_name
+        when ActiveRecord::Base then
+          resource.class.model_name.demodulize
+        else
+          resource.to_s
+      end
+    end
+
   end
 end