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

data/README.md

@@ -1,4 +1,4 @@
-# DragOrder for Radiant 0.9.0+
+# DragOrder for Radiant 0.9.2+
 
 Created by Bright 4, February 2009. Inspired by and based on Sean Cribbs' Reorder extension.
 
@@ -6,7 +6,7 @@ Created by Bright 4, February 2009. Inspired by and based on Sean Cribbs' Reorde
 
 Only designers and admins have the ability to re-order pages
 
-Master should work with Radiant Edge. Use git tag radiant-0.9.1 with the Radiant 0.9.1 gem.
+Is now only compatible with Radiant above 0.9.1 (especially as a gem)
 
 ## Installation
 
@@ -17,6 +17,13 @@ Master should work with Radiant Edge. Use git tag radiant-0.9.1 with the Radiant
 
 ## Version History
 
+### v0.4.2 - 2010-11-27
+
+* Made compatible with edge, otherwise we can't override views
+* Tidied up a lot of internal javascript
+* Overrode some helpers
+* Rewrote more of sitemap.js
+
 ### v0.3.7 - 2010-11-22
 
 * Turned into a gem

data/VERSION

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

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

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

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

@@ -1,26 +1,25 @@
 %li.node.page{:class =>"level_#{level}#{children_class}#{virtual_class}", :id => "page_#{page.id}", :'data-page_id' => page.id, :'data-level' => level}
-  .attributes
+  .attributes{:style => "padding-left: #{padding_left(level)}px"}
     - 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
+        %span.attribute.name
+          - if simple
+            = icon
+            = node_title
+          - else
+            = expander + link_to("#{icon} #{node_title}", edit_admin_page_url(page), :title => page.url)
+            = page_type
       - 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)
+          %span.status{:class => "#{page.status.name.downcase}_status", :title => "#{timestamp(page.published_at) if page.published_at}"}= t(page.status.name.downcase)
+      - node.actions_column do
+        %span.attribute.actions
+          = child_link_for(page)
+          = link_to image('minus') + ' ' + t('remove'), remove_admin_page_url(page), :class => "action"
+          = child_menu_for(page)
 
-  %ol.children{:id => "#{level == 0 ? 'pages' : "page_#{page.id}_pages"}"}
+  %ol.children{:id => "#{level == 0 ? 'parent_pages' : "page_#{page.id}_pages"}"}
     - page.children.each do |child|
-      = render_node child, :level => level + 1, :simple => simple
+      = render_node child, :level => level + 1, :simple => simple
+      
+      

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

@@ -1,13 +1,8 @@
-- @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"}
+  %ol#pages.index{:summary=>"Page hierarchy of the current site"}
     - if @homepage
       = render_node @homepage
     - else

data/drag_order_extension.rb

@@ -7,6 +7,7 @@ class DragOrderExtension < Radiant::Extension
     Page.send :include, DragOrder::Models::Page
     StandardTags.send :include, DragOrder::Tags::Core
     Admin::PagesController.send :include, DragOrder::Controllers::Admin::PagesController
+    Admin::NodeHelper.send :include, DragOrder::Helpers::Admin::NodeHelper
     
     admin.pages.index.add :node,  "handle", :before => "title_column"
   end

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

@@ -6,7 +6,7 @@ module DragOrder
         def self.included(base)
           base.class_eval do
             
-            helper_method :order_dragger
+            before_filter :drag_assets, :only => [:index, :remove]
             
             def sort
               begin
@@ -30,8 +30,11 @@ module DragOrder
             
             private
             
-            def order_dragger
-              %{<img src="/images/admin/extensions/drag_order/handle.png" alt ="Drag this icon to move the page" />}
+            def drag_assets
+              @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'
             end
             
           end

data/lib/drag_order/helpers/admin/node_helper.rb

@@ -0,0 +1,33 @@
+module DragOrder
+  module Helpers
+    module Admin
+      module NodeHelper
+            
+        def self.included(base)
+          base.class_eval do
+            
+            def order_dragger
+              %{<img src="/images/admin/extensions/drag_order/handle.png" alt ="Drag this icon to move the page" />}
+            end
+            
+            def padding_left(level)
+              (level * 23) + 31
+            end
+
+            def expander
+              image((expanded ? "collapse" : "expand"),
+                    :class => "expander #{needs_expanding ? 'visible' : 'hidden'}", :alt => 'toggle children',
+                    :title => '')
+            end
+            
+            def needs_expanding
+              @current_node.children.present? and @current_node.parent.present?
+            end
+            
+          end
+        end
+        
+      end
+    end
+  end
+end

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

@@ -3,6 +3,11 @@ document.observe("dom:loaded", function() {
   drag_order_index.initialize();
 })
 
+Event.addBehavior({
+  '.index#pages': SiteMapBehavior(),  
+  '.index': RuledTableBehavior(),
+});
+
 var DragOrderIndex = Class.create({
   
   initialize: function() {
@@ -10,7 +15,7 @@ var DragOrderIndex = Class.create({
   },
   
   sortPages: function() {
-    var tree = new SortableTree('pages', {
+    var tree = new SortableTree('parent_pages', {
       draggable: {
         handle: 'handle',
         ghosting: false,
@@ -23,41 +28,80 @@ var DragOrderIndex = Class.create({
         }
       },
       onDrop: function(drag, drop, event){
-        var parent = drag.element.up('.page')
-        var children  = '';
-                
         this.moveHandles(drag.element);
-        
-        parent.down('.children').immediateDescendants().each(function(page) {
-          children += page.readAttribute('data-page_id') + ','
-        });
-        children = children.slice(0,-1);
+        this.assignExpanders(drag.element);
         
         new Ajax.Request('/admin/pages/sort.js', {
           method: 'put',
           parameters: {
-            'parent_id': parent.readAttribute('data-page_id'),
-            'children' : children
+            'parent_id': this.getPageID(drag.element.up('.page')),
+            'children' : this.buildChildrenString(drag.element)
           }
-        })
-        
+        });
       }.bind(this)
     });
     tree.setSortable();
   },
   
+  assignExpanders: function(element) {
+    element.up('#pages').select('.page').each(function(page) {
+      var children = page.down('.children').immediateDescendants();
+      
+      // If there are children, it's not the home and it doesn't have children_visible
+      if (children.length > 0) {
+        if (!page.hasClassName('level_0') && !page.hasClassName('children_visible')) {
+          // Toggle Expand Class (we want an expander)
+          page.down('.expander').addClassName('visible');
+          page.down('.expander').removeClassName('hidden');
+
+          // Toggle Children Identifier Classes (there are children)  
+          page.addClassName('children_visible');
+          page.removeClassName('no_children');
+          page.removeClassName('children_hidden');
+        }
+      }
+      // Else if there is not already a class of no children
+      else if (!page.hasClassName('no_children')) {
+        // Toggle Expand Class
+        page.down('.expander').addClassName('hidden');
+        page.down('.expander').removeClassName('visible');
+        
+        // Toggle Children Identifier Classes
+        page.addClassName('no_children');
+        page.removeClassName('children_visible');
+        page.removeClassName('children_hidden');
+      }
+    });
+  },
+  
   moveHandles: function(page) {
     var level = parseInt(page.up('.page').getAttribute('data-level'))
-    level += 1;
+    
+    level += 1;    
     page.setAttribute('data-level', level)
-    page.down('.handle').setStyle({ left: (level * -25) + 'px' })
+    page.down('.attributes').setStyle({ paddingLeft: ((level * 23) + 31) + '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' })
+      level += 1;
+      container.select('.page').each(function(page) {
+        page.setAttribute('data-level', level);
+        page.down('.attributes').setStyle({ paddingLeft: ((level * 23) + 31) + 'px' });
       });
     });
+  },
+  
+  buildChildrenString: function(page) {
+    var drag_order = this;
+    
+    var children = drag_order.getPageID(page);
+    
+    page.siblings('.page').each(function(page) {
+      children += ',' + drag_order.getPageID(page); 
+    })
+    return children
+  },
+  
+  getPageID: function(page) {
+    return page.readAttribute('data-page_id');
   }
 })

data/public/javascripts/admin/sitemap.js

@@ -75,24 +75,24 @@ var SiteMapBehavior = Behavior.create({
   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);
+      this.hideBranch(rom,image);
     } else {
-      img.src = img.src.replace('expand', 'collapse');
-      row.removeClassName('children_hidden');
-      row.addClassName('children_visible');
-      this.persistExpanded(row);
+      this.showBranch(rom,image);
     }
   },
   
-  hideBranch: function(parent, img) {
-    this.toggleExpanded(parent, img);
+  hideBranch: function(row, img) {
+    img.src = img.src.replace('collapse', 'expand');
+    row.removeClassName('children_visible');
+    row.addClassName('children_hidden');
+    this.persistCollapsed(row);
   },
   
-  showBranch: function(parent, img) {
-    this.toggleExpanded(parent, img);
+  showBranch: function(row, img) {
+    img.src = img.src.replace('expand', 'collapse');
+    row.removeClassName('children_hidden');
+    row.addClassName('children_visible');
+    this.persistExpanded(row);
   },
   
   toggleBranch: function(row, img) {
@@ -104,8 +104,4 @@ var SiteMapBehavior = Behavior.create({
       }
     }
   }
-});
-
-Event.addBehavior({
-  '#site_map': SiteMapBehavior()
-})
+});

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

@@ -1,120 +1,38 @@
-#content
-  
-  #pages
-    padding-left: 7px
+.index#pages
   
   .page
-    position: relative
     
     &.drop_hover
-      background-color: #F9F9F9
+      background-color: #FBFBFB
+      border-color: transparent
+      
+      li
+        border-color: transparent
   
     &.drop_insert
-      background-color: #DFEBFF
+      background-color: #F6F8FF
+      border-color: transparent
+      
+      li
+        border-color: transparent
       
     &.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
+    .attributes
     
-    .children
-      border-top: 1px solid #FAFAFA
+      .attribute
       
-      li
-        margin-left: 25px
-          
+        &.handle
+          position: absolute
+          cursor: move
+          left: 9px
+          width: 24px
 
-.handle
-  width: 24px
+          img
+            cursor: move
 
-  img
-    cursor: move
+.inset
+  .handle
+    display: none

data/public/stylesheets/sass/admin/partials/_index.sass

@@ -0,0 +1,172 @@
+=status-badge($background: transparent, $color: black, $width: 5em)
+  float: left
+  height: 14px
+  line-height: 14px
+  font-size: 10px
+  color: $color
+  background: $background
+  display: block
+  padding: 0 6px
+  position: absolute
+  right: 215px
+  top: 14px
+  width: $width
+  text-align: center
+  +border-radius(100px)
+
+#main
+  // Support floated elements, avoid horizontal scrollbar
+  overflow: hidden
+
+.index
+  font-size: 90%
+  margin-bottom: 2emasset
+  width: 100%
+  border-bottom: 1px solid white
+  li
+    position: relative
+    text-align: left
+    &:first-child
+      border-top: 1px solid white
+    .attributes
+      width: auto
+      height: 31px
+      line-height: 31px
+      padding: 4px 0 4px 10px
+      overflow: hidden
+      text-decoration: none
+      padding-left: 5px
+      border-top: 1px solid #fafafa
+      border-bottom: 1px solid transparent
+      &:hover
+        border-top: 1px solid #d5f0ff
+        border-bottom: 1px solid #c5dff5
+        background: #c5dff5 image_url('admin/row_highlight.png') repeat-x center top
+        +linear-gradient(color_stops(#e5f5ff, #c5dff5))
+      .attribute
+        display: block
+        float: left
+        padding-right: 5px
+      .actions
+        float: right
+        margin-top: -2px
+        a.action, span.action.disabled
+          padding: 6px
+          margin: 0 25px 0 1px
+          font-size: 10px
+          img
+            vertical-align: -10%
+        a.action
+          color: black
+          text-decoration: none
+          &:hover
+            background: #eee image_url('admin/buttons_background.png') repeat-x
+            border: 1px solid #a5c9df
+            margin: 0 24px 0 0
+            +border-radius
+          &.selected
+            background: #c5e0f5
+            +linear-gradient(color_stops(#e5f5ff, #c5e0ff))
+            border: 1px solid #a5c9df
+            margin: 0 24px 0 0
+            +border-top-radius
+            +border-bottom-radius(0)
+        span.action.disabled
+          color: #ccc
+    &.empty
+      color: silver
+      font-size: 85%
+      font-style: italic
+      padding: 3em
+      text-align: center
+    &.name
+      font-size: 115%
+      font-weight: bold
+      img
+        vertical-align: center
+      a
+        color: black
+        text-decoration: none
+        &:hover
+          color: #0066cc
+          text-decoration: underline
+    &.actions
+      float: right
+      font-size: 85%
+      white-space: nowrap
+
+.index#pages
+  .page
+    &.level_0 .attributes .attribute.name
+      font-size: 120%
+      font-weight: bold
+    &.level_1 .attributes .attribute.name
+      font-size: 115%
+      font-weight: bold
+    &.level_2 .attributes .attribute.name
+      font-size: 115%
+    &.level_3 .attributes .attribute.name
+      font-size: 105%
+    &.virtual .attributes .attribute.name a .title
+      color: #9eb3bf
+    &.children_visible
+      .children
+        display: block
+    &.children_hidden
+      .children
+        display: none
+    .attributes
+      .attribute.name
+        font-size: 105%
+        a
+          text-decoration: none
+          .title
+            color: black
+            text-decoration: none
+          &:hover .title
+            color: #0066cc
+            text-decoration: underline
+        .info
+          color: #9eb3bf
+          font-style: italic
+          font-weight: normal
+          font-size: 90%
+      .attribute.name
+        position: relative
+        img.expander
+          position: absolute
+          left: -25px
+          top: 8px
+          padding: 0 3px
+          &.hidden
+            visibility: hidden
+      .attribute.status
+        font-size: 80%
+    
+.status
+  +status-badge
+  a
+    +plain-link
+.draft_status
+  +status-badge(#cc494c, white)
+.hidden_status
+  +status-badge(#9eb3bf, white)
+
+.index#users
+  .name
+    padding-top: 8px
+    padding-bottom: 8px
+    img.avatar
+      margin-right: 4px
+      vertical-align: center
+    .login
+      color: #9eb3bf
+      font-size: 90%
+      font-style: italic
+      font-weight: normal
+      
+.inset
+  li
+    list-style: none
+  .actions
+    display: none

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.4.0.beta.2"
+  s.version = "0.4.2"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly"]
-  s.date = %q{2010-11-26}
+  s.date = %q{2010-11-27}
   s.description = %q{Radiant DragOrder allows you to reorder pages funly}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "db/migrate/02_add_default_position.rb",
     "drag_order_extension.rb",
     "lib/drag_order/controllers/admin/pages_controller.rb",
+    "lib/drag_order/helpers/admin/node_helper.rb",
     "lib/drag_order/models/page.rb",
     "lib/drag_order/tags/core.rb",
     "lib/radiant-drag_order-extension.rb",
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
     "public/javascripts/admin/sitemap.js",
     "public/javascripts/admin/sortable_tree.js",
     "public/stylesheets/sass/admin/extensions/drag_order/drag_order.sass",
+    "public/stylesheets/sass/admin/partials/_index.sass",
     "radiant-drag_order-extension.gemspec",
     "spec/controllers/pages_controller_spec.rb",
     "spec/datasets/sort_pages.rb",

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-drag_order-extension
 version: !ruby/object:Gem::Version 
-  hash: 62196455
-  prerelease: true
+  hash: 11
+  prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  - beta
   - 2
-  version: 0.4.0.beta.2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +08:00
+date: 2010-11-27 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +54,7 @@ files:
 - db/migrate/02_add_default_position.rb
 - drag_order_extension.rb
 - lib/drag_order/controllers/admin/pages_controller.rb
+- lib/drag_order/helpers/admin/node_helper.rb
 - lib/drag_order/models/page.rb
 - lib/drag_order/tags/core.rb
 - lib/radiant-drag_order-extension.rb
@@ -68,6 +67,7 @@ files:
 - public/javascripts/admin/sitemap.js
 - public/javascripts/admin/sortable_tree.js
 - public/stylesheets/sass/admin/extensions/drag_order/drag_order.sass
+- public/stylesheets/sass/admin/partials/_index.sass
 - radiant-drag_order-extension.gemspec
 - spec/controllers/pages_controller_spec.rb
 - spec/datasets/sort_pages.rb
@@ -94,14 +94,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: