beef-pages 0.3.10 → 0.3.11

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/app/controllers/admin/pages_controller.rb

@@ -27,7 +27,7 @@ class Admin::PagesController < Admin::BaseController
 
   def new
 
-    if params[:page_id].nil?
+    if params[:page_id].nil? and not Page.allow_new_roots?
       flash[:notice] = 'Unspecified parent page.'
       redirect_to(admin_pages_url)
     else
@@ -47,13 +47,13 @@ class Admin::PagesController < Admin::BaseController
     respond_to do |format|
       if @page.save
         flash[:notice] = 'Page was successfully created.'
-        format.html {
+        format.html do
           if @page.parent.nil?
             redirect_to(admin_pages_url)
           else
             redirect_to(admin_page_pages_url(@page.parent))
           end
-        }
+        end
         format.xml  { render :xml => @page, :status => :created, :location => @page }
       else
         format.html { render :action => "show" }
@@ -69,13 +69,13 @@ class Admin::PagesController < Admin::BaseController
     respond_to do |format|
       if @page.update_attributes(params[:page])
         flash[:notice] = 'Page was successfully updated.'
-        format.html {
+        format.html do
           if @page.parent.nil?
             redirect_to(admin_pages_url)
           else
             redirect_to(admin_page_pages_url(@page.parent))
           end
-        }
+        end
         format.xml  { head :ok }
       else
         format.html { render :action => "show" }
@@ -93,14 +93,14 @@ class Admin::PagesController < Admin::BaseController
       @page.destroy
 
       respond_to do |format|
-        format.html {
-            flash[:notice] = 'Page was successfully deleted.'
-            if params[:page].nil?
-              redirect_to(admin_pages_url)
-            else
-              redirect_to(admin_page_pages_url(@page.parent))
-            end
-        }
+        format.html do
+          flash[:notice] = 'Page was successfully deleted.'
+          if params[:page].nil?
+            redirect_to(admin_pages_url)
+          else
+            redirect_to(admin_page_pages_url(@page.parent))
+          end
+        end
         format.xml  { head :ok }
       end
     end

data/app/models/page.rb

@@ -1,8 +1,8 @@
 class Page < ActiveRecord::Base
-  default_scope :order => 'position ASC'  
+  default_scope :order => 'position ASC'
   named_scope :top, :conditions => {:parent_id => nil}, :order => :position
   # http://ramblings.gibberishcode.net/archives/one-activerecord-model-acting-as-a-list-and-tree
-  
+
   has_assets
   acts_as_content_node
   acts_as_tree
@@ -14,17 +14,17 @@ class Page < ActiveRecord::Base
 
   validates_presence_of :title
   validates_presence_of :body, :tag_list, :description, :if => :publish
-  
+
   LOCK_LEVEL_DELETE = 1
   LOCK_LEVEL_PERMALINK = 2
   LOCK_LEVEL_TEMPLATE = 3
   LOCK_LEVEL_SUBPAGE = 4
-  LOCK_LEVEL_TITLE = 5  
-  
+  LOCK_LEVEL_TITLE = 5
+
   def first_child?
     self == self.self_and_siblings.first
   end
-  
+
   def last_child?
     self == self.self_and_siblings.last
   end
@@ -36,15 +36,15 @@ class Page < ActiveRecord::Base
   def reindex_children(recurse = true, departing_child = nil)
     Page.reindex_pages(children, recurse, departing_child)
   end
-  
+
   def root?
     parent_id.nil?
   end
-  
+
   def featured?
     !features.empty?
   end
-  
+
   def lock_level
     read_attribute(:lock_level) || 0
   end
@@ -56,6 +56,12 @@ class Page < ActiveRecord::Base
     end
   end
 
+  # Flag if creation of new root pages id allowed
+  cattr_accessor :allow_new_roots
+  def self.allow_new_roots?
+    allow_new_roots == true
+  end
+
   private
 
   def set_url
@@ -63,8 +69,8 @@ class Page < ActiveRecord::Base
   end
 
   # takes a given array of pages and recursively (or not) reindexes
-  # if departing_child is supplied, it is removed from the array so 
-  # that former siblings are reindexed as though it was already 
+  # if departing_child is supplied, it is removed from the array so
+  # that former siblings are reindexed as though it was already
   # removed from the collection.
   def self.reindex_pages(pages, recurse, departing_child)
     pages.select{|r| r != departing_child}.each_with_index do |page, index|
@@ -74,7 +80,7 @@ class Page < ActiveRecord::Base
     true
   end
 
-  # When the parent id of a node changes, the acts_as_list gets lost, so 
+  # When the parent id of a node changes, the acts_as_list gets lost, so
   # we need to reindex the affected nodes to keep things sane
   def keep_position_sane
     return unless self.parent_id_changed?
@@ -90,5 +96,5 @@ class Page < ActiveRecord::Base
     last_page = (self.parent_id.nil? ? Page.top.last : Page.find(self.parent_id).children.last)
     self.position = (last_page.nil? ? 1 : last_page.position + 1)
     true
-  end 
+  end
 end

data/app/views/admin/pages/index.html.erb

@@ -1,15 +1,17 @@
 <h1>Listing pages<%= " under #{@parent.title}" unless @parent.nil? %></h1>
 
 <ul class="choices">
-<% unless @parent.nil? %>
-  <%= "<li>#{link_to 'New page', new_admin_page_page_path(@parent), :class => 'button', :title => "Add a sub-page under #{@parent.title}"}</li>" unless  @parent.lock_level >= Page::LOCK_LEVEL_SUBPAGE %>
-<%   if @parent.parent.nil? %>
+<% if !@parent.nil? and @parent.lock_level < Page::LOCK_LEVEL_SUBPAGE -%>
+  <li><%= link_to 'New page', new_admin_page_page_path(@parent), :class => 'button', :title =>  "Add a sub-page under #{@parent.title}" %></li>
+<% elsif @parent.nil? and Page.allow_new_roots?  %>
+  <li><%= link_to 'New page', new_admin_page_path, :class => 'button', :title => "Add new page" %></li>
+<% end -%>
+<% if !@parent.nil? and @parent.parent.nil? %>
   <li><%= link_to "All top pages", admin_pages_path(), :class => "up button" %></li>
-<%   else %>
+<% elsif !@parent.nil?  %>
   <li><%= link_to "Up to #{@parent.parent.title}", admin_page_pages_path(@parent.parent), :class => "up button" %></li>
-<%   end %>
 <% end %>
-</ul>  
+</ul>
 
 <table class="featurable">
   <thead>

data/app/views/admin/pages/show.html.erb

@@ -26,8 +26,9 @@
   <p>
     <%= f.label :permalink, "URL" %><br/>
     <%= root_url %><%= f.text_field :permalink %>
-    <p>URLs are most efficient if they closely reflect the title or main subject of this content. Changing the permalink will make search engines think it is a different page resulting in a loss of page rank, only change if very necessary. Leave blank to use the title.</p>
   </p>
+  <p>URLs are most efficient if they closely reflect the title or main subject of this content. Changing the permalink will make search engines think it is a different page resulting in a loss of page rank, only change if very necessary. Leave blank to use the title.</p>
+
 <% else %>
   <p>
     <%= f.label :permalink, "URL" %><br/>

data/beef-pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-pages}
-  s.version = "0.3.10"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-01-19}
+  s.date = %q{2010-01-27}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-pages
 version: !ruby/object:Gem::Version 
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 +00:00
+date: 2010-01-27 00:00:00 +00:00
 default_executable: 
 dependencies: []