browsercms 3.0.2 → 3.0.3

data/app/helpers/cms/menu_helper.rb

@@ -1,30 +1,63 @@
 module Cms
   module MenuHelper
-    # This will render a menu based on the page
-    # With no options passed, it will render a menu that shows all the child sections of the root
-    # and then it will show the path of decendent sections all the way to the current page.
-    # The resulting HTML is a DIV with a UL in it.  Each LI will have an A in it.  If the item is a Section,
-    # the HREF of the A will be the URL of the first non-archived page that is a direct child of that Section.
-    # Hidden pages will not show up, but if the first page in a Section is hidden, it will be used as the URL
-    # for that Section.  This is commonly done to have a page for a Section and avoid having duplicates in the 
-    # navigation.
+    # Renders a menu. There are two options, neither are required:
+    # 
+    # ==== Options
+    # * <tt>:items</tt> - The items which should appear in the menu. This defaults to calling 
+    #   menu_items which generates items automatically based on the current page. But you can use 
+    #   this option to pass in a custom menu structure.
+    # * <tt>:partial</tt> - The partial used to render the menu. By default this is "partials/menu",
+    #   which can be customised through the CMS. The partial gets a local variable <tt>items</tt>.
+    #
+    # ==== Structure of items
     #
+    # The items should be an array of hashes, in a tree. Each hash can have the following keys (name
+    # and url are required, others are optional):
+    # 
+    # * <tt>:name</tt> - The name which appears in the menu
+    # * <tt>:url</tt> - The URL to link to
+    # * <tt>:id</tt> - The id for the menu item
+    # * <tt>:selected</tt> - Boolean value to indicate whether the menu item is the current page
+    # * <tt>:target</tt> - The target attribute for the link
+    # * <tt>:children</tt> - An array of hashes containing the child menu items. This is where the
+    #   tree structure comes in.
+    def render_menu(options = {})
+      options[:items] ||= menu_items
+      options[:partial] ||= "cms/menus/menu"
+      options[:id] ||= "menu"
+      options[:class] ||= "menu"
+      render :partial => options[:partial], :locals => { :items => options[:items], :css_id => options[:id], :css_class => options[:class] }
+    end
+    
+    # This will render generate an array-of-hashes tree structure based on the page, which can be
+    # passed to render_menu in order to generate a menu.
+    # 
+    # With no options passed, it will generate a structure that includes all the child sections of 
+    # the root and then it will include the path of decendent sections all the way to the current
+    # page.
+    # 
+    # Hidden pages will not be included, but if the first page in a Section is hidden, it will be
+    # used as the URL for that Section. This is commonly done to have a page for a Section and avoid
+    # having duplicates in the navigation.
+    # 
     # You can change the behavior with the following options, all of these are optional:
     #
     # ==== Options
-    # * <tt>:page</tt> - What page should be used as the current page.  If this value is omitted, the value in @page will be used.
-    # * <tt>:path</tt> - This will be used to look up a section and that section will used to generate the menu.  The current page will
-    #   still be the value of the page option or @page.  Note that this is the path to a section, not a path to a page.
+    # * <tt>:page</tt> - What page should be used as the current page.  If this value is omitted, 
+    #   the value in @page will be used.
+    # * <tt>:path</tt> - This will be used to look up a section and that section will used to 
+    #   generate the menu structure. The current page will still be the value of the page option or
+    #   @page. Note that this is the path to a section, not a path to a page.
     # * <tt>:from_top</tt> - How many below levels from the root the tree should start at.  
     #   All sections at this level will be shown.  The default is 0, which means show all
-    #   section that are direct children of the root
+    #   nodes that are direct children of the root
     # * <tt>:depth</tt> - How many levels deep should the tree go, relative to from_top.  
     #   If no value is supplied, the tree will go all the way down to the current page.
     #   If a value is supplied, the tree will be that many levels underneath from_top deep.
     # * <tt>:limit</tt> - Limits the number of top-level elements that will be included in the list
-    # * <tt>:class</tt> - The CSS Class that will be applied to the div.  The default value is "menu".
-    # * <tt>:show_all_siblings</tt> - Passing true for this option will make all sibilings appear in the tree.
-    #   the default is false, in which case only the siblings of nodes within the open path will appear.
+    # * <tt>:show_all_siblings</tt> - Passing true for this option will make all sibilings appear in
+    #   the tree. The default is false, in which case only the siblings of nodes within the open
+    #   path will appear.
     # 
     # ==== Examples
     #
@@ -32,89 +65,41 @@ module Cms
     # with teams being a Page, everything else a Section.  Also, assume we are on the
     # Baltimore Ravens page. If you're not a footbal fan, see http://sports.yahoo.com/nfl/teams
     #
-    #   render_menu
-    #   # => <div class="menu">
-    #     <ul>
-    #       <li id="section_2" class="first open">
-    #         <a href="/buf">AFC</a>
-    #         <ul>
-    #           <li id="section_3" class="first">
-    #             <a href="/buf">East</a>
-    #           </li>
-    #           <li id="section_4" class="open">
-    #             <a href="/bal">North</a>
-    #             <ul>
-    #               <li id="page_5" class="first on">
-    #                 <a href="/bal">Baltimore Ravens</a>
-    #               </li>
-    #               <li id="page_6">
-    #                 <a href="/cin">Cincinnati Bengals</a>
-    #               </li>
-    #               <li id="page_7">
-    #                 <a href="/cle">Cleveland Browns</a>
-    #               </li>
-    #               <li id="page_8" class="last">
-    #                 <a href="/pit">Pittsburgh Steelers</a>
-    #               </li>
-    #             </ul>
-    #           </li>
-    #           <li id="section_5">
-    #             <a href="/hou">South</a>
-    #           </li>
-    #           <li id="section_6" class="last">
-    #             <a href="/den">West</a>
-    #           </li>
-    #         </ul>
-    #       </li>
-    #       <li id="section_7" class="last">
-    #         <a href="/dal">NFC</a>
-    #       </li>
-    #     </ul>
-    #   </div>
+    #   menu_items
+    #   # => [
+    #     { :id => "section_2", :url => "/buf", :name => "AFC", :children => [
+    #       { :id => "section_3", :url => "/buf", :name => "East" },
+    #       { :id => "section_4", :url => "/bal", :name => "North", :children => [
+    #         { :id => "page_5", :selected => true, :url => "/bal", :name => "Baltimore Ravens" },
+    #         { :id => "page_6", :url => "/cin", :name => "Cincinnati Bengals" },
+    #         { :id => "page_7", :url => "/cle", :name => "Cleveland Browns" },
+    #         { :id => "page_8", :url => "/pit", :name => "Pittsburgh Steelers" }
+    #       ] },
+    #       { :id => "section_9", :url => "/hou", :name => "South" },
+    #       { :id => "section_10}", :url => "/den", :name => "West" }
+    #       ] },
+    #     { :id => "section_11", :url => "/dal", :name => "NFC" }
+    #   ]
     #
-    #   render_menu(:depth => 2, :show_all_siblings => true)
-    #   # => <div class="menu">
-    #     <ul>
-    #       <li id="section_2" class="first open">
-    #         <a href="/buf">AFC</a>
-    #         <ul>
-    #           <li id="section_3" class="first">
-    #             <a href="/buf">East</a>
-    #           </li>
-    #           <li id="section_4" class="open">
-    #             <a href="/bal">North</a>
-    #           </li>
-    #           <li id="section_5">
-    #             <a href="/hou">South</a>
-    #           </li>
-    #           <li id="section_6" class="last">
-    #             <a href="/den">West</a>
-    #           </li>
-    #         </ul>
-    #       </li>
-    #       <li id="section_7" class="last">
-    #         <a href="/dal">NFC</a>
-    #         <ul>
-    #           <li id="section_8" class="first">
-    #             <a href="/dal">East</a>
-    #           </li>
-    #           <li id="section_9">
-    #             <a href="/chi">North</a>
-    #           </li>
-    #           <li id="section_10">
-    #             <a href="/atl">South</a>
-    #           </li>
-    #           <li id="section_11" class="last">
-    #             <a href="/ari">West</a>
-    #           </li>
-    #         </ul>
-    #       </li>
-    #     </ul>
-    #   </div>    
-    def render_menu(options={})
-      #Intialize parameters
-      page = options[:page] || @page
-      return nil unless page
+    #   menu_items(:depth => 2, :show_all_siblings => true)
+    #   # => [
+    #     { :id => "section_2", :url => "/buf", :name => "AFC", :children => [
+    #         { :id => "section_3", :url => "/buf", :name => "East" },
+    #         { :id => "section_4", :url => "/bal", :name => "North" },
+    #         { :id => "section_5", :url => "/hou", :name => "South" },
+    #         { :id => "section_6", :url => "/den", :name => "West" }
+    #       ] },
+    #     { :id => "section_7", :url => "/dal", :name => "NFC", :children => [
+    #         { :id => "section_8", :url => "/dal", :name => "East" },
+    #         { :id => "section_9", :url => "/chi", :name => "North" },
+    #         { :id => "section_10", :url => "/atl", :name => "South" },
+    #         { :id => "section_11", :url => "/ari", :name => "West" }
+    #       ] }
+    #   ]
+    def menu_items(options = {})
+      # Intialize parameters
+      selected_page = options[:page] || @page
+      return nil unless selected_page
       
       # Path to the section
       if options.has_key?(:path)
@@ -122,65 +107,52 @@ module Cms
         raise "Could not find section for path '#{options[:path]}'" unless section_for_path
         ancestors = section_for_path.ancestors(:include_self => true)
       else
-        ancestors = page.ancestors
+        ancestors = selected_page.ancestors
       end
       
-      from_top = options.has_key?(:from_top) ? options[:from_top].to_i : 0
-      depth = options.has_key?(:depth) ? options[:depth].to_i : 1.0/0
-      id = options[:id] || "menu"
-      css_class = options[:class] || "menu"
-      show_all_siblings = !!(options[:show_all_siblings])
-      limit = options[:limit]
-
-      html = "<div id=\"#{id}\" class=\"#{css_class}\">\n"
-      
-      if from_top > ancestors.size
-        return html << "</div>\n"
-      else
-        ancestors = ancestors[from_top..-1]
+      if options.has_key?(:from_top)
+        ancestors = ancestors[options[:from_top].to_i..-1] || []
       end
       
-      #We are defining a recursive lambda that takes the top-level sections
-      #d is the current depth
-      fn = lambda do |nodes, d|
-        indent = (d-1)*4
-        html << "<ul>\n".indent(indent+2)
-        nodes.each_with_index do |sn, i|
-
-          #Construct the CSS classes that the LI should have
-          classes = ["depth-#{d}"]
-          if i == 0
-            classes << "first"
-          elsif i == nodes.size-1
-            classes << "last"
-          end
-          classes << "open" if ancestors.include?(sn.node)
-          classes << "on" if page == sn.node
-          cls = classes.empty? ? nil : classes.join(" ")
+      depth = options.has_key?(:depth) ? options[:depth].to_i : 1.0/0
+      show_all_siblings = options[:show_all_siblings] || false
+      
+      # We are defining a recursive lambda that takes the top-level sections
+      fn = lambda do |section_nodes, current_depth|
+        section_nodes.map do |section_node|
+          node = section_node.node
           
-          html << %Q{<li id="#{sn.node_type.underscore}_#{sn.node.id}"#{cls ? " class=\"#{cls}\"" : ''}>\n}.indent(indent+4)
+          item = {}
+          item[:selected] = true if selected_page == node
+          item[:id] = "#{section_node.node_type.underscore}_#{section_node.node_id}"
           
-          #Figure out what this link for this node should be
-          #If it is a page, then the page will simply be used
-          #But if is a page, we call the first_page_or_link method
-          p = sn.node_type == "Section" ? sn.node.first_page_or_link : sn.node
-          html << %Q{<a href="#{p ? p.path : '#'}"#{(p.respond_to?(:new_window) && p.new_window?) ? ' target="_blank"' : ''}>#{sn.node.name}</a>\n}.indent(indent+6)
+          # If we are showing a section item, we want to use the path for the first page
+          page = section_node.section? ? node.first_page_or_link : node
           
-          #Now if this is a section, we do the child nodes, 
-          #but only if the show_all_siblings parameter is true, 
-          #or if this section is one of the current page's ancestors
-          #and also if the current depth is less than the target depth
-          if sn.node_type == "Section" && (show_all_siblings || ancestors.include?(sn.node)) && d < depth
-            fn.call(sn.node.visible_child_nodes, d+1)
-          end
+          item[:url] = page && page.path || '#'
+          item[:name] = node.name
+          item[:target] = "_blank" if page.respond_to?(:new_window?) && page.new_window?
           
-          html << %Q{</li>\n}.indent(indent+4)
+          # Now if this is a section, we do the child nodes, 
+          # but only if the show_all_siblings parameter is true, 
+          # or if this section is one of the current page's ancestors
+          # and also if the current depth is less than the target depth
+          if section_node.section? &&
+             current_depth < depth &&
+             (show_all_siblings || ancestors.include?(node)) &&
+             !node.visible_child_nodes.empty?
+            item[:children] = fn.call(node.visible_child_nodes, current_depth + 1)
+          end
           
+          item
         end
-        html << "</ul>\n".indent(indent+2)
       end
-      fn.call(ancestors.first.visible_child_nodes(:limit => limit), 1) unless ancestors.first.blank?
-      html << "</div>\n"
+      
+      if ancestors.empty?
+        []
+      else
+        fn.call(ancestors.first.visible_child_nodes(:limit => options[:limit]), 1)
+      end
     end
   end
-end
+end

data/app/helpers/cms/page_helper.rb

@@ -14,7 +14,7 @@ module Cms
     
     def container(name)
       content = instance_variable_get("@content_for_#{name}")
-      if logged_in? && @page && @mode == "edit"
+      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
@@ -65,4 +65,4 @@ module Cms
     end
             
   end
-end
+end

data/app/models/attachment.rb

@@ -1,5 +1,5 @@
 require 'digest/sha1'
-require 'ftools'
+require 'fileutils'
 
 class Attachment < ActiveRecord::Base
 
@@ -116,7 +116,7 @@ class Attachment < ActiveRecord::Base
     unless temp_file.blank?
       FileUtils.mkdir_p File.dirname(full_file_location)
       if temp_file.local_path
-        File.copy temp_file.local_path, full_file_location
+        FileUtils.copy temp_file.local_path, full_file_location
       else
         open(full_file_location, 'w') {|f| f << temp_file.read }
       end

data/app/models/group.rb

@@ -1,5 +1,11 @@
+#
+# A group represents a collection of permissions. Each User can be assigned to one or more groups, and the sum of
+# their permissions from all groups combined represents what they can do.
+#
 class Group < ActiveRecord::Base
-  
+
+  GUEST_CODE = "guest"
+
   has_many :user_group_memberships
   has_many :users, :through => :user_group_memberships
   
@@ -26,5 +32,10 @@ class Group < ActiveRecord::Base
   def cms_access?
     group_type && group_type.cms_access?
   end
-  
+
+  # Finds the guest group, which is a special group that represents public non-logged in users.
+  def self.guest
+    with_code(GUEST_CODE).first
+  end
+
 end

data/app/models/guest_user.rb

@@ -1,7 +1,13 @@
+#
+# Guests are a special user that represents a non-logged in user. The main reason to create an explicit
+# instance of this type of user is so that the permissions a Guest user can have can be set via the Admin interface.
+#
+# Every request that a non-logged in user makes will use this User's permissions to determine what they can/can't do.
+#
 class GuestUser < User
-  
+
   def initialize(attributes={})
-    super({:login => "guest", :first_name => "Anonymous", :last_name => "User"}.merge(attributes))
+    super({:login => Group::GUEST_CODE, :first_name => "Anonymous", :last_name => "User"}.merge(attributes))
     @guest = true
   end
     
@@ -18,7 +24,7 @@ class GuestUser < User
   end
   
   def group
-    @group ||= Group.find_by_code("guest")
+    @group ||= Group.guest
   end
   
   def groups

data/app/models/link.rb

@@ -1,5 +1,5 @@
 class Link < ActiveRecord::Base
-  acts_as_content_block
+  acts_as_content_block :connectable => false
   
   named_scope :named, lambda{|name| {:conditions => ['links.name = ?', name]}}
   
@@ -32,4 +32,4 @@ class Link < ActiveRecord::Base
     url
   end
 
-end
+end

data/app/models/page.rb

@@ -150,7 +150,7 @@ class Page < ActiveRecord::Base
           
   def delete_connectors
     connectors.for_page_version(version).all.each{|c| c.destroy }
-  end        
+  end
          
   #This is done to let copy_connectors know which version to pull from
   #copy_connectors will get called later as an after_update callback

data/app/models/section.rb

@@ -75,7 +75,12 @@ class Section < ActiveRecord::Base
     ancs = node ? node.ancestors : []
     options[:include_self] ? ancs + [self] : ancs
   end
-  
+
+  def with_ancestors(options = {})
+    options.merge! :include_self => true
+    self.ancestors(options)
+  end
+
   def move_to(section)
     if root?
       false
@@ -139,4 +144,4 @@ class Section < ActiveRecord::Base
     end
   end
       
-end
+end

data/app/models/user.rb

@@ -11,8 +11,7 @@ class User < ActiveRecord::Base
   validates_presence_of     :email
   #validates_length_of       :email,    :within => 6..100 #r@a.wk
   #validates_uniqueness_of   :email,    :case_sensitive => false
-  validates_format_of       :email,    :with => /[^@]{2,}@[^.]{2,}\..{2,}/, :message => "should be an email address, ex. xx@xx.com"
-
+  validates_format_of       :email,    :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :message => "should be an email address, ex. xx@xx.com"
   attr_accessible :login, :email, :name, :first_name, :last_name, :password, :password_confirmation, :expires_at
 
   has_many :user_group_memberships
@@ -89,12 +88,12 @@ class User < ActiveRecord::Base
     @viewable_sections ||= Section.find(:all, :include => {:groups => :users}, :conditions => ["users.id = ?", id])
   end
 
-  def editable_sections
-    @editable_sections ||= Section.find(:all, :include => {:groups => [:group_type, :users]}, :conditions => ["users.id = ? and group_types.cms_access = ?", id, true])
+  def modifiable_sections
+    @modifiable_sections ||= Section.find(:all, :include => {:groups => [:group_type, :users]}, :conditions => ["users.id = ? and group_types.cms_access = ?", id, true])
   end
 
-  #Expects a list of names of Permissions
-  #true if the user has any of the permissions
+  # Expects a list of names of Permissions
+  # true if the user has any of the permissions
   def able_to?(*required_permissions)
     perms = required_permissions.map(&:to_sym)
     permissions.any? do |p| 
@@ -102,24 +101,43 @@ class User < ActiveRecord::Base
     end
   end
     
-  #Expects object to be an object or a section
-  #If it's a section, that will be used
-  #If it's not a section, it will call section on the object
-  #returns true if any of the sections of the groups the user is in matches the page's section.
+  # Expects object to be an object or a section
+  # If it's a section, that will be used
+  # If it's not a section, it will call section on the object
+  # returns true if any of the sections of the groups the user is in matches the page's section.
   def able_to_view?(object)
     section = object.is_a?(Section) ? object : object.section
-    !!(viewable_sections.include?(section) || groups.cms_access.count > 0)
+    viewable_sections.include?(section) || groups.cms_access.count > 0
+  end
+  
+  def able_to_modify?(object)
+    case object
+      when Section
+        modifiable_sections.include?(object)
+      when Page, Link
+        modifiable_sections.include?(object.section)
+      else
+        if object.class.respond_to?(:connectable?) && object.class.connectable?
+          object.connected_pages.all? { |page| able_to_modify?(page) }
+        else
+          true
+        end
+    end
+  end
+  
+  # Expects node to be a Section, Page or Link
+  # Returns true if the specified node, or any of its ancestor sections, is editable by any of 
+  # the user's 'CMS User' groups.
+  def able_to_edit?(object)    
+    able_to?(:edit_content) && able_to_modify?(object)
   end
   
-  #Expects section to be a Section
-  #Returns true if any of the sections of the groups that have group_type = 'CMS User' 
-  #that the user is in match the section.
-  def able_to_edit?(section)    
-    !!(editable_sections.include?(section) && able_to?(:edit_content))
+  def able_to_publish?(object)
+    able_to?(:publish_content) && able_to_modify?(object)
   end
   
   def able_to_edit_or_publish_content?
     able_to?(:edit_content, :publish_content)
   end
   
-end
+end

data/app/views/cms/blocks/_toolbar_for_member.html.erb

@@ -1,7 +1,7 @@
 <% able_to? :publish_content do -%>
   <% if @block.respond_to?(:live?) && !@block.live? %>
     <%= link_to span_tag('Publish'), block_path(:publish), 
-      :class => "http_put button left", 
+      :class => "http_put button left#{' disabled' unless current_user.able_to_publish?(@block)}", 
       :id => "publish_button" %>
   <% else %>
     <%= link_to span_tag('Publish'), "#", 
@@ -15,7 +15,7 @@
   :id => "view_button" %>
   
 <%= link_to span_tag('Edit Content'), block_path(:edit), 
-  :class => "button right#{ ' off' if action_name == 'edit'}", 
+  :class => "button right#{ ' off' if action_name == 'edit'}#{' disabled' unless current_user.able_to_edit?(@block)}", 
   :id => "edit_button" %>
   
 <%= link_to span_tag("Add New Content"), new_block_path, 
@@ -33,6 +33,6 @@
 <% end %>
 
 <%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), block_path, 
-  :class => "http_delete confirm_with_title button", 
+  :class => "http_delete confirm_with_title button#{' disabled' unless current_user.able_to_publish?(@block)}", 
   :title => "Are you sure you want to delete '#{@block.name}'?", 
   :id => "delete_button" %>

data/app/views/cms/blocks/index.html.erb

@@ -1,4 +1,5 @@
 <% content_for(:html_head) do %>
+<%= javascript_include_tag "cms/content_library" %>
   <% javascript_tag do %>
     jQuery(function($){
       var collectionName = '<%= content_type.model_class.name.underscore.pluralize %>'
@@ -11,12 +12,14 @@
         var match = this.id.match(/(.*)_(\d+)/) 
         var type = match[1]
         var id = match[2]
+        var editable = !$(this).hasClass("non-editable")
+        var publishable = !$(this).hasClass("non-publishable")
         $('table.data tbody tr').removeClass('selected')
         $(this).addClass('selected')
         $('#functions .button').addClass('disabled').attr('href','#')
         $('#add_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/new')
         $('#view_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id)
-        $('#edit_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/edit')
+        if (editable) $('#edit_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/edit')
         <% if content_type.model_class.versioned? %>
           $('#revisions_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/versions')
         <% else %>
@@ -28,12 +31,14 @@
           $('#delete_button').addClass('disabled')
             .attr('title', $.trim(cannot_be_deleted_message.text()))
         } else {
-          $('#delete_button').removeClass('disabled')
-            .attr('href', '/cms/'+collectionName+'/'+id)  
-            .attr('title', 'Are You Sure You Want To Delete This Record?')
+          if (publishable) {
+            $('#delete_button').removeClass('disabled')
+              .attr('href', '/cms/'+collectionName+'/'+id)  
+              .attr('title', 'Are You Sure You Want To Delete This Record?')
+          }
         }        
         <% able_to? :publish_content do -%>
-          if($(this).hasClass('draft')) {
+          if($(this).hasClass('draft') && publishable) {
             $('#publish_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/publish?_redirect_to='+location.href)        
           }
         <% end %>  
@@ -85,7 +90,7 @@
        col_ct += 1 if content_type.model_class.publishable? %>
     <% @blocks.each do |b| %>
       <% block = b.class.versioned? ? b.as_of_draft_version : b %>
-      <tr id="<%= block.class.name.underscore %>_<%= block.id %>" class="<%= block.class.name.underscore %> <%= block.class.publishable? && !block.published? ? 'draft' : 'published' %>">
+      <tr id="<%= block.class.name.underscore %>_<%= block.id %>" class="<%= block.class.name.underscore %> <%= block.class.publishable? && !block.published? ? 'draft' : 'published' %> <%= 'non-editable' unless current_user.able_to_edit?(block) %> <%= 'non-publishable' unless current_user.able_to_publish?(block) %>">
 	<td class="first"></td>
         <% content_type.columns_for_index.each_with_index do |column, i| %>
           <td class="<%= column[:label].gsub(' ', '').underscore %>">

data/app/views/cms/content/show.html.erb

@@ -12,9 +12,9 @@
   <iframe src="<%=h 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>
 <% end %>
 
-<% @page.connectors.for_page_version(@page.version).each do |c| %>
-  <% content_for(c.container.to_sym) do %>
-    <%= render_connector c %>
+<% @_connectors.each_with_index do |connector, i| %>
+  <% content_for(connector.container.to_sym) do %>
+    <%= render_connector_and_connectable(connector, @_connectables[i]) %>
   <% end %>
 <% end %> 
 

data/app/views/cms/menus/_menu.html.erb

@@ -0,0 +1,9 @@
+<div id="<%= css_id %>" class="<%= css_class %>">
+<% unless items.empty?
+%>  <ul>
+<% items.each_with_index do |item, i|
+      %><%= render :partial => "/cms/menus/menu_item", :object => item, :locals => { :depth => 1, :position => i + 1, :item_count => items.length }
+      %><% end 
+%>  </ul>
+<% end
+%></div>

data/app/views/cms/menus/_menu_item.html.erb

@@ -0,0 +1,11 @@
+<% indent = (depth - 1) * 4
+%><%= " "*(indent + 4) %><li id="<%= menu_item[:id] %>" class="depth-<%= depth %><%= ' first' if position == 1 %><%= ' last' if position == item_count %><%= ' on' if menu_item[:selected] %><%= ' open' unless menu_item[:children].blank? %>">
+<%= " "*(indent + 6) %><a href="<%= menu_item[:url] %>"<%= ' target=#{menu_item[:target]}' if menu_item[:target] %>><%= menu_item[:name] %></a>
+<% unless menu_item[:children].blank?
+%><%= " "*(indent + 6)  %><ul>
+<% menu_item[:children].each_with_index do |item, i|
+%><%= render :partial => "/cms/menus/menu_item", :object => item, :locals => { :depth => depth + 1, :position => i + 1, :item_count => menu_item[:children].length }
+%><% end 
+%><%= " "*(indent + 6)  %></ul>
+<% end 
+%><%= " "*(indent + 4)  %></li>