radiant-drag_order-extension 0.3.9 → 0.4.0.beta.2

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.4.0.beta.2

data/app/views/admin/pages/_handle.html.haml

@@ -0,0 +1,2 @@
+%span.handle{:style => "left: #{level * -25}px"}
+  = level > 0 ? order_dragger : ""

data/app/views/admin/pages/_node.html.haml

@@ -0,0 +1,26 @@
+%li.node.page{:class =>"level_#{level}#{children_class}#{virtual_class}", :id => "page_#{page.id}", :'data-page_id' => page.id, :'data-level' => level}
+  .attributes
+    - render_region :node, :locals => {:page => page, :level => level, :simple => simple} do |node|
+      - node.title_column do
+        %span.attribute.title
+          %span.w1
+            - if simple
+              = icon
+              = node_title
+            - else
+              = expander(level) + link_to("#{icon} #{node_title}", edit_admin_page_url(page), :title => page.url)
+              = page_type
+              = spinner
+      - node.status_column do
+        - unless simple
+          %span.attribute.status{:class => "#{page.status.name.downcase}_status", :title => "#{timestamp(page.published_at) if page.published_at}"}= t(page.status.name.downcase)
+      - node.add_child_column do
+        - unless simple
+          %span.attribute.add_child= link_to t('add_child'), new_admin_page_child_url(page)
+      - node.remove_column do
+        - unless simple
+          %span.attribute.remove= link_to t('remove'), remove_admin_page_url(page)
+
+  %ol.children{:id => "#{level == 0 ? 'pages' : "page_#{page.id}_pages"}"}
+    - page.children.each do |child|
+      = render_node child, :level => level + 1, :simple => simple

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

@@ -0,0 +1,20 @@
+- @javascripts << 'admin/dragdrop.js'
+- @javascripts << 'admin/sortable_tree.js'
+- @javascripts << 'admin/extensions/drag_order/drag_order.js'
+- @stylesheets << 'admin/extensions/drag_order/drag_order.css'
+
+- @page_title = t('pages') + ' - ' + default_page_title
+
+.outset
+  = render_region :top
+  %ol#site_map.index{:summary=>"Page hierarchy of the current site"}
+    - if @homepage
+      = render_node @homepage
+    - else
+      %li.empty= t('no_pages')
+  = render_region :bottom
+
+- unless @homepage
+  #actions
+    %ul
+      %li= link_to image('plus') + " " + t("new_homepage"), new_admin_page_path

data/config/routes.rb

@@ -1,7 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
 
-  map.with_options :controller => 'admin/pages' do |page|
-    page.admin_pages_move_to "admin/pages/:id/move_to/:rel/:pos/:copy", :action => "move_to"
+  map.namespace :admin do |admin|
+    admin.resources :pages, :collection => { :sort => :put }
   end
       
 end

data/drag_order_extension.rb

@@ -8,9 +8,7 @@ class DragOrderExtension < Radiant::Extension
     StandardTags.send :include, DragOrder::Tags::Core
     Admin::PagesController.send :include, DragOrder::Controllers::Admin::PagesController
     
-    admin.pages.index.add :sitemap_head, "drag_order_header", :before => "title_column_header"
-    admin.pages.index.add :node,         "drag_order",        :before => "title_column"
-    admin.pages.index.add :top,          "top"
+    admin.pages.index.add :node,  "handle", :before => "title_column"
   end
   
 end

data/lib/drag_order/controllers/admin/pages_controller.rb

@@ -8,141 +8,30 @@ module DragOrder
             
             helper_method :order_dragger
             
-            def move_to
-              @page = Page.find(params[:id])
-              @old_parent = @page.parent
-              @current_position = params[:pos].to_i
-              
-              ensure_no_nil_position_values
-              
-              remove_page_from_old_position unless copying?
-              
-              @target = Page.find(params[:rel])
-              
-              make_room_for_page if @current_position != 2
-              
-              if copying?
-                @orig_parts = @page.parts
-                @page = @page.clone
-              end
-              
-              @target.reload
-              
-              put_page
-              
-              solve_slug_conflicts if copying? || new_parent_different?
-              
-              @page.save!
-              
-              create_copy_of_parts if copying?
-              
-              clear_cache
-              redirect_back_or_to_admin_pages_page
-            end
-          
-          private
-            def order_dragger
-              %{<img src="/images/admin/extensions/drag_order/handle.png" alt ="Drag this icon to move the page" />}
-            end
-            
-            def copying?
-              params[:copy].to_i > 0
-            end
-            
-            def ensure_no_nil_position_values
-              if @page.newly_created_siblings?
-                i = 1
-                @page.siblings_and_self.each do |p|
-                  p.position = i
-                  p.save
-                  i += 1
+            def sort
+              begin
+                parent = Page.find(params[:parent_id])
+                params[:children].split(',').each_with_index do |child,index|
+                  Page.find(child).update_attributes!(
+                    :position  => index,
+                    :parent_id => params[:parent_id]
+                  )
                 end
-                @page.reload
-              end
-            end
-            
-            def remove_page_from_old_position
-              @page.following_siblings.each do |sibling|
-                sibling.position -= 1
-                sibling.save!
-              end
-            end
-            
-            def put_page
-              if @current_position != 2
-                @page.parent = @target.parent
-                @page.position = @target.position.to_i + (@current_position == 1 ? 1 : -1)
-              else
-                @page.parent = @target
-                @page.position = 1
-              end
-            end
-            
-            def make_room_for_page
-              new_siblings = Page.children_of_after_position(@target.parent_id, @target.position + @current_position)
-              new_siblings.each do |sibling|
-                if sibling != @page || copying?
-                  sibling.position += 1
-                  sibling.save!
+                
+                respond_to do |format|
+                  format.js { render :text => 'Pages successfully sorted.' }
                 end
-              end
-            end
-            
-            def new_parent_different?
-              # @page.parent.changed? always gives false...
-              @page.parent != @old_parent
-            end
-            
-            def solve_slug_conflicts
-              check_slug = @page.slug.sub(/-copy-?[0-9]*$/, "")
-              count = 0
-              parent_id = @current_position == 2 ? @target.id : @target.parent.id
-              duplicates = Page.children_of_with_slug_like(parent_id, check_slug )
-              duplicates.each do |d|
-                m = d.slug.match("^#{check_slug}(-copy-?([0-9]*))?$")
-                if !m.nil?
-                  if !(m[2].nil? || m[2] == "")
-                    nc = m[2].to_i + 1
-                  elsif m[1]
-                    nc = 2
-                  else
-                    nc = 1
-                  end
-                  count = nc if nc > count
+              rescue Exception => e # Without this resource controller will exception when it looks for Page.find('sort.js')
+                respond_to do |format|
+                  format.js { render :text => 'Could not sort Pages.', :status => :unprocessable_entity }
                 end
               end
-              if count > 0
-                # Remove old copy counters
-                re = / - COPY ?[0-9]*$/
-                @page.title.sub! re, ""
-                @page.breadcrumb.sub! re, ""
-                # Add new copy counters
-                @page.slug = check_slug + "-copy" + (count > 1 ? "-" + count.to_s : "")
-                @page.title += " - COPY" + (count > 1 ? " " + count.to_s : "")
-                @page.breadcrumb += " - COPY" + (count > 1 ? " " + count.to_s : "")
-              end
             end
             
-            def create_copy_of_parts
-              @orig_parts.each do |op|
-                @page.parts.create({
-                  :name => op.name,
-                  :filter_id => op.filter_id,
-                  :content => op.content
-                })
-              end
-            end
-            
-            def redirect_back_or_to_admin_pages_page
-              redirect_to(:back) rescue redirect_to(admin_page_url)
-            end
+            private
             
-            def clear_cache
-              if defined? ResponseCache == 'constant'
-                ResponseCache.instance.clear
-              else
-                Radiant::Cache.clear
-              end
+            def order_dragger
+              %{<img src="/images/admin/extensions/drag_order/handle.png" alt ="Drag this icon to move the page" />}
             end
             
           end

data/lib/drag_order/models/page.rb

@@ -13,30 +13,6 @@ module DragOrder
           
           self.reflections[:children].options[:order] = "position ASC"
           
-          class << self
-            
-            def children_of_after_position(parent, position)
-              find_all_by_parent_id(parent, :conditions => [ 'position >= ?', position ])
-            end
-            
-            def children_of_with_slug_like(parent, slug)
-              find_all_by_parent_id(parent, :conditions => [ 'slug LIKE ?', slug ])
-            end
-            
-          end
-            
-          def newly_created_siblings?
-            self.class.find_all_by_parent_id(parent_id, :conditions => ["position is null"] ).size > 0
-          end
-          
-          def siblings_and_self
-            self.class.find_all_by_parent_id(parent_id, :order => ["position ASC"] )
-          end
-          
-          def following_siblings
-            self.class.find_all_by_parent_id(parent_id, :conditions => [ 'position > ?', position ] )
-          end
-          
         private
           def set_initial_position
             self.position ||= begin

data/public/javascripts/admin/extensions/drag_order/drag_order.js

@@ -1,192 +1,63 @@
-var DragOrder = Class.create({
-  
-  // Constants
-  BEFORE    : 0,
-  AFTER     : 1,
-  CHILD     : 2,
-  CHILD_PAD : 21,
-  NO_COPY   : 0,
-  COPY      : 1,
-  
-  // Defaults
-  origRow   : null,
-  expandObj : null,
-  rowHeight : 0,
-  dragLine  : null,
-  moveTo    : null,
-  
-  initialize: function(table) {
-    // Needed in order to use SiteMap function. Already created in sitemap.js,
-    // but cannot be referred to...
-    this.sMap = SiteMapBehavior.attach(new Element('table'));
-    
-    // Attach listeners to drag images in table
-    var _this = this;
-    Event.observe( $(table), 'mousedown', function(evt){
-      if ($(evt.target.parentNode).hasClassName('drag_order') && evt.target.tagName.toLowerCase() == 'img')
-        _this.rowDragStart(evt);
-    }.bindAsEventListener(this) );
-    document.dragOrderObj = this;
-  },
+document.observe("dom:loaded", function() {
+  drag_order_index = new DragOrderIndex();
+  drag_order_index.initialize();
+})
+
+var DragOrderIndex = Class.create({
   
-  rowDragStart: function(evt) {
-    // Store original row, give it a color, store the height of the row and initialise some objects
-    this.origRow = evt.findElement('tr');
-    this.origRow.addClassName('dragging');
-    this.rowHeight = this.origRow.getHeight();
-    this.moveTo = new Object();
-    this.expandObj = new Object();
-    this.childEdge = $(evt.target).cumulativeOffset().left + $(evt.target).getWidth();
-    
-    // Attach event listeners for the movement
-    this.moveBind = this.rowDragMove.bindAsEventListener(this);
-    Event.observe($(document.body), 'mousemove', this.moveBind);
-    this.stopBind = this.rowDragStop.bindAsEventListener(this);
-    Event.observe($(document.body), 'mouseup', this.stopBind);
-    
-    return this.cancelEvent(evt);
+  initialize: function() {
+    this.sortPages();
   },
   
-  rowDragMove: function(evt) {
-    // If no origRow is available, we've come here by mistake
-    if (!this.origRow) return false;
-    
-    // Create dragline
-    if (!this.dragLine) {
-      this.dragLine = new Element('div');
-      this.dragLine.id = 'drag_line';
-      this.dragLine.setStyle({
-        position: 'absolute'
-      });
-      this.dragLine.innerHTML = "line";
-      dragLineCircle = new Element('div');
-      this.dragLine.appendChild(dragLineCircle);
-      document.body.appendChild(this.dragLine);
-    }
-    else
-      this.dragLine.show();
-    
-    // If children are visible, hide them first
-    if (this.sMap.isExpanded(this.origRow))
-      this.sMap.hideBranch(this.origRow, this.origRow.getElementsByClassName('expander')[0] );
-    
-    // Loop through all rows
-    var _this = document.dragOrderObj;
-    var top;
-    this.origRow.parentNode.getElementsBySelector('tr').find(function(obj){
-      top = obj.cumulativeOffset().top;
-      
-      // Check if cursor is over row
-      if (evt.pageY >= top && evt.pageY <= top + _this.rowHeight) {
-        
-        // If row has children and is collapsed, create timer for expansion
-        if (obj.hasClassName('children_hidden') && _this.expandObj != obj) {
-          _this.expandObj.row = obj;
-          if (_this.expandObj.timer)
-            clearTimeout(_this.expandObj.timer);
-          _this.expandObj.timer = setTimeout("document.dragOrderObj.rowDragExpand();", 750);
-        }
-        else if (_this.expandObj != obj) {
-          _this.expandObj.row = null;
-          clearTimeout(_this.expandObj.timer);
-        }
-        
-        var targetRow = null;
-        var targetLoc;
-        // If on the upper half of the row, put the dragline at the top of the row (= bottom of previous)
-        if (evt.pageY >= top && evt.pageY <= top + _this.rowHeight / 2 && obj.previous()) {
-          if (obj.previous().hasClassName('children_visible')) {
-            targetRow = obj;
-            targetLoc = _this.BEFORE;
-          }
-          else {
-            targetRow = _this.sMap.extractLevel(obj.previous()) > _this.sMap.extractLevel(obj) ? obj : obj.previous();
-            targetLoc = _this.sMap.extractLevel(obj.previous()) > _this.sMap.extractLevel(obj) ? _this.BEFORE : _this.AFTER;
-          }
-        }
-        // If on the lower half of the row, put the line at the bottom of the row
-        else if (evt.pageY > top + _this.rowHeight / 2 && evt.pageY <= top + _this.rowHeight) {
-          // Check for moving as new child
-          if (obj != _this.origRow && !_this.sMap.hasChildren(obj) && evt.pageX > _this.childEdge) {
-            targetRow = obj;
-            targetLoc = _this.CHILD;
-          }
-          else {
-            targetRow = obj.hasClassName('children_visible') ? obj.next() : obj;
-            targetLoc = obj.hasClassName('children_visible') ? _this.BEFORE : _this.AFTER;
-          }
+  sortPages: function() {
+    var tree = new SortableTree('pages', {
+      draggable: {
+        handle: 'handle',
+        ghosting: false,
+        constraint:  false,
+        onDrag: function(drag, event) {
+          drag.element.addClassName('drag_move');          
+        },
+        onEnd: function(drag, event) {
+          drag.element.removeClassName('drag_move');
         }
+      },
+      onDrop: function(drag, drop, event){
+        var parent = drag.element.up('.page')
+        var children  = '';
+                
+        this.moveHandles(drag.element);
         
-        // Check for copy action
-        var copy = evt.ctrlKey || evt.metaKey ? true : false;
-        if (copy)
-          _this.dragLine.getElementsByTagName('div')[0].addClassName('copy');
-        else
-          _this.dragLine.getElementsByTagName('div')[0].removeClassName('copy');
-      }
-      
-      // If a row has been found
-      if (targetRow) {
-        // Set the dragline
-        var padding = parseInt(targetRow.firstDescendant().getStyle('padding-left')) + 30;
-        _this.dragLine.style.width = targetRow.getWidth() - padding - (targetLoc == _this.CHILD ? _this.CHILD_PAD : 0) + 'px';
-        _this.dragLine.setStyle({
-          left: targetRow.cumulativeOffset().left + padding + (targetLoc == _this.CHILD ? _this.CHILD_PAD : 0) + 'px',
-          top: targetRow.cumulativeOffset().top + (targetLoc == _this.AFTER  || targetLoc == _this.CHILD ? _this.rowHeight : 0) - 1 + 'px'
+        parent.down('.children').immediateDescendants().each(function(page) {
+          children += page.readAttribute('data-page_id') + ','
         });
+        children = children.slice(0,-1);
         
-        // Store the found row and options
-        _this.moveTo.hovering = obj;
-        _this.moveTo.relativeTo = targetRow;
-        _this.moveTo.side = targetLoc;
-        _this.moveTo.copy = copy;
+        new Ajax.Request('/admin/pages/sort.js', {
+          method: 'put',
+          parameters: {
+            'parent_id': parent.readAttribute('data-page_id'),
+            'children' : children
+          }
+        })
         
-        return true;
-      }
-      
+      }.bind(this)
     });
-    
-    return this.cancelEvent(evt);
-  },
-  
-  rowDragExpand: function(row) {
-    row = this.expandObj.row;
-    this.sMap.showBranch(row, row.getElementsByClassName('expander')[0] );
-  },
-  
-  rowDragStop: function() {
-    
-    if (this.moveTo.relativeTo && (this.moveTo.hovering != this.origRow || this.moveTo.copy))
-      window.location.href = "/admin/pages/" + this.sMap.extractPageId(this.origRow) + "/move_to/" + this.sMap.extractPageId(this.moveTo.relativeTo) + "/" + this.moveTo.side + "/" + (this.moveTo.copy ? this.COPY : this.NO_COPY);
-    else {  
-      // Cleanup not necessary when redirected
-      this.origRow.removeClassName('dragging');
-      
-      this.origRow = null;
-      if (this.expandObj.timer) clearTimeout(this.expandObj.timer);
-      this.expandObj = null;
-      if (this.dragLine) this.dragLine.hide();
-    }  
-      
-    Event.stopObserving(document.body, 'mousemove', this.moveBind);
-    Event.stopObserving(document.body, 'mouseup', this.stopBind);
+    tree.setSortable();
   },
   
-  cancelEvent: function(evt) {
-    // Cancel default event actions
-    evt.returnValue = false;
-    evt.cancel = true;
-    if (evt.preventDefault) evt.preventDefault();
-    return false;
+  moveHandles: function(page) {
+    var level = parseInt(page.up('.page').getAttribute('data-level'))
+    level += 1;
+    page.setAttribute('data-level', level)
+    page.down('.handle').setStyle({ left: (level * -25) + 'px' })
+    
+    page.select('.children').each(function(container) {
+      level += 1
+      container.select('.page').each(function(child) {
+        child.setAttribute('data-level', level)
+        child.down('.handle').setStyle({ left: (level * -25) + 'px' })
+      });
+    });
   }
-  
-});
-
-// If the DOM is loaded, create the DragOrder object
-document.observe('dom:loaded', function() {
-  $$('table.index').each(function(table){
-    if(table.identify() == 'pages' || table.identify() == 'site_map') {
-      new DragOrder(table);
-    }
-  });
-});
+})

data/public/javascripts/admin/sitemap.js

@@ -0,0 +1,111 @@
+/*
+ *  sitemap.js
+ *  
+ *  depends on: prototype.js and lowpro.js
+ *  
+ *  Used by Radiant to create the expandable sitemap.
+ *  
+ *  To use, simply add the following lines to application.js:
+ *  
+ *     Event.addBehavior({
+ *       'table#site_map': SiteMapBehavior()
+ *     });
+ *
+ */
+
+var SiteMapBehavior = Behavior.create({
+  initialize: function() {
+    this.readExpandedCookie();
+  },
+  
+  onclick: function(event) {
+    if (this.isExpander(event.target)) {
+      var row = event.findElement('li');
+      if (this.hasChildren(row)) {
+        this.toggleBranch(row, event.target);
+      }
+    }
+  },
+  
+  hasChildren: function(row) {
+    return !row.hasClassName('no_children');
+  },
+  
+  isExpander: function(element) {
+    return element.match('img.expander');
+  },
+  
+  isExpanded: function(row) {
+    return row.hasClassName('children_visible');
+  },
+  
+  isRow: function(element) {
+    return element && element.tagName && element.match('li');
+  },
+  
+  extractPageId: function(row) {
+    return row.readAttribute('data-page_id').toInteger();
+  },
+  
+  getExpanderImageForRow: function(row) {
+    return row.down('img');
+  },
+  
+  readExpandedCookie: function() {
+    var matches = document.cookie.match(/expanded_rows=(.+?)(;|$)/);
+    this.expandedRows = matches ? decodeURIComponent(matches[1]).split(',') : [];
+  },
+
+  saveExpandedCookie: function() {
+    document.cookie = "expanded_rows=" + encodeURIComponent(this.expandedRows.uniq().join(",")) + "; path=/admin";
+  }, 
+
+  persistCollapsed: function(row) {
+    var pageId = this.extractPageId(row);
+    this.expandedRows = this.expandedRows.without(pageId);
+    this.saveExpandedCookie();
+  },
+
+  persistExpanded: function(row) {
+    var pageId = this.extractPageId(row);
+    this.expandedRows.push(pageId);
+    this.saveExpandedCookie();
+  },
+
+  toggleExpanded: function(row, img) {
+    if (!img) img = this.getExpanderImageForRow(row);
+    if (this.isExpanded(row)) {
+      img.src = img.src.replace('collapse', 'expand');
+      row.removeClassName('children_visible');
+      row.addClassName('children_hidden');
+      this.persistCollapsed(row);
+    } else {
+      img.src = img.src.replace('expand', 'collapse');
+      row.removeClassName('children_hidden');
+      row.addClassName('children_visible');
+      this.persistExpanded(row);
+    }
+  },
+  
+  hideBranch: function(parent, img) {
+    this.toggleExpanded(parent, img);
+  },
+  
+  showBranch: function(parent, img) {
+    this.toggleExpanded(parent, img);
+  },
+  
+  toggleBranch: function(row, img) {
+    if (!this.updating) {
+      if (this.isExpanded(row)) {
+        this.hideBranch(row, img);
+      } else {
+        this.showBranch(row, img);
+      }
+    }
+  }
+});
+
+Event.addBehavior({
+  '#site_map': SiteMapBehavior()
+})

data/public/javascripts/admin/sortable_tree.js

@@ -0,0 +1,223 @@
+var SortableTree = Class.create({
+  initialize: function(element, options) {
+    this.element = $(element);
+    this.root = new SortableTree.Node(this, null, element, options);
+		this.isSortable = false;
+  },
+  
+  toggleSortable: function() {
+    this.isSortable ? this.setUnsortable() : this.setSortable();
+  },
+  
+  setSortable: function() {
+    Element.addClassName(this.root.element, 'sortable');
+		this.root.setSortable();
+		this.isSortable = true;
+  },
+
+	setUnsortable: function() {
+    Element.removeClassName(this.root.element, 'sortable');
+		this.root.setUnsortable();
+		this.isSortable = false;
+	},
+  
+  find: function(element) {
+    return this.root.find($(element));
+  },
+
+	unmark_all: function() {
+    this.root.unmark();
+	}
+});
+
+SortableTree.Node = Class.create({
+  initialize: function(tree, parent, element, options) {
+    this.tree = tree;
+    this.parent = parent;
+    this.element = $(element);
+
+    this.options = Object.extend({
+      tagName: 'LI',
+      containerTagName: 'OL',
+			droppable: {},
+			draggable: {}
+    }, options || {});
+
+    this.droppable_options = Object.extend({
+      onHover:      function(drag, drop, overlap){ this.onHover(drag, drop, overlap); }.bind(this),
+      onDrop:       function(drag, drop, event){ this.onDrop(drag, drop, event); }.bind(this), 
+      overlap:      'vertical',
+      hoverclass:   'drop_hover'
+    }, options.droppable);
+
+    this.draggable_options = Object.extend({
+      ghosting: true,
+      revert: true,
+      constraint:  'vertical',
+      reverteffect: function(element, top_offset, left_offset) {
+		    element.setStyle({left: '0px', top:  '0px'});
+				// would be so cool to be able to use this. but it leaves a backgroundColor
+				// style property on the element which overwrites the class' value
+				// (i.e. the drop marker) and apperently can't be removed anymore (?)
+				// new Effect.Highlight(element, { startcolor: '#FFFF99' })
+      }
+    }, options.draggable);
+
+    this.initChildren();
+  },
+  
+  id: function() {
+    if (!this._id) {
+      var match = this.element.id.match(/^[\w]+_([\d]*)$/);
+      this._id = encodeURIComponent(match ? match[1] : null);
+    }
+    return this._id;
+  },
+  
+  previousSibling: function() {
+    var pos = this.parent.children.indexOf(this);
+    return pos > 0 ? this.parent.children[pos - 1] : null;
+  },
+  
+  initChildren: function() {
+    this.children = [];  
+    var container = this.findContainer(this.element);
+    if(container){
+      $A(container.childNodes).each(function(child) {
+        if(this.acceptTagName(child)) {
+          this.children.push(new SortableTree.Node(this.tree, this, child, this.options));
+        }
+      }.bind(this));
+    }
+  },
+
+  acceptTagName: function(element) {
+    return element.tagName && element.tagName.toUpperCase() == this.options.tagName;
+  },
+
+  setSortable: function() {
+    Droppables.add(this.element, this.droppable_options);
+    this.draggable = new Draggable(this.element, this.draggable_options);
+    this.children.each(function(child) { child.setSortable(); });
+  },
+
+  setUnsortable: function() {
+		Droppables.remove(this.element);
+		this.draggable.destroy();
+    this.children.each(function(child) { child.setUnsortable(); });
+  },
+  
+  find: function(element) {
+    if(element == this.element) return this;
+    for(var i = 0; i < this.children.length; i++) {
+      var node = this.children[i].find(element);
+      if(node) return node; 
+    }
+  },
+
+  findContainer: function(element) {
+    if(element.tagName != this.options.containerTagName) {
+      element = $A(element.childNodes).detect(function(node) { 
+        return node.tagName == this.options.containerTagName;
+      }.bind(this));
+    }
+    return element;
+  },
+
+  findOrCreateContainer: function(element) {
+    var container = this.findContainer(element);
+    if(!container) {
+      container = document.createElement(this.options.containerTagName);
+      element.appendChild(container);
+    }
+    return container;
+  },
+
+  onHover: function(drag, drop, overlap) {		
+		if(this.canContainChildren(drop)) {
+		  this.dropPosition = overlap < 0.15 ? 'bottom' : overlap > 0.85 ? 'top' : 'insert';
+		} else {
+			this.dropPosition = overlap < 0.5 ? 'bottom' : 'top';
+		}
+    this.mark(drop);
+		// $('log').update('hovering: ' + drop.tagName + ': ' + drop.id + "<br />" + 
+		//                 'classes: ' + drop.className + "<br />" + 
+		// 							  'dropPosition: ' + this.dropPosition)
+  },	
+
+	canContainChildren: function(element) {
+		if(this.options.droppable.container) {
+			return element.match(this.options.droppable.container);
+		}
+		return true;
+	},
+
+  onDrop: function(drag, drop, event) {
+    drag = this.tree.find(drag);
+    drop = this.tree.find(drop);
+
+		// i.e. don't do anything if it's a toplevel node and has been dropped on "itself"
+		// another way around this could be to change scriptaculous to affect() a node
+		// when it has been dropped on itself
+		if(drop.parent || this.dropPosition == 'insert') { 
+	    switch(this.dropPosition) {
+	      case 'top':    drop.parent.insertBefore(drag, drop); break;
+	      case 'bottom': drop.parent.insertBefore(drag, drop.nextSibling()); break;
+	      case 'insert': this.insertBefore(drag, this.firstChild()); break;
+	    }
+		}
+
+    if(this.options.onDrop) this.options.onDrop(drag, drop, event);
+    
+    this.tree.unmark_all();
+  },
+
+  mark: function(element, position) {
+		this.tree.unmark_all();
+    Element.addClassName(element, 'drop_' + this.dropPosition);
+  },
+
+  unmark: function() {
+    ['drop_top', 'drop_bottom', 'drop_insert'].each(function(classname){
+      Element.removeClassName(this.element, classname);
+    }.bind(this));
+		this.children.each(function(child) { child.unmark(); });
+  },
+  
+  to_params: function(name) {
+		name = name || this.tree.element.id;
+    var leftNode = this.previousSibling();
+    return name + '[' + this.id() + '][parent_id]=' + this.parent.id() + '&' + 
+           name + '[' + this.id() + '][left_id]=' + (leftNode ? leftNode.id() : ''); // null
+  },
+  
+  firstChild: function() {
+    return this.children.length > 0 ? this.children[0] : null;
+  },
+  
+  previousSibling: function() {
+    var pos = this.parent.children.indexOf(this);
+    return pos > 0 ? this.parent.children[pos - 1] : null;
+  },
+  
+  nextSibling: function() {
+    var pos = this.parent.children.indexOf(this);
+    return pos + 1 < this.parent.children.length ? this.parent.children[pos + 1] : null;    
+  },
+  
+  removeChild: function(node) {
+    this.children.splice(this.children.indexOf(node), 1);
+    node.element.parentNode.removeChild(node.element);
+  },
+  
+  insertBefore: function(node, sibling) {
+		if(node == sibling) return;
+		
+		node.parent.removeChild(node);
+    node.parent = this;
+    var pos = sibling ? this.children.indexOf(sibling) : this.children.length;
+    this.children.splice(pos, 0, node);
+
+    this.findOrCreateContainer(this.element).insertBefore(node.element, sibling ? sibling.element : null);
+  }
+});

data/public/stylesheets/sass/admin/extensions/drag_order/drag_order.sass

@@ -1,40 +1,120 @@
-#content 
-
-  table.index 
+#content
+  
+  #pages
+    padding-left: 7px
   
-    tr.dragging 
-      background-color: #D3ECF4
+  .page
+    position: relative
+    
+    &.drop_hover
+      background-color: #F9F9F9
   
-      td
-        color: #FFFFFF
+    &.drop_insert
+      background-color: #DFEBFF
+      
+    &.drag_move
+      .children
+        opacity: 0.25
+        
+    .attributes
+      width: 100%
+      height: 31px
+      line-height: 31px
+      padding: 4px 0 4px 10px
+      overflow: hidden
+      text-decoration: none
+      padding-left: 5px
+      
+      .handle
+        position: absolute
+        cursor: move
+      
+      .attribute
+        display: block
+        float: left
+        padding-right: 5px
+        
+        &.title
+          padding-left: 20px
+          
+          a
+            text-decoration: none !important
+          
+          .title
+            color: black
+            font-size: 100%
+            font-weight: bold
+            text-decoration: none
+          
+            &:hover
+              color: #0066cc
+              text-decoration: underline
+        
+          .info
+            color: #9eb3bf
+            font-style: italic
+            font-weight: normal
+        
+          &.virtual .page a .title
+            color: #9eb3bf
+        
+          .w1
+            display: block
+          
+            .expander
+              position: absolute
+              left: 0
+              top: 13px
+              padding: 0 3px
+              
+    .add_child, .remove
+      position: absolute
+      top: 3px
+      font-size: 14px      
+      width: 100px
+            
+    .add_child
+      right: 100px    
+      padding-left: 0
+      a
+        color: black
+        text-decoration: none
+        font-size: 80%
+        padding: 0 0 0 20px
+        background: url(/images/admin/plus.png) 4px 0 no-repeat
+    .remove
+      right: 0
+      padding-left: 0
+      a
+        color: black
+        text-decoration: none
+        font-size: 80%
+        padding: 0 0 0 20px
+        background: url(/images/admin/minus.png) 4px 0 no-repeat
+      .disabled
+        color: #ccc
+        font-size: 80%
+        padding: 0 0 0 20px
+        background: url(/images/admin/minus_disabled.png) 4px 0 no-repeat
+    
+    &.children_visible
+      .children
+        li
+          display: block
+    &.children_hidden
+      .children
+        li
+          display: none
+    
+    .children
+      border-top: 1px solid #FAFAFA
+      
+      li
+        margin-left: 25px
+          
 
-.drag_order
+.handle
   width: 24px
 
   img
-    visibility: hidden
     cursor: move
-    
-  &:hover
-    img
-      visibility: visible
-
-
-#drag_line
-  position: relative
-  height: 3px
-  font-size: 0
-  background-color: #800080
-
-  div
-    position: absolute
-    height: 9px
-    width: 9px
-    margin: -3px 0 0 -9px
-    background-image: url('/images/admin/extensions/drag_order/circle.png')
-
-    &.copy
-      height: 20px
-      width: 20px
-      margin: -9px 0 0 -20px
-      background-image: url('/images/admin/extensions/drag_order/copy.png')

data/radiant-drag_order-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-drag_order-extension}
-  s.version = "0.3.9"
+  s.version = "0.4.0.beta.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly"]
-  s.date = %q{2010-11-24}
+  s.date = %q{2010-11-26}
   s.description = %q{Radiant DragOrder allows you to reorder pages funly}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [
@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "app/views/admin/pages/_drag_order.html.haml",
-    "app/views/admin/pages/_drag_order_header.html.haml",
-    "app/views/admin/pages/_top.html.haml",
+    "app/views/admin/pages/_handle.html.haml",
+    "app/views/admin/pages/_node.html.haml",
+    "app/views/admin/pages/index.html.haml",
     "config/routes.rb",
     "db/migrate/01_add_position_to_pages.rb",
     "db/migrate/02_add_default_position.rb",
@@ -31,12 +31,17 @@ Gem::Specification.new do |s|
     "lib/drag_order/tags/core.rb",
     "lib/radiant-drag_order-extension.rb",
     "lib/tasks/drag_order_extension_tasks.rake",
+    "pkg/radiant-drag_order-extension-0.3.9.gem",
     "public/images/admin/extensions/drag_order/circle.png",
     "public/images/admin/extensions/drag_order/copy.png",
     "public/images/admin/extensions/drag_order/handle.png",
     "public/javascripts/admin/extensions/drag_order/drag_order.js",
+    "public/javascripts/admin/sitemap.js",
+    "public/javascripts/admin/sortable_tree.js",
     "public/stylesheets/sass/admin/extensions/drag_order/drag_order.sass",
     "radiant-drag_order-extension.gemspec",
+    "spec/controllers/pages_controller_spec.rb",
+    "spec/datasets/sort_pages.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
@@ -45,6 +50,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Drag Order Extension for Radiant CMS}
   s.test_files = [
+    "spec/controllers/pages_controller_spec.rb",
+    "spec/datasets/sort_pages.rb",
     "spec/spec_helper.rb"
   ]
 

data/spec/controllers/pages_controller_spec.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Admin::PagesController do
+
+  dataset :users, :sort_pages
+  
+  before :each do
+    login_as  :admin
+  end
+  
+  describe '#sort' do
+    before :each do
+      @params = {
+        :parent_id => pages(:one).id,
+        :children  => "#{pages(:four).id},#{pages(:three).id},#{pages(:two).id}"
+      }
+    end
+    
+    context 'parent not sent' do
+      it 'should return an error' do
+        put :sort, :children => @params[:children], :format => 'js'
+
+        response.should_not be_success
+        response.body.should === 'Could not sort Pages.'
+      end
+    end
+    
+    context 'children not sent' do
+      it 'should return an error' do
+        put :sort, :parent_id => @params[:parent_id], :format => 'js'
+
+        response.should_not be_success
+        response.body.should === 'Could not sort Pages.'
+      end
+    end
+    
+    context 'parent and children sent' do
+      it 'should return success' do
+        put :sort, :parent_id => @params[:parent_id], :children => @params[:children], :format => 'js'
+
+        response.should be_success
+        response.body.should === 'Pages successfully sorted.'
+      end
+    end
+    
+  end
+  
+end

data/spec/datasets/sort_pages.rb

@@ -0,0 +1,31 @@
+class SortPagesDataset < Dataset::Base
+  def load
+    # TODO Investigate why inflectors are breaking here
+    create_record :page, :one,
+      :title  => 'One',
+      :slug   => 'one',
+      :breadcrumb => 'one',
+      :position => 1
+    
+    create_record :page, :two,
+      :title  => 'Two',
+      :slug   => 'two',
+      :breadcrumb => 'two',
+      :position => 2,
+      :parent => pages(:one)
+      
+    create_record :page, :three,
+      :title  => 'Three',
+      :slug   => 'three',
+      :breadcrumb => 'three',
+      :position => 3,
+      :parent => pages(:one)
+      
+    create_record :page, :four,
+      :title  => 'Four',
+      :slug   => 'four',
+      :breadcrumb => 'four',
+      :position => 4,
+      :parent => pages(:one)
+  end
+end

data/spec/spec_helper.rb

@@ -11,27 +11,12 @@ unless defined? RADIANT_ROOT
 end
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
-if File.directory?(File.dirname(__FILE__) + "/scenarios")
-  Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios"
-end
+Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
+
 if File.directory?(File.dirname(__FILE__) + "/matchers")
   Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file }
 end
 
 Spec::Runner.configure do |config|
-  # config.use_transactional_fixtures = true
-  # config.use_instantiated_fixtures  = false
-  # config.fixture_path = RAILS_ROOT + '/spec/fixtures'
-
-  # You can declare fixtures for each behaviour like this:
-  #   describe "...." do
-  #     fixtures :table_a, :table_b
-  #
-  # Alternatively, if you prefer to declare them only once, you can
-  # do so here, like so ...
-  #
-  #   config.global_fixtures = :table_a, :table_b
-  #
-  # If you declare global fixtures, be aware that they will be declared
-  # for all of your examples, even those that don't use them.
+  config.mock_with :rr
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-drag_order-extension
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 62196455
+  prerelease: true
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  - beta
+  - 2
+  version: 0.4.0.beta.2
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +08:00
+date: 2010-11-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,9 +48,9 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- app/views/admin/pages/_drag_order.html.haml
-- app/views/admin/pages/_drag_order_header.html.haml
-- app/views/admin/pages/_top.html.haml
+- app/views/admin/pages/_handle.html.haml
+- app/views/admin/pages/_node.html.haml
+- app/views/admin/pages/index.html.haml
 - config/routes.rb
 - db/migrate/01_add_position_to_pages.rb
 - db/migrate/02_add_default_position.rb
@@ -58,12 +60,17 @@ files:
 - lib/drag_order/tags/core.rb
 - lib/radiant-drag_order-extension.rb
 - lib/tasks/drag_order_extension_tasks.rake
+- pkg/radiant-drag_order-extension-0.3.9.gem
 - public/images/admin/extensions/drag_order/circle.png
 - public/images/admin/extensions/drag_order/copy.png
 - public/images/admin/extensions/drag_order/handle.png
 - public/javascripts/admin/extensions/drag_order/drag_order.js
+- public/javascripts/admin/sitemap.js
+- public/javascripts/admin/sortable_tree.js
 - public/stylesheets/sass/admin/extensions/drag_order/drag_order.sass
 - radiant-drag_order-extension.gemspec
+- spec/controllers/pages_controller_spec.rb
+- spec/datasets/sort_pages.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -87,12 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -101,4 +110,6 @@ signing_key:
 specification_version: 3
 summary: Drag Order Extension for Radiant CMS
 test_files: 
+- spec/controllers/pages_controller_spec.rb
+- spec/datasets/sort_pages.rb
 - spec/spec_helper.rb

data/app/views/admin/pages/_drag_order.html.haml

@@ -1,4 +0,0 @@
-- if current_user.send("admin?") || current_user.send("designer?")
-  - unless simple 
-    %td.drag_order
-      = level > 0 ? order_dragger : ""

data/app/views/admin/pages/_drag_order_header.html.haml

@@ -1,2 +0,0 @@
-- if current_user.send("admin?") || current_user.send("designer?")
-  %th.drag_order

data/app/views/admin/pages/_top.html.haml

@@ -1,3 +0,0 @@
-- if current_user.send("admin?") || current_user.send("designer?")
-  - include_stylesheet 'admin/extensions/drag_order/drag_order'
-  - include_javascript 'admin/extensions/drag_order/drag_order'