beef-pages 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/app/controllers/admin/pages_controller.rb

@@ -26,9 +26,14 @@ class Admin::PagesController < Admin::BaseController
   end
 
   def new
-    @page = Page.new( :parent_id => params[:page_id] )
-    
-    render :action => 'show'
+
+    if params[:page_id].nil?
+      flash[:notice] = 'Unspecified parent page.'
+      redirect_to(admin_pages_url)
+    else
+      @page = Page.new( :parent_id => params[:page_id] )
+      render :action => 'show'
+    end
   end
 
   def edit
@@ -98,19 +103,6 @@ class Admin::PagesController < Admin::BaseController
   def preview    
     session[:page_preview] = params[:page]
   end
-  
-  def feature
-    @page = Page.find(params[:id])
-    if request.put?
-      if params[:spot] == 'remove'
-        @page.features.delete_all
-      else
-        @page.feature_at! params[:spot]
-      end
-      flash[:notice] = 'Page has been featured'
-      redirect_to admin_pages_path
-    end
-  end
 
   def move_up
     Page.find(params[:id]).move_higher

data/app/controllers/pages_controller.rb

@@ -13,6 +13,7 @@ class PagesController < ApplicationController
   
   def preview
     @page = Page.new(session[:page_preview])
+    @page.id = 0
     session[:page_preview] = nil
     render :template => "pages/templates/#{(@page.template || get_template_names.first)}"
   end

data/app/helpers/pages_helper.rb

@@ -4,4 +4,15 @@ module PagesHelper
     return if pages.empty?
     yield(pages)
   end
+  
+  
+  def sub_pages_list(permalink)
+    page = Page.find_by_permalink(permalink)
+    return if page.nil?
+    page_items = page.children.published.collect do |sub_page|
+      content_tag( :li, link_to( h(sub_page.title), page_path(sub_page.permalink)))
+    end
+    content_tag :ul, page_items.join unless page_items.empty? 
+  end
+
 end

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

@@ -1,9 +1,10 @@
     <tr id="pages-<%= page.id %>">
       <td class="title"><%= link_to page.title, admin_page_pages_path(page) %></td>
+      <td><%= link_to pluralize(page.children.count, "sub page"), admin_page_pages_path(page) %></td>
       <td><%= content_status(page) %></td>
       <td><%= page.author %><br />(<%= page.created_at.to_formatted_s(:short) %>)</td>
       <td><%= page.editor %><%= "<br />(#{page.updated_at.to_formatted_s(:short)})" unless page.updated_at.nil? %></td>
-      <td class="date"><%= page.published_at.to_formatted_s(:short) %></td>
+      <td class="date"><%= page.published_at.to_formatted_s(:short) unless page.published_at.nil? %></td>
       <td class="date"><%= page.published_to.to_formatted_s(:short) unless page.published_to.nil? %></td>
       <td><%= link_to 'Show', page_path(page.permalink), :class => 'show' if page.published? %></td>
       <td><%= link_to 'Add page', new_admin_page_page_path(page), :class => 'add', :title => "Add a sub-page under #{page.title}" %></td>

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

@@ -1,9 +1,7 @@
 <h1>Listing pages<%= " under #{@parent.title}" unless @parent.nil? %></h1>
 
 <ul class="choices">
-<% if @parent.nil? %>
-    <li><%= link_to 'New page', new_admin_page_path(), :class => "button", :title => "Add a new root page" %></li>
-<% else %>
+<% 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>
 
 <%   if @parent.parent.nil? %>
@@ -22,8 +20,9 @@
   <thead>
     <tr>
       <th>Title</th>
+      <th># Sub Pages</th>
       <th>Status</th>
-      <th>Author</th>
+      <th>Author</      th>
       <th>Updater</th>
       <th>Published At</th>
       <th>Published To</th>
@@ -36,6 +35,7 @@
   <tfoot>
     <tr>
       <th>Title</th>
+      <th># Sub Pages</th>
       <th>Status</th>
       <th>Author</th>
       <th>Updater</th>

data/app/views/pages/_naviagtion.html.erb

@@ -1,12 +1,23 @@
 <ul id="nav-secondary">
-<% for sibling in @page.self_and_siblings %>
+
+<li><%= link_to @page.root.title, page_path(@page.root.permalink) %></li><ul>
+
+
+
+<% for sibling in @page.root.children.published %>
   <li<%= ' class="active"' if sibling == @page %>><%= link_to sibling.title, page_path(sibling.permalink) %>
-<%  if sibling == @page && sibling.children.count >0 %>
+<%  if sibling == @page && sibling.children.published.count > 0 %>
       <ul>
-<%    for child in sibling.children %>
+<%    for child in sibling.children.published %>
         <li><%= link_to child.title, page_path(child.permalink) %></li>
 <%    end %>
       </ul>
 <%  end %></li>
 <% end %>
+
+
+
+  </ul>
+
+
 </ul>

data/config/routes.rb

@@ -1,6 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
   map.resources :pages, :only => [:show, :index], :collection => {:preview => :get}
   map.namespace(:admin) do |admin|
-    admin.resources :pages, :has_many => :pages, :collection => {:preview => :post}, :member => {:preview => :put, :feature => [:get, :put], :move_up => :get, :move_down => :get}
+    admin.resources :pages, :has_many => :pages, :collection => {:preview => :post}, :member => {:preview => :put, :move_up => :get, :move_down => :get}
   end
 end

data/pages.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pages}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-01}
+  s.date = %q{2009-09-03}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -24,9 +24,7 @@ Gem::Specification.new do |s|
      "app/helpers/pages_helper.rb",
      "app/models/page.rb",
      "app/views/admin/pages/_page.html.erb",
-     "app/views/admin/pages/feature.html.erb",
      "app/views/admin/pages/index.html.erb",
-     "app/views/admin/pages/preview.rjs",
      "app/views/admin/pages/show.html.erb",
      "app/views/pages/_naviagtion.html.erb",
      "config/routes.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-pages
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,9 +34,7 @@ files:
 - app/helpers/pages_helper.rb
 - app/models/page.rb
 - app/views/admin/pages/_page.html.erb
-- app/views/admin/pages/feature.html.erb
 - app/views/admin/pages/index.html.erb
-- app/views/admin/pages/preview.rjs
 - app/views/admin/pages/show.html.erb
 - app/views/pages/_naviagtion.html.erb
 - config/routes.rb

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

@@ -1,10 +0,0 @@
-<h1>Feature a page</h1>
-
-<% form_for([:feature, :admin, @page]) do %>
-  <p>
-    <%= label_tag :spot, "Please select where to feture the page '#{h(@page.title)}'" %><br/>
-    <%= select_tag :spot, options_for_select({'Home page left' => :home_page_left, 'Home page centre' => :home_page_centre, 'Home page right' => :home_page_right, "Remove from feature" => :remove }) %></p>
-  <p>
-    <%= submit_tag "Feature", :disable_with => 'Featureing...' %> or <%= link_to 'Cancel', admin_pages_path %>
-  </p>
-<% end -%>

data/app/views/admin/pages/preview.rjs

@@ -1 +0,0 @@
-page << "myLightWindow.activateWindow({href: '#{preview_pages_path}', title: 'This is only a preview'});"