Ticket #45: sortable_pages.mental.diff

test/functional/admin/page_controller_test.rb

@@ -219 +219 @@
-    assert_equal pages(:homepage).children, assigns(:children)
-  end
-  
+  def test_reorder__post
+    pages = [pages(:books), pages(:documentation), pages(:textile)]
+    order = pages.map(&:id).join(',')
+    post :reorder, :id => 1, :sort_order => order
+    pages.each(&:reload)
+    assert_equal 0, pages[0].position
+    assert_equal 1, pages[1].position
+    assert_equal 2, pages[2].position
+    assert_redirected_to page_index_url
+  end
+  
-  def test_tag_reference
-    xml_http_request :get, :tag_reference, :class_name => "Page"
-    assert_response :success

app/helpers/admin/page_helper.rb

@@ -27 +27 @@
-    end
-  end
-  
+  def page_icon(page)
+    icon = page.virtual? ? "virtual-page" : "page"
+    image(icon, :class => "icon", :alt => 'page-icon', :title => '', :align => 'center')
+  end
+  
-  def homepage
-    @homepage ||= Page.find_by_parent_id(nil)
-  end

app/models/page.rb

@@ -8 +8 @@
-  before_save :update_published_at, :update_virtual
-  
-  # Associations
-
+position ASC, 
-  has_many :parts, :class_name => 'PagePart', :order => 'id', :dependent => :destroy
-  belongs_to :_layout, :class_name => 'Layout', :foreign_key => 'layout_id'
-  belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by'

app/controllers/admin/page_controller.rb

@@ -60 +60 @@
-    render(:layout => false)
-  end
-
+  def reorder
+    if request.post?
+      sort_order = params[:sort_order].to_s.split(',').map { |i| Integer(i) rescue nil }.compact
+      sort_order.each_with_index do |id, index|
+        Page.update(id, :position => index)
+      end
+      redirect_to page_index_url
+    else
+      @page = Page.find(params[:id])
+      @children = @page.children
+    end
+  end
+
-  def tag_reference
-    @class_name = params[:class_name]
-    @display_name = @class_name.constantize.display_name

app/views/admin/page/reorder.rhtml

@@ +1 @@
+<% content_for :page_css do %>
+.page {
+  font-size: 120%;
+  font-weight: bold;
+  position: relative;
+  padding: 10px;
+  padding-left: 30px;
+  border-top: 1px solid #eaeaea;
+}
+.page .icon {
+  position: absolute;
+  margin-top: -7px;
+  left: 0px;
+}
+ul.pages,
+ul.pages li {
+  list-style: none;
+  margin: 0;
+  padding: 0
+}
+ul.pages {
+  border-bottom: 1px solid #eaeaea;
+}
+ul.pages li {
+  font-size: 105%;
+  font-weight: normal;
+  padding: 10px;
+  padding-left: 52px;
+}
+ul.page .icon,
+ul.pages .icon {
+  position: absolute;
+  margin-top: -7px;
+  left: 22px;
+}
+<% end %>
+
+<h1 id="reorder_pages">Reorder Pages</h1>
+
+<p>Drag and drop pages to reorder. Click <strong>Finished</strong> when you are done.</p> 
+
+<div id="page" class="page">
+  <%= page_icon(@page) %> <%= @page.title %>
+</div>
+
+<ul id="children" class="pages">
+<% for child in @children -%>
+  <li id="item_<%= child.id %>" class="page"><%= page_icon(child) %> <%= child.title %></li>
+<% end -%>
+</ul>
+
+<script type="text/javascript">
+//<![CDATA[
+Sortable.create("children", { onUpdate:function(){ $('sort_order').value = Sortable.sequence('children').join(',') } });
+//]]>
+</script>
+
+<% form_tag do %>
+  <p class="buttons"><%= submit_tag "Finished", :class => 'button' %> or <%= link_to 'Cancel', page_index_url %></p>
+  <div><%= hidden_field_tag "sort_order" %></div>
+<% end %>

app/views/admin/page/_node.rhtml

@@ -5 +5 @@
-padding_left = (level * 22) + 4
-
-children_class = children ? (expanded ? ' children-visible' : ' children-hidden') : ' no-children'
-
+ 
-
-expander = children ? image((expanded ? "collapse" : "expand"), :class => "expander", :alt => 'toggle children', :title => '', :align => 'center') : ""
-
-
-
+
-
-title = %{<span class="title">#{ page.title }</span>}
-
@@ -34 +33 @@
-      </td>
-<% unless simple -%>
-      <td class="status <%= page.status.name.downcase %>-status"><%= page.status.name %></td>
-
+ page
-      <td class="remove"><%= link_to image('remove', :alt => 'remove page'), page_remove_url(:id => page) %></td>
+      <td class="reorder"><%= page.children.empty? ? '' : link_to(image('reorder', :alt => 'reorder children'), page_reorder_children_url(:id => page)) %></td>
-<% end -%>
-    </tr>
-<% level = level + 1 -%>

app/views/admin/page/index.rhtml

@@ -6 +6 @@
-    <tr>
-      <th class="page">Page</th>
-      <th class="status">Status</th>
-2
+3
-    </tr>
-  </thead>
-  <tbody>

db/schema.rb

@@ -2 +2 @@
-# migrations feature of ActiveRecord to incrementally modify your database, and
-# then regenerate this schema definition.
-
-3
+4
-
-  create_table "config", :force => true do |t|
-    t.column "key",   :string, :limit => 40, :default => "", :null => false
@@ -48 +48 @@
-    t.column "created_by",   :integer
-    t.column "updated_by",   :integer
-    t.column "virtual",      :boolean,                 :default => false, :null => false
+    t.column "position",     :integer
-  end
-
-  create_table "snippets", :force => true do |t|

db/migrate/014_add_position_column_to_page.rb

@@ +1 @@
+class AddPositionColumnToPage < ActiveRecord::Migration
+  def self.up
+    add_column "pages", "position", :integer
+  end
+
+  def self.down
+    remove_column "pages", "position"
+  end
+end

config/routes.rb

@@ -2 +2 @@
-
-  # Admin Routes
-  map.with_options(:controller => 'admin/welcome') do |welcome|
-
-
-
-
+     
+     
+     
+     
-  end
-  
-  # Export Routes
-  map.with_options(:controller => 'admin/export') do |export|
-'admin/export',      
-'admin/export/yaml',      
+     'admin/export',
+     'admin/export/yaml',
-  end
-
-  # Page Routes
-  map.with_options(:controller => 'admin/page') do |page|
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  end
-
-  # Layouts Routes
-  map.with_options(:controller => 'admin/layout') do |layout|
-
-
-
-
+     
+     
+     
+     
-  end  
-                       
-  # Snippets Routes
-  map.with_options(:controller => 'admin/snippet') do |snippet|
-
-
-
-
+     
+     
+     
+     
-  end
-                        
-  # Users Routes
-  map.with_options(:controller => 'admin/user') do |user|
-
-
-
-
-
+     
+     
+     
+     
+     
-  end
-  
-  # Extension Routes
-  map.with_options(:controller => 'admin/extension') do |extension|
-'admin/extensions',
-'admin/extensions/update',
+ 'admin/extensions',   
+ 'admin/extensions/update',   
-  end
-  
-  # Site URLs
-  map.with_options(:controller => 'site') do |site|
-
-
-
+     
+     
+     
-
-    # Everything else
-
+     
-  end
-  
-end

public/stylesheets/admin/global.css

@@ -182 +182 @@
-  color: #0c0;
-}
-#content table.index .add-child {
-100
+77
-  padding-left: 0;
-}
-#content table.index .remove {
-100
+69
-  padding-left: 0;
-}
+#content table.index .reorder {
+  width: 70px;
+  padding-left: 0;
+}
-#content table.index .node .layout,
-#content table.index .node .snippet,
-#content table.index .node .user {