browsercms 3.0.0 → 3.0.1

data/app/controllers/cms/connectors_controller.rb

@@ -7,7 +7,7 @@ class Cms::ConnectorsController < Cms::BaseController
     @block_type = ContentType.find_by_key(params[:block_type] || session[:last_block_type] || 'html_block')
     @container = params[:container]
     @connector = @page.connectors.build(:container => @container)
-    @blocks = @block_type.model_class.all(:order => "name")      
+    @blocks = @block_type.model_class.all(:order => "name", :conditions => ["deleted = ?", false])      
   end
 
   def create

data/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
@@ -115,8 +107,8 @@ module Cms
 <<LBW
   <div class="lt_button">
     <img src="/images/cms/lt_button_l.gif" alt="" />
-    <div>
-      #{ content }
+    <div class="lt_button_content">
+      <span>#{ content }</span>
     </div>
     <img src="/images/cms/lt_button_r.gif" alt="" style="margin-right: 10px;" />
   </div>
@@ -165,15 +157,6 @@ LBW
       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

data/app/helpers/cms/form_builder.rb

@@ -27,12 +27,12 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
   # These are the higher-level fields, 
   # that get wrapped in divs with labels, instructions, etc.
   
-  %w[date_picker text_area text_field file_field].each do |f|
+  %w[date_picker datetime_select text_area text_field file_field].each do |f|
     src = <<-end_src
       def cms_#{f}(method, options={})
         add_tabindex!(options)
         set_default_value!(method, options)
-        cms_options = options.extract!(:label, :instructions)
+        cms_options = options.extract!(:label, :instructions, :default_value)
         render_cms_form_partial :#{f},
           :object_name => @object_name, :method => method,
           :options => options, :cms_options => cms_options
@@ -43,7 +43,8 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
   
   def cms_drop_down(method, choices, options={}, html_options={})
     add_tabindex!(html_options)
-    cms_options = options.extract!(:label, :instructions)
+    set_default_value!(method, options)    
+    cms_options = options.extract!(:label, :instructions, :default_value)
     render_cms_form_partial :drop_down,
       :object_name => @object_name, :method => method,
       :choices => choices, :options => options, 
@@ -52,14 +53,16 @@ class Cms::FormBuilder < ActionView::Helpers::FormBuilder
     
   def cms_tag_list(options={})
     add_tabindex!(options)
-    cms_options = options.extract!(:label, :instructions)
+    set_default_value!(:tag_list, options)    
+    cms_options = options.extract!(:label, :instructions, :default_value)
     render_cms_form_partial :tag_list, 
       :options => options, :cms_options => cms_options
   end
 
   def cms_text_editor(method, options = {})
     add_tabindex!(options)
-    cms_options = options.extract!(:label, :instructions)
+    set_default_value!(method, options)    
+    cms_options = options.extract!(:label, :instructions, :default_value)
     render_cms_form_partial :text_editor, 
       :id => (options[:id] || "#{@object_name}_#{method}"), 
       :editor_enabled => (cookies["editorEnabled"].blank? ? true : (cookies["editorEnabled"] == 'true' || cookies["editorEnabled"] == ['true'])),

data/app/helpers/cms/menu_helper.rb

@@ -9,16 +9,19 @@ module Cms
     # 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:
+    # You can change the behavior with the following options, all of these are optional:
     #
     # ==== Options
-    # * <tt>:page</tt> - What page should be used.  If this value is omitted, the value in @page will be used.
+    # * <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>: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
     # * <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.
@@ -111,19 +114,30 @@ module Cms
     def render_menu(options={})
       #Intialize parameters
       page = options[:page] || @page
+      return nil unless page
+      
+      # Path to the section
+      if options.has_key?(:path)
+        section_for_path = Section.find_by_path(options[:path])
+        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
+      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"
       
-      ancestors = page.ancestors
       if from_top > ancestors.size
         return html << "</div>\n"
       else
-        ancestors = page.ancestors[from_top..-1]
+        ancestors = ancestors[from_top..-1]
       end
       
       #We are defining a recursive lambda that takes the top-level sections
@@ -165,7 +179,7 @@ module Cms
         end
         html << "</ul>\n".indent(indent+2)
       end
-      fn.call(ancestors.first.visible_child_nodes, 1) unless ancestors.first.blank?
+      fn.call(ancestors.first.visible_child_nodes(:limit => limit), 1) unless ancestors.first.blank?
       html << "</div>\n"
     end
   end

data/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

data/app/helpers/cms/template_support.rb

@@ -0,0 +1,21 @@
+# 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
+        helper do
+          def cms_toolbar
+            %Q{<iframe src="#{cms_toolbar_path(:page_toolbar => 0)}" width="100%" height="100px" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" name="cms_toolbar"></iframe>}
+          end
+        end
+      end
+    end
+  end
+  
+end

data/app/models/abstract_file_block.rb

@@ -9,5 +9,9 @@ class AbstractFileBlock < ActiveRecord::Base
   def path
     attachment_file_path
   end
+  
+  def self.publishable?
+    true
+  end
 
 end

data/app/models/connector.rb

@@ -43,15 +43,19 @@ class Connector < ActiveRecord::Base
   end
   
   def status
-    published? ? :published : :draft
+    live? ? 'published' : 'draft'
   end        
 
   def status_name
     status.to_s.titleize
   end  
   
-  def published?
-    publishable? ? connectable.published? : true
+  def live?
+    if publishable?
+      connectable.live?
+    else
+      true
+    end
   end
   
   def publishable?

data/app/models/dynamic_view.rb

@@ -1,5 +1,6 @@
 class DynamicView < ActiveRecord::Base
   
+  after_save :write_file_to_disk
   after_destroy :remove_file_from_disk
 
   named_scope :with_file_name, lambda{|file_name|
@@ -27,10 +28,7 @@ class DynamicView < ActiveRecord::Base
       validates_presence_of :name, :format, :handler
       validates_uniqueness_of :name, :scope => [:format, :handler],
         :message => "Must have a unique combination of name, format and handler"
-            
-      after_save :write_file_to_disk
-      before_destroy :remove_file_from_disk
-      
+                  
     end 
   end
   

data/app/models/portlet.rb

@@ -24,6 +24,10 @@ class Portlet < ActiveRecord::Base
         :publishable => false,
         :renderable => {:instance_variable_name_for_view => "@portlet"})
       
+      def self.template_path
+        default_template_path
+      end      
+      
       def self.helper_path
         "app/portlets/helpers/#{name.underscore}_helper.rb"
       end
@@ -53,14 +57,6 @@ class Portlet < ActiveRecord::Base
     type.constantize 
   end
 
-  def self.content_block_type
-    "portlet"
-  end 
-  
-  def self.content_block_type_for_list
-    "portlet"
-  end
-  
   # For column in list
   def portlet_type_name
     type.titleize
@@ -87,7 +83,24 @@ class Portlet < ActiveRecord::Base
   end
 
   def inline_options
-    {:inline => self.template}
+    options = {}
+    options[:inline] = self.template if self.class.render_inline 
+    options[:type] = self.handler unless self.handler.blank?
+    options
+  end
+
+  def self.handler(handler_type)
+    define_method(:handler) { handler_type }
+  end
+
+  def self.render_inline(*args)
+    if args.length > 0
+      @render_inline = args.first
+    elsif !defined?(@render_inline)
+      @render_inline = true
+    else
+      @render_inline
+    end
   end
 
   def type_name

data/app/models/section.rb

@@ -36,9 +36,10 @@ class Section < ActiveRecord::Base
   
   attr_accessor :full_path
   
-  def visible_child_nodes
+  def visible_child_nodes(options={})
     children = child_nodes.of_type(["Section", "Page", "Link"]).all(:order => 'section_nodes.position')
-    children.select{|sn| sn.visible?}
+    visible_children = children.select{|sn| sn.visible?}
+    options[:limit] ? visible_children[0...options[:limit]] : visible_children
   end
   
   def all_children_with_name
@@ -70,8 +71,9 @@ class Section < ActiveRecord::Base
     end      
   end  
   
-  def ancestors
-    node ? node.ancestors : []
+  def ancestors(options={})
+    ancs = node ? node.ancestors : []
+    options[:include_self] ? ancs + [self] : ancs
   end
   
   def move_to(section)
@@ -113,7 +115,7 @@ class Section < ActiveRecord::Base
   
   #The first page that is a decendent of this section
   def first_page_or_link
-    section_node = child_nodes.of_type(['Link','Page']).first 
+    section_node = child_nodes.of_type(['Link','Page']).first(:order => "section_nodes.position")
     return section_node.node if section_node
     sections.each do |s| 
       node = s.first_page_or_link

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", 
+      :class => "http_put button left", 
       :id => "publish_button" %>
   <% else %>
     <%= link_to span_tag('Publish'), "#", 
@@ -11,15 +11,15 @@
 <% end -%>
 
 <%= link_to span_tag('View Content'), block_path, 
-  :class => "button#{ ' off' if action_name == 'show'} middle", 
+  :class => "button middle#{ ' off' if action_name == 'show'}", 
   :id => "view_button" %>
   
 <%= link_to span_tag('Edit Content'), block_path(:edit), 
-  :class => "button#{ ' off' if action_name == 'edit'}", 
+  :class => "button right#{ ' off' if action_name == 'edit'}", 
   :id => "edit_button" %>
   
 <%= link_to span_tag("Add New Content"), new_block_path, 
-  :class => "button#{ ' off' if action_name == 'new'} right", 
+  :class => "button#{ ' off' if action_name == 'new'}", 
   :id => "add_button" %>
 
 <% if @block.class.versioned? %>

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

@@ -89,7 +89,7 @@
 	<td class="first"></td>
         <% content_type.columns_for_index.each_with_index do |column, i| %>
           <td class="<%= column[:label].gsub(' ', '').underscore %>">
-            <div class="dividers">
+            <div<%= ' class="dividers"' if (i + 3 < col_ct) %>>
             <%= block.send(column[:method]) %>
             <% if i.zero? && block.respond_to?(:cannot_be_deleted_message) && block.cannot_be_deleted_message %>
               <div class="cannot_be_deleted_message" style="display: none">

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

@@ -1,34 +1,44 @@
-<% page_title "Content Library / View Usages" %>
-<% @toolbar_title = "Pages Using #{content_type.display_name} '#{ @block.name }'" %>
-<% content_for :html_head do %>
-  <%= stylesheet_link_tag("cms/content_library") %>
-  <% javascript_tag do %>
-    jQuery(function($) {
-      $('#functions .button').addClass('disabled').attr('href','#');
-      $('#view_button').removeClass('disabled')
-        .attr('href', '<%= url_for([:cms, @block])%>')
-      $('#edit_button').removeClass('disabled')
-        .attr('href', '<%= url_for([:edit, :cms, @block])%>')
-    })
-  <% end %>
-<% end %>
-
-<%= render :partial => 'cms/blocks/toolbar' %>
-
-<table class="data">
-  <thead>
-    <tr>
-      <th>Page Name</th>
-      <th>Path</th>
-      <th class="last">Page Status</th>
-    </tr>
-  </thead>
-  <% @pages.each do |page| %>
-    <% status = page.archived? ? :archived : page.status %>    
-    <tr>
-      <td class="page_name"><%=  page.name %></td>
-      <td class="path"><%=  link_to page.path, page.path %></td>
-      <td class="block_status"><%= status_icon(status) %> <div><%= status %></div></td>
-    </tr>
-  <% end %>
-</table>
+<% page_title "Content Library / View Usages" %>
+<% @toolbar_title = "Pages Using #{content_type.display_name} '#{ @block.name }'" %>
+<% content_for :html_head do %>
+  <%= stylesheet_link_tag("cms/content_library") %>
+  <% javascript_tag do %>
+    jQuery(function($) {
+      $('#functions .button').addClass('disabled').attr('href','#');
+      $('#view_button').removeClass('disabled')
+        .attr('href', '<%= cms_connectable_path(@block)%>')
+      $('#edit_button').removeClass('disabled')
+        .attr('href', '<%= edit_cms_connectable_path(@block)%>')
+    })
+  <% end %>
+<% end %>
+
+<%= render :partial => 'cms/blocks/toolbar' %>
+<div class="roundedcorners">
+  <table id="blocks" class="data">
+  <thead>
+    <tr>
+      <th colspan="2" class="first"><div class="dividers">Page Name</div></th>
+      <th><div class="dividers">Path</div></th>
+      <th colspan="2" class="last"><div class="dividers">Page Status</div></th>
+    </tr>
+  </thead>
+  <% @pages.each do |page| %>
+    <% status = page.archived? ? :archived : page.status %>    
+    <tr>
+      <td class="first"></td>
+      <td class="page_name"><%=  page.name %></td>
+      <td class="path"><%=  link_to page.path, page.path %></td>
+      <td class="block_status"><%= status_icon(status) %> <div><%= status %></div></td>
+      <td class="last"></td>
+    </tr>
+  <% end %>
+      <tr>
+        <td colspan="8" class="buffer"></td>
+      </tr>
+  </table>
+  <div class="tl"></div>
+  <div class="tr"></div>
+  <div class="bl"></div>
+  <div class="br"></div>
+</div>