noodall-ui 0.2.3 → 0.3.0

data/app/controllers/noodall/admin/nodes_controller.rb

@@ -2,15 +2,18 @@ module Noodall
   module Admin
     class NodesController < BaseController
       include Canable::Enforcers
+      include SortableTable::App::Controllers::ApplicationController
+      
       layout 'noodall_admin'
       before_filter :set_title, :enforce_editor_permission
+      sortable_attributes :position, :admin_title, :title, :type, :updated_at
 
       def index
         if params[:node_id].nil?
-          @nodes = Node.roots.paginate(:per_page => 20, :page => params[:page])
+          @nodes = Node.roots.paginate(:per_page => 20, :page => params[:page], :order => sort_order(:default => "ascending") )
         else
           @parent = Node.find(params[:node_id])
-          @nodes = @parent.children.paginate(:per_page => 20, :page => params[:page])
+          @nodes = @parent.children.paginate(:per_page => 20, :page => params[:page], :order => sort_order(:default => "ascending") )
         end
 
         respond_to do |format|

data/app/helpers/noodall/admin/base_helper.rb

@@ -11,4 +11,16 @@ module Noodall::Admin::BaseHelper
       content_tag :li, link_to( title, send(link) )
     end.join.html_safe
   end
+  
+  # Monkey-patch for the thoughtbot/sortabletable headers, adding 'colspan' option
+  def sortable_table_header(opts = {})
+    raise ArgumentError if opts[:name].nil? || opts[:sort].nil?
+    anchor = opts[:anchor].blank? ? "" : "##{opts[:anchor]}"
+    content_tag :th, 
+      link_to(opts[:name], 
+        sortable_url(opts) + anchor, 
+        :title => opts[:title]),
+      :class => sortable_table_header_classes(opts),
+      :colspan => opts[:colspan]
+  end
 end

data/app/views/noodall/admin/nodes/index.html.erb

@@ -24,11 +24,18 @@
  <table border="0" cellspacing="0" cellpadding="0" class="content">
   <thead>
     <tr>
-      <th>Title</th>
-      <th>Type</th>
-      <th colspan="2">Arrange</th>
+      <%= sortable_table_header :name => "Title", :sort => "admin_title", :class => 'sort' %>
+      <%= sortable_table_header :name => "Type", :sort => "_type", :class => 'sort' %>
+      
+      <%# Change 'position' header if we are sorting by position %>
+      <% if(params[:sort] && params[:sort] != "position" || params[:order] == "descending") %>
+        <%= sortable_table_header :name => "Position", :sort => "position", :class => 'sort' %>
+      <% else %>
+        <%= sortable_table_header :name => "Position", :sort => "position", :class => 'sort', :colspan => 2 %>
+      <% end %>
+      
       <th width="120">Sub Section</th>
-      <th>Updated</th>
+      <%= sortable_table_header :name => "Updated", :sort => "updated_at", :class => 'sort' %>
       <th width="45">Show</th>
       <th width="45">Published</th>
       <th width="45">Delete</th>
@@ -37,10 +44,19 @@
   <tbody>
 <% @nodes.each do |node| %>
     <tr id="node-<%= node.id %>" class="<%=cycle('odd', 'even')%>">
-      <td class="edit"><%= link_to h(node.title), noodall_admin_node_path(node), :class => 'edit', :title => "Edit #{node.title}" %></td>
+      <td class="edit"><%= link_to h(node.admin_title), noodall_admin_node_path(node), :class => 'edit', :title => "Edit #{node.title}" %></td>
       <td><%= node.class.name.titleize %></td>
-      <td width="25"><%= link_to 'up', move_up_noodall_admin_node_path(node), { :class => "page_up", :title => 'Move this content higher in the navigation' } unless node.first? %></td>
-      <td width="30" class="down"><%= link_to 'down', move_down_noodall_admin_node_path(node), { :class => 'page_down', :title => 'Move this content lower in the navigation' } unless node.last? %></td>
+      
+      <%# Change 'position' content if we are sorting by position %>
+      <% if(params[:sort] && params[:sort] != "position" || params[:order] == "descending") %>
+        <td width="55"><%= node.position %></td>
+      <% else %>
+        
+        <td width="25"><%= link_to 'up', move_up_noodall_admin_node_path(node), { :class => "page_up", :title => 'Move this content higher in the navigation' } unless node.first? %></td>
+        <td width="30" class="down"><%= link_to 'down', move_down_noodall_admin_node_path(node), { :class => 'page_down', :title => 'Move this content lower in the navigation' } unless node.last? %></td>
+      <% end %>
+      
+      
       <td class="child">
 <% unless node.class.template_classes.blank? -%>
         <%= link_to pluralize(node.children.size, "Child"), noodall_admin_node_nodes_path(node), :title => "View content under #{h(node.title)}", :class => 'child-no' %>
@@ -56,11 +72,18 @@
   </tbody>
   <tfoot>
     <tr>
-      <th>Title</th>
-      <th>Type</th>
-      <th colspan="2">Arrange</th>
-      <th width="100">Sub-Section</th>
-      <th>Updated</th>
+      <%= sortable_table_header :name => "Title", :sort => "admin_title", :class => 'sort' %>
+      <%= sortable_table_header :name => "Type", :sort => "_type", :class => 'sort' %>
+      
+      <%# Change 'position' header if we are sorting by position %>
+      <% if(params[:sort] && params[:sort] != "position" || params[:order] == "descending") %>
+        <%= sortable_table_header :name => "Position", :sort => "position", :class => 'sort' %>
+      <% else %>
+        <%= sortable_table_header :name => "Position", :sort => "position", :class => 'sort', :colspan => 2 %>
+      <% end %>
+      
+      <th width="120">Sub Section</th>
+      <%= sortable_table_header :name => "Updated", :sort => "updated_at", :class => 'sort' %>
       <th width="45">Show</th>
       <th width="45">Published</th>
       <th width="45">Delete</th>

data/demo/views/admin/components/_promo.html.erb

@@ -22,7 +22,9 @@
   </p>
 
   <p>
+    
     <%= f.label :link %><br />
+    <p>Remember to add <em>http://</em> to the beginning of external links (not part of this website).</p>
     <span class="input-wrap">
       <%= f.text_field :link %><br/>
       <span class="link-node">Content</span> |

data/features/sort_nodes_by_column.feature

@@ -0,0 +1,16 @@
+Feature: Sort nodes by column
+  As a website admin
+  In order to peruse nodes more effectively
+  I want to be able to order them by their various column titles
+
+  Scenario Outline: 
+    Given some nodes exist
+    When I am on the content admin page
+    And I follow <Title>
+    Then the nodes should be ordered by <Title>
+    
+    Examples:
+    | Title      |
+    | "Title"    |
+    | "Type"     |
+    | "Updated"  |

data/features/step_definitions/sorting_steps.rb

@@ -0,0 +1,39 @@
+Given /^some nodes exist$/ do 
+  Time.stub!(:now).and_return(Time.parse("01/01/2010 13:37"))
+  f = Factory.build(:node)
+  f.title = "A Header"
+  f.save
+  
+  Time.stub!(:now).and_return(Time.parse("01/01/2010 14:37"))
+  f = Factory.build(:node)
+  f.title = "B Header"
+  f.save
+  
+  Time.stub!(:now).and_return(Time.parse("01/01/2010 15:37"))
+  f = Factory.build(:page_a)
+  f.title = "C Header"
+  f.save
+  
+end
+
+Then /^the nodes should be ordered by "Title"$/ do
+  Then %{I should see in this order: C Header, B Header, A Header}
+end
+
+
+Then /^the nodes should be ordered by "Type"$/ do
+  Then %{I should see in this order: Page A, Noodall/Node, Noodall/Node}
+end
+
+
+Then /^the nodes should be ordered by "Updated"$/ do
+  Then %{I should see in this order: 15:37:00, 14:37:00, 13:37:00 }
+end
+
+Then /^(?:|I )should see in this order(?: within "([^\"]*)")?: (.*)$/ do |selector, text|
+  order = Regexp.new(text.gsub(', ', '.*'), Regexp::MULTILINE)
+
+  with_scope(selector) do
+    raise "Did not find keywords (#{text}) in the requested order!" unless page.body =~ order
+  end
+end

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

data/noodall-ui.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency 'noodall-core', ">= 0.4.3"
+  s.add_dependency 'noodall-core', ">= 0.6.0"
   s.add_dependency 'thoughtbot-sortable_table', "= 0.0.6"
   s.add_dependency 'will_paginate', "~> 3.0.pre2"
   s.add_dependency 'dynamic_form', ">= 0"

data/public/stylesheets/admin/layout.css

@@ -533,6 +533,11 @@ a.child-no {
   overflow:auto;
 }
 
+.component_form_detail p{
+  position: relative;
+}
+
+
 .slot_tag {
   display:block;
   float:right;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +00:00
+date: 2011-03-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 0
-        - 4
-        - 3
-        version: 0.4.3
+        - 6
+        - 0
+        version: 0.6.0
   name: noodall-core
   prerelease: false
   version_requirements: *id001
@@ -207,6 +207,7 @@ files:
 - features/respond_with_correct_format.feature
 - features/search.feature
 - features/sitemap.feature
+- features/sort_nodes_by_column.feature
 - features/step_definitions/asset_steps.rb
 - features/step_definitions/cms_node_steps.rb
 - features/step_definitions/component_steps.rb
@@ -218,6 +219,7 @@ files:
 - features/step_definitions/pubish_content_steps.rb
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sign_in_steps.rb
+- features/step_definitions/sorting_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/cucumber.css
 - features/support/env.rb