beef-pages 0.1.7 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/app/controllers/admin/pages_controller.rb

@@ -3,7 +3,12 @@ class Admin::PagesController < Admin::BaseController
   helper_method :get_template_names
 
   def index
-    @pages = Page.top
+    if params[:page_id].nil?
+      @pages = Page.top
+    else
+      @parent = Page.find(params[:page_id])
+      @pages = @parent.children
+    end
   
     respond_to do |format|
       format.html # index.html.erb
@@ -37,7 +42,13 @@ class Admin::PagesController < Admin::BaseController
     respond_to do |format|
       if @page.save
         flash[:notice] = 'Page was successfully created.'
-        format.html { redirect_to(admin_pages_url) }
+        format.html {
+          if params[:page_id].nil?
+            redirect_to(admin_pages_url)
+          else
+            redirect_to(admin_page_pages_url(@page.parent))
+          end
+        }
         format.xml  { render :xml => @page, :status => :created, :location => @page }
       else
         format.html { render :action => "show" }
@@ -53,7 +64,13 @@ class Admin::PagesController < Admin::BaseController
     respond_to do |format|
       if @page.update_attributes(params[:page])
         flash[:notice] = 'Page was successfully updated.'
-        format.html { redirect_to(admin_pages_url) }
+        format.html {
+          if @page.parent.nil?
+            redirect_to(admin_pages_url)
+          else
+            redirect_to(admin_page_pages_url(@page.parent))
+          end
+        }
         format.xml  { head :ok }
       else
         format.html { render :action => "show" }
@@ -67,7 +84,13 @@ class Admin::PagesController < Admin::BaseController
     @page.destroy
   
     respond_to do |format|
-      format.html { redirect_to(admin_pages_url) }
+      format.html {
+          if params[:page].nil?
+            redirect_to(admin_pages_url)
+          else
+            redirect_to(admin_page_pages_url(@page.parent))
+          end
+      }
       format.xml  { head :ok }
     end
   end

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

@@ -1,16 +1,17 @@
-    <tr class="level-<%= level %>" id="pages-<%= page.id %>">
-      <td class="title"><span class="indent"><% level.times{|i| %>-<%} %></span><%= link_to page.title, [:admin, page] %></td>
+    <tr id="pages-<%= page.id %>">
+      <td class="title"><%= link_to page.title, admin_page_page_path(page) %></td>
       <td><%= content_status(page) %></td>
-      <td><%= page.author %></td>
-      <td><%= page.editor %></td>
-      <td class="date"><%= page.created_at.to_formatted_s(:short) %></td>
-      <td class="date"><%= page.updated_at.to_formatted_s(:short) %></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_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' %></td>
+      <td><%= link_to 'Add page', new_admin_page_page_path(page), :class => 'add', :title => "Add a sub-page under #{page.title}" %></td>
       <td><%= link_to 'Edit', [:admin, page], :class => 'edit' %></td>
       <td><%= link_to('Destroy', admin_page_path(page), :confirm => 'Are you sure?', :method => :delete, :class => 'delete') unless page.parent_id.nil? || !current_user.admin? %></td>
-      <% if page.parent %>
-        <td><%= link_to 'up', move_up_admin_page_path(page), { :class => "page_up" } if current_user.admin? && !page.first_child? %><%= link_to 'down', move_down_admin_page_path(page), { :class => 'page_down' } if current_user.admin? && !page.last_child? %></td>
-      <% end %>
+      <td>
+        <%= link_to 'up', move_up_admin_page_path(page), { :class => "page_up" } if current_user.admin? && !page.first? %>
+        <%= link_to 'down', move_down_admin_page_path(page), { :class => 'page_down' } if current_user.admin? && !page.last? %>
+      </td>
     </tr>
-    <%= render :partial => page.children, :locals => { :level => level + 1 } %>
+    <%= render :partial => page.children, :locals => { :level => level + 1 } %>

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

@@ -1,7 +1,19 @@
-<h1>Listing pages</h1>
+<h1>Listing pages<%= " under #{@parent.title}" unless @parent.nil? %></h1>
 
 <ul class="choices">
-  <li><%= link_to 'New page', new_admin_page_path, :class => "button" %></li>
+<% if @parent.nil? %>
+    <li><%= link_to 'New page', new_admin_page_path(), :class => "button", :title => "Add a new root page" %></li>
+<% else %>
+    <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? %>
+      <li><%= link_to "All top pages", admin_pages_path(), :class => "up button" %></li>
+<%   else %>
+      <li><%= link_to "Up to #{@parent.parent.title}", admin_page_pages_path(@parent.parent), :class => "up button" %></li>
+<%   end %>
+
+<% end %>
+
 </ul>  
 
 <%= hidden_field_tag 'form_authenticity_token', "#{form_authenticity_token}" %> 
@@ -12,10 +24,10 @@
       <th>Title</th>
       <th>Status</th>
       <th>Author</th>
-      <th>Updated</th>
+      <th>Updater</th>
       <th>Published At</th>
       <th>Published To</th>
-      <th colspan="4">Actions</th>
+      <th colspan="5">Actions</th>
     </tr>
   </thead>
   <tbody>
@@ -26,10 +38,10 @@
       <th>Title</th>
       <th>Status</th>
       <th>Author</th>
-      <th>Updated</th>
+      <th>Updater</th>
       <th>Published At</th>
       <th>Published To</th>
-      <th colspan="4">Actions</th>
+      <th colspan="5">Actions</th>
     </tr>
   </tfoot>
 </table>

data/config/routes.rb

@@ -3,4 +3,5 @@ ActionController::Routing::Routes.draw do |map|
   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}
   end
+  map.page ':id', :controller => 'pages', :action => 'show'
 end

data/pages.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pages}
-  s.version = "0.1.7"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-08-04}
+  s.date = %q{2009-08-27}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/stengland/pages}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Pages engine}
   s.test_files = [
     "test/pages_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-pages
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -07:00
+date: 2009-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: []