browsercms 3.1.0 → 3.1.1

data/app/controllers/cms/dynamic_views_controller.rb

@@ -48,7 +48,8 @@ class Cms::DynamicViewsController < Cms::BaseController
   protected
     def dynamic_view_type
       @dynamic_view_type ||= begin
-        type = request.request_uri.split('/')[2].classify.constantize
+        uri = request.request_uri.sub(/\?.*/, '')
+        type = uri.split('/')[2].classify.constantize
         raise "Invalid Type" unless type.ancestors.include?(DynamicView)
         type
       end

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/helpers/cms/page_helper.rb

@@ -21,6 +21,18 @@ module Cms
       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:
+    #
+    # <% unless container_has_block? :sidebar %>
+    #   <div id="sidebar">
+    #   <%= container :sidebar %>
+    #   </div>
+    # <% end %>
+    #
+    # @param [Symbol] name The name of the container to check
+    # @param [Proc] block
+    # @return [Boolean] True if the container has one or more blocks, or if we are in edit mode. False otherwise. 
     def container_has_block?(name, &block)
       has_block = (@mode == "edit") || current_page.connectable_count_for_container(name) > 0
       logger.info "mode = #{@mode}, has_block = #{has_block}"

data/app/models/content_type.rb

@@ -19,7 +19,7 @@ class ContentType < ActiveRecord::Base
   # Given a 'key' like 'html_blocks' or 'portlet'
   # Raises exception if nothing was found.
   def self.find_by_key(key)
-    class_name = key.tableize.classify
+    class_name = key.singularize.tableize.classify
     content_type = find_by_name(class_name)
     if content_type.nil?
       if class_name.constantize.ancestors.include?(Portlet)

data/app/models/page.rb

@@ -41,6 +41,21 @@ class Page < ActiveRecord::Base
         :conditions => ['connectors.connectable_id = ? and connectors.connectable_type = ?', obj.id, obj.class.base_class.name] }    
     end 
   }  
+
+  # currently_connected_to tightens the scope of connected_to by restricting to the 
+  # results to matches on current versions of pages only.  This renders obj versions
+  # useless, as the older objects will very likely have older versions of pages and
+  # thus return no results.
+  named_scope :currently_connected_to, lambda { |obj|
+    ver = obj.class.versioned? ? obj.version : nil
+    if ver
+      { :include => :connectors, 
+        :conditions => ['connectors.connectable_id = ? and connectors.connectable_type = ? and connectors.connectable_version = ? and connectors.page_version = pages.version', obj.id, obj.class.base_class.name, ver] }
+    else
+      { :include => :connectors, 
+        :conditions => ['connectors.connectable_id = ? and connectors.connectable_type = ? and connectors.page_version = pages.version', obj.id, obj.class.base_class.name] }    
+    end
+  }
   
   has_one :section_node, :as => :node, :dependent => :destroy
   
@@ -80,18 +95,23 @@ class Page < ActiveRecord::Base
       if c.should_be_copied?
         connectable = c.connectable_type.constantize.versioned? ? c.connectable.as_of_version(c.connectable_version) : c.connectable
       
+        version = connectable.class.versioned? ? connectable.version : nil
+
         #If we are copying connectors from a previous version, that means we are reverting this page,
-        #in which case we should create a new version of the block, and connect this page to that block
+        #in which case we should create a new version of the block, and connect this page to that block.
+        #If the connectable is versioned, the connector needs to reference the newly drafted connector
+        #that is created during the revert_to method
         if @copy_connectors_from_version && connectable.class.versioned? && (connectable.version != connectable.draft.version)
           connectable = connectable.class.find(connectable.id)
           connectable.updated_by_page = self
           connectable.revert_to(c.connectable_version)
+          version = connectable.class.versioned? ? connectable.draft.version : nil
         end      
       
         new_connector = connectors.build(
           :page_version => options[:to_version_number], 
           :connectable => connectable, 
-          :connectable_version => connectable.class.versioned? ? connectable.version : nil,         
+          :connectable_version => version,         
           :container => c.container, 
           :position => c.position
         )

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

@@ -51,3 +51,8 @@
 <div class="bl"></div>
 <div class="br"></div>
 </div>
+<% if @views.size == 0 && params[:key_word]%>
+  <div class="pagination">No results found for '<%= params[:key_word] %>'</div>
+<% elsif @views.total_pages > 1 %>
+  <%= render_pagination @views, dynamic_view_type.name.pluralize.underscore.to_sym %>
+<% end %>

data/browsercms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{browsercms}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BrowserMedia"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-06-28}
   s.description = %q{General purpose Web Content Management in Rails.}
   s.email = %q{github@browsermedia.com}
   s.executables = ["browsercms", "bcms"]
@@ -1345,78 +1345,78 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{BrowserCMS is a general purpose, open source Web Content Management System (CMS) written in Ruby on Rails. Designed for web developers who want to create great looking websites while using standard Rails tools for customizing it.}
   s.test_files = [
-    "test/custom_assertions.rb",
-     "test/factories.rb",
+    "test/integration/login_test.rb",
+     "test/integration/cms/password_management_test.rb",
+     "test/integration/cms/ckeditor_test.rb",
+     "test/functional/tests/pretend_controller_test.rb",
+     "test/functional/cms/links_controller_test.rb",
+     "test/functional/cms/image_blocks_controller_test.rb",
      "test/functional/cms/cache_controller_test.rb",
-     "test/functional/cms/categories_controller_test.rb",
-     "test/functional/cms/connectors_controller_test.rb",
-     "test/functional/cms/content_block_controller_test.rb",
-     "test/functional/cms/content_controller_test.rb",
-     "test/functional/cms/content_types_controller_test.rb",
-     "test/functional/cms/dashboard_controller_test.rb",
-     "test/functional/cms/dynamic_views_controller_test.rb",
-     "test/functional/cms/file_blocks_controller_test.rb",
-     "test/functional/cms/groups_controller_test.rb",
      "test/functional/cms/home_controller_test.rb",
-     "test/functional/cms/html_blocks_controller_test.rb",
-     "test/functional/cms/image_blocks_controller_test.rb",
-     "test/functional/cms/links_controller_test.rb",
      "test/functional/cms/pages_controller_test.rb",
+     "test/functional/cms/content_block_controller_test.rb",
+     "test/functional/cms/dashboard_controller_test.rb",
+     "test/functional/cms/content_types_controller_test.rb",
      "test/functional/cms/portlets_controller_test.rb",
+     "test/functional/cms/html_blocks_controller_test.rb",
      "test/functional/cms/section_nodes_controller_test.rb",
-     "test/functional/cms/sections_controller_test.rb",
-     "test/functional/cms/sessions_controller_test.rb",
      "test/functional/cms/toolbar_controller_test.rb",
+     "test/functional/cms/sessions_controller_test.rb",
      "test/functional/cms/users_controller_test.rb",
-     "test/functional/tests/pretend_controller_test.rb",
-     "test/integration/cms/ckeditor_test.rb",
-     "test/integration/cms/password_management_test.rb",
-     "test/integration/login_test.rb",
-     "test/test_helper.rb",
-     "test/test_logging.rb",
+     "test/functional/cms/categories_controller_test.rb",
+     "test/functional/cms/file_blocks_controller_test.rb",
+     "test/functional/cms/content_controller_test.rb",
+     "test/functional/cms/connectors_controller_test.rb",
+     "test/functional/cms/dynamic_views_controller_test.rb",
+     "test/functional/cms/sections_controller_test.rb",
+     "test/functional/cms/groups_controller_test.rb",
+     "test/unit/behaviors/searching_test.rb",
      "test/unit/behaviors/attaching_test.rb",
      "test/unit/behaviors/dynamic_attributes_test.rb",
-     "test/unit/behaviors/publishable_test.rb",
-     "test/unit/behaviors/searching_test.rb",
      "test/unit/behaviors/taggable_test.rb",
-     "test/unit/extensions/active_record/base_test.rb",
+     "test/unit/behaviors/publishable_test.rb",
      "test/unit/extensions/hash_test.rb",
      "test/unit/extensions/integer_test.rb",
-     "test/unit/helpers/application_helper_test.rb",
-     "test/unit/helpers/form_builder_test.rb",
-     "test/unit/helpers/menu_helper_test.rb",
-     "test/unit/helpers/page_helper_test.rb",
-     "test/unit/helpers/path_helper_test.rb",
-     "test/unit/lib/acts_as_content_page_test.rb",
-     "test/unit/lib/cms/authentication/controller_test.rb",
-     "test/unit/lib/cms_domain_support_test.rb",
-     "test/unit/lib/command_line_test.rb",
-     "test/unit/lib/content_block_test.rb",
-     "test/unit/lib/content_rendering_support_test.rb",
-     "test/unit/lib/generators_test.rb",
-     "test/unit/lib/routes_test.rb",
+     "test/unit/extensions/active_record/base_test.rb",
+     "test/unit/models/page_test.rb",
+     "test/unit/models/email_page_portlet_test.rb",
      "test/unit/models/attachment_test.rb",
-     "test/unit/models/category_test.rb",
-     "test/unit/models/category_type_test.rb",
      "test/unit/models/connector_test.rb",
-     "test/unit/models/content_type_test.rb",
-     "test/unit/models/email_page_portlet_test.rb",
-     "test/unit/models/file_block_test.rb",
-     "test/unit/models/group_test.rb",
      "test/unit/models/html_block_test.rb",
-     "test/unit/models/link_test.rb",
-     "test/unit/models/page_partial_test.rb",
-     "test/unit/models/page_route_test.rb",
-     "test/unit/models/page_template_test.rb",
-     "test/unit/models/page_test.rb",
-     "test/unit/models/permission_test.rb",
      "test/unit/models/portlet_test.rb",
      "test/unit/models/section_node_test.rb",
-     "test/unit/models/sections_test.rb",
+     "test/unit/models/content_type_test.rb",
+     "test/unit/models/group_test.rb",
+     "test/unit/models/page_template_test.rb",
      "test/unit/models/site_test.rb",
+     "test/unit/models/permission_test.rb",
+     "test/unit/models/link_test.rb",
      "test/unit/models/task_test.rb",
+     "test/unit/models/page_partial_test.rb",
      "test/unit/models/user_test.rb",
-     "test/unit/schema_statements_test.rb"
+     "test/unit/models/file_block_test.rb",
+     "test/unit/models/category_type_test.rb",
+     "test/unit/models/page_route_test.rb",
+     "test/unit/models/sections_test.rb",
+     "test/unit/models/category_test.rb",
+     "test/unit/schema_statements_test.rb",
+     "test/unit/lib/acts_as_content_page_test.rb",
+     "test/unit/lib/generators_test.rb",
+     "test/unit/lib/routes_test.rb",
+     "test/unit/lib/cms_domain_support_test.rb",
+     "test/unit/lib/cms/authentication/controller_test.rb",
+     "test/unit/lib/content_rendering_support_test.rb",
+     "test/unit/lib/command_line_test.rb",
+     "test/unit/lib/content_block_test.rb",
+     "test/unit/helpers/menu_helper_test.rb",
+     "test/unit/helpers/application_helper_test.rb",
+     "test/unit/helpers/page_helper_test.rb",
+     "test/unit/helpers/form_builder_test.rb",
+     "test/unit/helpers/path_helper_test.rb",
+     "test/custom_assertions.rb",
+     "test/test_logging.rb",
+     "test/factories.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/doc/guides/html/building_templates.html

@@ -135,7 +135,7 @@
                         <div id="subCol">
         <h3 class="chapter"><img src="images/chapters_icon.gif" alt="" />Chapters</h3>
         <ol class="chapters">
-<li><a href="#introduction">Introduction</a><ul><li><a href="#typical-design-process">Typical Design Process</a></li><li><a href="#design-considerations">Design Considerations</a></li></ul></li><li><a href="#creating-a-page-template">Creating a Page Template</a><ul><li><a href="#files-or-content">Files or Content?</a></li><li><a href="#understanding-containers">Understanding Containers</a></li><li><a href="#adding-a-sidebar-container">Adding A Sidebar Container</a></li></ul></li><li><a href="#tags-quick-reference">Tags Quick Reference</a><ul><li><a href="#required-tags">Required Tags</a></li><li><a href="#container-tag"><tt>container</tt> Tag</a></li><li><a href="#cms-toolbar-tag"><tt>cms_toolbar</tt> Tag</a></li><li><a href="#html-head-tag"><span class="caps">HTML</span> Head Tag</a></li><li><a href="#page-title-tag"><tt>page_title</tt> Tag</a></li><li><a href="#current-page-tag"><tt>current_page</tt> Tag</a></li><li><a href="#render-portlet-tag"><tt>render_portlet</tt> Tag</a></li><li><a href="#render-connectable-tag"><tt>render_connectable</tt> Tag</a></li></ul></li><li><a href="#navigation">Navigation</a><ul><li><a href="#basic-rules-of-menus">Basic Rules of Menus</a></li><li><a href="#using-menus">Using Menus</a></li><li><a href="#how-deep-should-menus-be">How Deep Should Menus Be?</a></li><li><a href="#primary-navigation">Primary Navigation</a></li><li><a href="#sub-navigation">Sub Navigation</a></li><li><a href="#site-maps-and-flyout-menus">Site Maps and Flyout Menus</a></li><li><a href="#using-breadcrumbs">Using Breadcrumbs</a></li></ul></li><li><a href="#using-partials">Using Partials</a><ul></ul></li></ol></div>
+<li><a href="#introduction">Introduction</a><ul><li><a href="#typical-design-process">Typical Design Process</a></li><li><a href="#design-considerations">Design Considerations</a></li></ul></li><li><a href="#creating-a-page-template">Creating a Page Template</a><ul><li><a href="#files-or-content">Files or Content?</a></li><li><a href="#understanding-containers">Understanding Containers</a></li><li><a href="#adding-a-sidebar-container">Adding A Sidebar Container</a></li></ul></li><li><a href="#tags-quick-reference">Tags Quick Reference</a><ul><li><a href="#required-tags">Required Tags</a></li><li><a href="#container-tag"><tt>container</tt> Tag</a></li><li><a href="#container-has-block-tag"><tt>container_has_block?</tt> Tag</a></li><li><a href="#cms-toolbar-tag"><tt>cms_toolbar</tt> Tag</a></li><li><a href="#html-head-tag"><span class="caps">HTML</span> Head Tag</a></li><li><a href="#page-title-tag"><tt>page_title</tt> Tag</a></li><li><a href="#current-page-tag"><tt>current_page</tt> Tag</a></li><li><a href="#render-portlet-tag"><tt>render_portlet</tt> Tag</a></li><li><a href="#render-connectable-tag"><tt>render_connectable</tt> Tag</a></li></ul></li><li><a href="#navigation">Navigation</a><ul><li><a href="#basic-rules-of-menus">Basic Rules of Menus</a></li><li><a href="#using-menus">Using Menus</a></li><li><a href="#how-deep-should-menus-be">How Deep Should Menus Be?</a></li><li><a href="#primary-navigation">Primary Navigation</a></li><li><a href="#sub-navigation">Sub Navigation</a></li><li><a href="#site-maps-and-flyout-menus">Site Maps and Flyout Menus</a></li><li><a href="#using-breadcrumbs">Using Breadcrumbs</a></li></ul></li><li><a href="#using-partials">Using Partials</a><ul></ul></li></ol></div>
                 </td>
                 <td class="guides">
                   <h2>Templates Guide</h2>
@@ -229,14 +229,15 @@
 <p>This section covers a reference for all the tags (aka Helper Methods) that can be used in Page Templates to render various elements. Here is a quick list of the available tags, their purpose and whether they are required or not.</p>
 <p>._ Name |<em>. Purpose | Required? |
 | <tt>container</tt> | A named area that allows users to add/edit content | Yes |
-| <tt>cms</em>toolbar</tt></notextile> | Renders the <span class="caps">CMS</span> toolbar controller required for editing and navigation. Should be very first element in <tt>body</tt> | Yes |
+| <tt>container_has_block</tt> | To hide markup if a container is empty | No |
+| <tt>cms_toolbar</tt> | Renders the <span class="caps">CMS</span> toolbar controller required for editing and navigation. Should be very first element in <tt>body</tt> | Yes |
 | <tt>yield :html_head | This allows the CMS to insert javascript and other information into the page. Should be last element in </tt>head+ | Yes | 
 | <tt>page_title</tt> | Inserts the &#8216;Name&#8217; of the page (or &#8216;Title&#8217; if it exists) | No |
 | <tt>current_page</tt> | Returns a reference to the <tt>Page</tt> object that is currently being rendered | No |
 | <tt>render_breadcrumbs</tt> | Generates breadcrumbs based on the current page and its location in the sitemap | No |
 | <tt>render_menu</tt> | Generates a menu based on the current page and its location in the sitemap | No |
 | <tt>render_portlet</tt> | Renders a specific portlet by name | No |
-| <tt>render_connectable</tt> | Renders a specific content block | No |</p>
+| <tt>render</em>connectable</tt></notextile> | Renders a specific content block | No |</p>
 <p>In addition, since Page Templates are Rails layouts, you can make use of any of the Asset Tags&quot;:http://guides.rubyonrails.org/layouts_and_rendering.html#structuring-layouts like <tt>stylesheet_link_tag</tt> or <tt>image_tag</tt>.</p>
 <h4 id="required-tags">3.1 Required Tags</h4>
 <p>While most of the tags are optional, there are several tags which must be included or page template just won&#8217;t work correctly. Here&#8217;s the minimum necessary tags required.</p>
@@ -249,7 +250,13 @@
 	&lt;div&gt;&lt;%= container :footer %&gt;&lt;/div&gt;</code></div>
 <p>Container names are just labels. So if you defined 5 containers on a template (header, footer, left, main, right), you could swap between any two templates which defined all those containers.</p>
 <div class='note'><p>Be aware that if you add content to a page in a container (like <tt>:sidebar</tt>) then change a pages template to one which does not have that container, the content will be &#8216;orphaned&#8217;. To remove that content, you would need to swap back to the previous template, remove the content, then change back to the new template again.</p></div>
-<h4 id="cms-toolbar-tag">3.3 <tt>cms_toolbar</tt> Tag</h4>
+<h4 id="container-has-block-tag">3.3 <tt>container_has_block?</tt> Tag</h4>
+<p>This tag can be used to hide or show containers based on whether a user has placed content in them. While an empty <tt>container</tt> tag won&#8217;t show anything, very frequently template builders will create &#8216;wrapper&#8217; markup around containers that shouldn&#8217;t appear when nothing is placed there. For example, suppose we have a sidebar container that we want to have a styled border on, but we only want it to appear when something is in that container. Here&#8217;s how you would do that:</p>
+<div class="code_container"><code class="html">&lt;% unless container_has_block? :sidebar %&gt;
+	&lt;div id=&quot;sidebar&quot;&gt;&lt;%= container :sidebar %&gt;&lt;/div&gt;
+	&lt;% end %&gt;</code></div>
+<p>This tag returns true if the user is in edit mode as well, regardless of whether there is content within the container. This is important, because otherwise, an editor would never be able to select the container to add content to!</p>
+<h4 id="cms-toolbar-tag">3.4 <tt>cms_toolbar</tt> Tag</h4>
 <p>This tag is how the toolbar is inserted into templates. It should be the first element in the <tt>body</tt> element of a page. In most cases, you can just use it as follows:</p>
 <div class="code_container"><code class="html">&lt;body&gt;
 	&lt;%= cms_toolbar %&gt;
@@ -257,20 +264,20 @@
 	&lt;!-- Text goes here --&gt;
 &lt;/body&gt;</code></div>
 <p>The toolbar is written out as an iframe which makes its less likely that styles/javascript will clash with the page being editted.</p>
-<h4 id="html-head-tag">3.4 <span class="caps">HTML</span> Head Tag</h4>
+<h4 id="html-head-tag">3.5 <span class="caps">HTML</span> Head Tag</h4>
 <p>This tag is technically a standard <tt>yield</tt> call, with a particularly named <tt>:html_head</tt>. This tag must be included in all <span class="caps">CMS</span> templates to allow it to insert the necessary javascript and style elements. It should probably be the last element in <tt>head</tt> element of a page.</p>
 <div class="code_container"><code class="html">&lt;head&gt;
   &lt;title&gt;&lt;%= page_title %&gt;&lt;/title&gt;
   &lt;%= yield :html_head %&gt;
 &lt;/head&gt;</code></div>
-<h4 id="page-title-tag">3.5 <tt>page_title</tt> Tag</h4>
+<h4 id="page-title-tag">3.6 <tt>page_title</tt> Tag</h4>
 <p>This tag will output the <tt>name</tt> attribute of the current page. If the <tt>title</tt> attribute is specified, it will output that instead. This allows users to have one label for a page appear in the navigation (navigation and the sitemap always use <tt>name</tt>) and another in the header or title bar on a page.</p>
 <p>Example:</p>
 <div class="code_container"><code class="html">&lt;title&gt;My Site | &lt;%= page_title %&gt;&lt;/title&gt;</code></div>
 <p>This is using the page_title tag to title element of a page.</p>
 <div class="code_container"><code class="html">&lt;h1&gt;&lt;%= page_title %&gt;&lt;/h1&gt;</code></div>
 <p>Another common usage of <tt>page_title</tt> is for the H1 or H2 on a page.</p>
-<h4 id="current-page-tag">3.6 <tt>current_page</tt> Tag</h4>
+<h4 id="current-page-tag">3.7 <tt>current_page</tt> Tag</h4>
 <p>This doesn&#8217;t render anything, but returns a reference to the current <tt>Page</tt> object that is being rendered. It can be used to access other attributes of the page, like the name of the section or the <tt>description</tt> of the Page. Here are some common examples:</p>
 <div class="code_container"><code class="html">&lt;%= current_page.name %&gt;</code></div>
 <p>This outputs the <tt>name</tt> attribute of the page, similar to how <tt>page_title</tt> works. You might do this if you had specified a <tt>title</tt> attribute for pages which was different than the <tt>name</tt>, but wanted to compare names.</p>
@@ -281,11 +288,11 @@
 &lt;% end %&gt;</code></div>
 <p>This renders a specific image if the page is within the top level &#8216;About Us&#8217; section. The <tt>top_level_section</tt> method finds the very top level section for a give page, regardless of how far down it is in the sitemap. Useful for making comparisons based on the first level of navigation.</p>
 <div class='note'><p>Any page or section attribute is reachable in the way. You will need to look at the <span class="caps">API</span> documentation for <tt>Page</tt> and <tt>Section</tt> to see all the available attributes.</p></div>
-<h4 id="render-portlet-tag">3.7 <tt>render_portlet</tt> Tag</h4>
+<h4 id="render-portlet-tag">3.8 <tt>render_portlet</tt> Tag</h4>
 <p>This tag will render a portlet from a template. Normally portlets are placed individually on each page by users. This tag is useful for common elements that might appear on multiple pages throughout the site. An example of this might be a Login Portlet which should appear as part of the header on all pages. Here&#8217;s an example:</p>
 <div class="code_container"><code class="html">&lt;%= render_portlet &quot;Nav Login Form&quot; %&gt;</code></div>
 <p>The only argument to <tt>render_portlet</tt> is a name. This name will match the name specified in the UI when you add a portlet. You will need to create the portlet and name in appropriately for this tag to work. The portlet will render itself based on its template.</p>
-<h4 id="render-connectable-tag">3.8 <tt>render_connectable</tt> Tag</h4>
+<h4 id="render-connectable-tag">3.9 <tt>render_connectable</tt> Tag</h4>
 <p>This tag can render a specific block in a page. It takes one argument, the block itself. This could be used to automatically include, say a footer, into a page as part of the template. For instance:</p>
 <div class="code_container"><code class="html">&lt;% footer = HtmlBlock.find(12) %&gt;
 	&lt;%= render_connectable(footer) %&gt;</code></div>

data/doc/guides/html/portlets.html

@@ -209,12 +209,11 @@ end</code></div>
 <p>Now each instance of the RecentProducts can have its own unique template. Each time a new portlet is created, the contents of
 the &#8216;render.html.erb&#8217; will be copied into the template attribute of the portlet and used to display the portlet. Users can
 update these views as they see fit.</p>
-<p><strong>Gotcha:</strong> It&#8217;s important to remember that once a portlet has a saved template, it will ignore what&#8217;s in the render.html.erb. So changes made there won&#8217;t
-be reflected until the portlet&#8217;s template has been updated again.</p>
+<p><strong>Gotcha:</strong> It&#8217;s important to remember that once a portlet has a saved template, it will ignore what&#8217;s in the render.html.erb. So changes made there won&#8217;t be reflected until the portlet&#8217;s template has been updated again.</p>
 <h4 id="default-template-handlers">1.2 Default Template Handlers</h4>
 <p>By default, templates are treated as erb views. The template editor has a drop down that allows users to choose other types like &#8216;builder&#8217; or &#8216;rhtml&#8217;. To set the default handler
 to something other than erb, modify the _form.html.erb to the following:</p>
-<div class="code_container"><code class="html">&lt;%= f.template_editor :template, :default_handler=&gt;&quot;builder&quot; %&gt;</code></div>
+<div class="code_container"><code class="html">&lt;%= f.cms_template_editor :template, :default_handler=&gt;&quot;builder&quot; %&gt;</code></div>
 <h4 id="alternative-handlers-for-non-editable-templates">1.3 Alternative handlers for non-editable templates</h4>
 <p>If the template_editor is disabled, you can also set the handler directly on the portlet like so:</p>
 <div class="code_container"><code class="ruby">class RecentProducts &lt; Portlet
@@ -223,7 +222,7 @@ to something other than erb, modify the _form.html.erb to the following:</p>
   end</code></div>
 <h4 id="using-haml-templates">1.4 Using <span class="caps">HAML</span> templates</h4>
 <p>The default list of handlers does not include Haml. To do that, install the <span class="caps">HAML</span> gem and set the default_value to &#8216;haml&#8217; like so:</p>
-<div class="code_container"><code class="html">&lt;%= f.template_editor :template, :default_handler=&gt;&quot;haml&quot; %&gt;</code></div>
+<div class="code_container"><code class="html">&lt;%= f.cms_template_editor :template, :default_handler=&gt;&quot;haml&quot; %&gt;</code></div>
                 </td>
               </tr>
             </table>

data/lib/cms/behaviors/connecting.rb

@@ -39,11 +39,11 @@ module Cms
       module InstanceMethods
 
         def connected_pages
-          Page.connected_to(self)
+          Page.currently_connected_to(self)
         end
 
         def connected_page_count
-          Page.connected_to(self).count
+          Page.currently_connected_to(self).count
         end
 
         def content_block_type

data/lib/cms/version.rb

@@ -2,5 +2,5 @@
 # Allows the precise version of BrowserCMS to be determined programmatically.
 #
 module Cms
-  VERSION = "3.1.0"
-end
+  VERSION = "3.2.0"
+end

data/test/functional/cms/dynamic_views_controller_test.rb

@@ -24,5 +24,31 @@ class Cms::DynamicViewsControllerTest < ActionController::TestCase
     assert_select "#page_template_#{@deleted_page_template.id} div", 
       :text => "Deleted (html/erb)", :count => 0
   end
+
+  def test_index_paging
+    @page_templates = []
+    20.times do |i|
+      @page_templates << Factory(:page_template, :name => "test_#{i}")
+    end
+
+    def @request.request_uri
+      "/cms/page_templates?page=1"
+    end
+
+    get :index, :page => 1
+    assert_response :success
+    # 15 on first page
+    assert_equal 15, assigns['views'].length
+
+    def @request.request_uri
+      "/cms/page_templates?page=2"
+    end
+
+    get :index, :page => 2
+    assert_response :success
+    # count minus 15 on second page
+    should_have = PageTemplate.all.length - 15
+    assert_equal should_have, assigns['views'].length
+  end
   
 end

data/test/functional/cms/html_blocks_controller_test.rb

@@ -150,7 +150,8 @@ class Cms::HtmlBlocksControllerTest < ActionController::TestCase
     @page = Factory(:page, :section => root_section, :name => "Included")
     @page2 = Factory(:page, :section => root_section, :path => "/other_path", :name => "Excluded")
     @block = Factory(:html_block, :connect_to_page_id => @page.id, :connect_to_container => "main")
-    
+    @page.publish!  # usages are only relevant when page is published
+
     get :usages, :id => @block.id
 
     assert_response :success
@@ -160,4 +161,4 @@ class Cms::HtmlBlocksControllerTest < ActionController::TestCase
     assert_select "h3", "Content Types"
   end
   
-end
+end

data/test/functional/cms/portlets_controller_test.rb

@@ -50,6 +50,7 @@ class Cms::PortletsControllerTest < ActionController::TestCase
     @page = Factory(:page, :section => root_section, :name => "Test Page", :path => "test")
     @page.create_connector(@block, "main")
     @page.reload
+    @page.publish!  # usages are only relevant when page is published
     
     get :usages, :id => @block.id
     
@@ -64,4 +65,4 @@ class Cms::PortletsControllerTest < ActionController::TestCase
     assert_select "div.instructions", "Leave blank to send the user to the page they were trying to access"
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: browsercms
 version: !ruby/object:Gem::Version 
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors: 
 - BrowserMedia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -05:00
+date: 2010-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -1374,75 +1374,75 @@ signing_key:
 specification_version: 3
 summary: BrowserCMS is a general purpose, open source Web Content Management System (CMS) written in Ruby on Rails. Designed for web developers who want to create great looking websites while using standard Rails tools for customizing it.
 test_files: 
-- test/custom_assertions.rb
-- test/factories.rb
+- test/integration/login_test.rb
+- test/integration/cms/password_management_test.rb
+- test/integration/cms/ckeditor_test.rb
+- test/functional/tests/pretend_controller_test.rb
+- test/functional/cms/links_controller_test.rb
+- test/functional/cms/image_blocks_controller_test.rb
 - test/functional/cms/cache_controller_test.rb
-- test/functional/cms/categories_controller_test.rb
-- test/functional/cms/connectors_controller_test.rb
-- test/functional/cms/content_block_controller_test.rb
-- test/functional/cms/content_controller_test.rb
-- test/functional/cms/content_types_controller_test.rb
-- test/functional/cms/dashboard_controller_test.rb
-- test/functional/cms/dynamic_views_controller_test.rb
-- test/functional/cms/file_blocks_controller_test.rb
-- test/functional/cms/groups_controller_test.rb
 - test/functional/cms/home_controller_test.rb
-- test/functional/cms/html_blocks_controller_test.rb
-- test/functional/cms/image_blocks_controller_test.rb
-- test/functional/cms/links_controller_test.rb
 - test/functional/cms/pages_controller_test.rb
+- test/functional/cms/content_block_controller_test.rb
+- test/functional/cms/dashboard_controller_test.rb
+- test/functional/cms/content_types_controller_test.rb
 - test/functional/cms/portlets_controller_test.rb
+- test/functional/cms/html_blocks_controller_test.rb
 - test/functional/cms/section_nodes_controller_test.rb
-- test/functional/cms/sections_controller_test.rb
-- test/functional/cms/sessions_controller_test.rb
 - test/functional/cms/toolbar_controller_test.rb
+- test/functional/cms/sessions_controller_test.rb
 - test/functional/cms/users_controller_test.rb
-- test/functional/tests/pretend_controller_test.rb
-- test/integration/cms/ckeditor_test.rb
-- test/integration/cms/password_management_test.rb
-- test/integration/login_test.rb
-- test/test_helper.rb
-- test/test_logging.rb
+- test/functional/cms/categories_controller_test.rb
+- test/functional/cms/file_blocks_controller_test.rb
+- test/functional/cms/content_controller_test.rb
+- test/functional/cms/connectors_controller_test.rb
+- test/functional/cms/dynamic_views_controller_test.rb
+- test/functional/cms/sections_controller_test.rb
+- test/functional/cms/groups_controller_test.rb
+- test/unit/behaviors/searching_test.rb
 - test/unit/behaviors/attaching_test.rb
 - test/unit/behaviors/dynamic_attributes_test.rb
-- test/unit/behaviors/publishable_test.rb
-- test/unit/behaviors/searching_test.rb
 - test/unit/behaviors/taggable_test.rb
-- test/unit/extensions/active_record/base_test.rb
+- test/unit/behaviors/publishable_test.rb
 - test/unit/extensions/hash_test.rb
 - test/unit/extensions/integer_test.rb
-- test/unit/helpers/application_helper_test.rb
-- test/unit/helpers/form_builder_test.rb
-- test/unit/helpers/menu_helper_test.rb
-- test/unit/helpers/page_helper_test.rb
-- test/unit/helpers/path_helper_test.rb
-- test/unit/lib/acts_as_content_page_test.rb
-- test/unit/lib/cms/authentication/controller_test.rb
-- test/unit/lib/cms_domain_support_test.rb
-- test/unit/lib/command_line_test.rb
-- test/unit/lib/content_block_test.rb
-- test/unit/lib/content_rendering_support_test.rb
-- test/unit/lib/generators_test.rb
-- test/unit/lib/routes_test.rb
+- test/unit/extensions/active_record/base_test.rb
+- test/unit/models/page_test.rb
+- test/unit/models/email_page_portlet_test.rb
 - test/unit/models/attachment_test.rb
-- test/unit/models/category_test.rb
-- test/unit/models/category_type_test.rb
 - test/unit/models/connector_test.rb
-- test/unit/models/content_type_test.rb
-- test/unit/models/email_page_portlet_test.rb
-- test/unit/models/file_block_test.rb
-- test/unit/models/group_test.rb
 - test/unit/models/html_block_test.rb
-- test/unit/models/link_test.rb
-- test/unit/models/page_partial_test.rb
-- test/unit/models/page_route_test.rb
-- test/unit/models/page_template_test.rb
-- test/unit/models/page_test.rb
-- test/unit/models/permission_test.rb
 - test/unit/models/portlet_test.rb
 - test/unit/models/section_node_test.rb
-- test/unit/models/sections_test.rb
+- test/unit/models/content_type_test.rb
+- test/unit/models/group_test.rb
+- test/unit/models/page_template_test.rb
 - test/unit/models/site_test.rb
+- test/unit/models/permission_test.rb
+- test/unit/models/link_test.rb
 - test/unit/models/task_test.rb
+- test/unit/models/page_partial_test.rb
 - test/unit/models/user_test.rb
+- test/unit/models/file_block_test.rb
+- test/unit/models/category_type_test.rb
+- test/unit/models/page_route_test.rb
+- test/unit/models/sections_test.rb
+- test/unit/models/category_test.rb
 - test/unit/schema_statements_test.rb
+- test/unit/lib/acts_as_content_page_test.rb
+- test/unit/lib/generators_test.rb
+- test/unit/lib/routes_test.rb
+- test/unit/lib/cms_domain_support_test.rb
+- test/unit/lib/cms/authentication/controller_test.rb
+- test/unit/lib/content_rendering_support_test.rb
+- test/unit/lib/command_line_test.rb
+- test/unit/lib/content_block_test.rb
+- test/unit/helpers/menu_helper_test.rb
+- test/unit/helpers/application_helper_test.rb
+- test/unit/helpers/page_helper_test.rb
+- test/unit/helpers/form_builder_test.rb
+- test/unit/helpers/path_helper_test.rb
+- test/custom_assertions.rb
+- test/test_logging.rb
+- test/factories.rb
+- test/test_helper.rb