caboose-cms 0.9.133 → 0.9.134

data/app/assets/stylesheets/caboose/admin_edit_page_content_dragdrop.scss

@@ -81,6 +81,10 @@
   }
 }
 
+#cboxTopLeft, #cboxTopRight, #cboxBottomLeft, #cboxBottomRight, #cboxMiddleLeft, #cboxMiddleRight, #cboxTopCenter, #cboxBottomCenter, #cboxClose {
+  background: #fff !important;
+}
+
 #the_modal #modal_content .mb_container {
   input {
     border: #ccc 1px solid;
@@ -111,6 +115,20 @@
   }
 }
 
+.cke_editable:focus {
+  outline-color: #c0dcff;
+  outline-offset: 7px;
+  outline-style: solid;
+  outline-width: 2px;
+}
+
+.richtext-block {
+  z-index: 6;
+}
+#colorbox, #cboxOverlay, #cboxWrapper {
+  z-index: 10000000;
+}
+
 body > .ui-draggable-dragging {
   width: 95px;
   height: auto;
@@ -134,7 +152,7 @@ p.caboose_note.delete {
   padding: 20px;
   text-align: center;
   position: relative;
-  z-index: 5;
+  z-index: 15;
   font-family: 'Roboto';
   font-weight: 300;
   input[type="button"] {
@@ -200,6 +218,8 @@ body > .container, body > .mm-page > .container {
   width: 95%;
   width: calc(100vw - 200px);
   float: right;
+  position: relative;
+  top: 40px;
 }
 #colorbox:focus {
   outline-width: 0 !important;
@@ -213,32 +233,71 @@ body > .container, body > .mm-page > .container {
 #tiny_header {
   display: block;  
   color: #fff;
- // background-image: url(/assets/caboose/caboose_logo_small.png);
   background-color: #353535;  
-  // background-repeat: no-repeat;
-  // background-position: right 0;
-  position: absolute;
+  position: fixed;
   top: 0;
   right: 0;
   z-index: 100000;
-  box-shadow: 0px 2px 3px rgba(10,10,10,0.3);
-  padding: 8px 10px 9px 10px;
+  width: calc(100% - 200px);
+  height: 40px;
+  padding: 0 2%;
+  line-height: 37px;
+  text-align: right;
+  transition: background-color 300ms ease;
+  #m-pub, #m-unpub {
+    float: left;
+    font-family: 'Roboto';
+    font-weight: 300;
+    font-size: 13px;
+    position: relative;
+    top: 1px;
+    font-style: italic;
+    color: #9e9e9e;
+  }
+  #m-unpub {
+    color: #fff;
+  }
   a {
     display: inline-block;
     color: #fff;
     padding: 0 10px;
     font-family: 'Roboto';
     font-weight: 300;
-    font-size: 15px;
+    font-size: 12px;
     text-decoration: none;
-    line-height: 20px;
+    background: #5a5a5a;
+    margin-left: 8px;
+    text-transform: uppercase;
+    border-radius: 3px;
+    line-height: 24px;
+    &[href*="revert"] {
+      background: #903b3b;
+    }
+    &[href*="preview"] {
+      background: #404088;
+    }
+    &[href*="publish"] {
+      background: #3b753b;
+    }
     &:hover {
-      color: #dbc553;
+      background: #c3c3c3;
+      color: #353535;
     }
     &:focus {
       outline-width: 0;
     }
   }
+  &.published {
+    background-color: #353535;
+    #m-unpub { display: none; }
+    a[href*="revert"], a[href*="publish"] {
+      display: none;
+    }
+  }
+  &.unpublished {
+    background-color: #7da4a9;
+    #m-pub { display: none; }
+  }
 }
 
 // .block_over { background: #e3e3e3; }
@@ -248,13 +307,16 @@ body > .container, body > .mm-page > .container {
 .delete_handle    { display: none; }
 .duplicate_handle    { display: none; }
 .drag_handle    { display: none; }
+.settings_handle    { display: none; }
 .block_over > .drag_handle    { display: block; position: relative; z-index: 3; }
 .block_over > .select_handle    { display: block; position: relative; z-index: 3; }
 // .block_over > .move_up_handle   { display: block; position: relative; z-index: 3; }
 // .block_over > .move_down_handle { display: block; position: relative; z-index: 3; }
 .block_over > .delete_handle    { display: block; position: relative; z-index: 3; }
 .block_over > .duplicate_handle    { display: block; position: relative; z-index: 3; }
+.block_over > .settings_handle    { display: block; position: relative; z-index: 3; }
 .block_over > .drag_handle      span { position: absolute; top: 0; right: 54px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.block_over > .settings_handle      span { position: absolute; top: 0; right: 72px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 .block_over > .select_handle    span { position: absolute; top: 0; right: 18px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 // .block_over > .move_up_handle   span { position: absolute; top: 0; right: 36px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 // .block_over > .move_down_handle span { position: absolute; top: 0; right: 18px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
@@ -265,11 +327,13 @@ body > .container, body > .mm-page > .container {
 .flex-grid-unit.block_over > .duplicate_handle span { right: auto; left: 18px; background-color: #f1e9e9; }
 .flex-grid-unit.block_over > .select_handle span { right: auto; left: 36px; background-color: #f1e9e9; }
 .flex-grid-unit.block_over > .drag_handle span { right: auto; left: 0; background-color: #f1e9e9; }
+.flex-grid-unit.block_over > .settings_handle span { right: auto; left: 72px; background-color: #f1e9e9; }
 
 .unslider-block-wrapper > .delete_handle,
 .unslider-block-wrapper > .drag_handle,
 .unslider-block-wrapper > .select_handle,
-.unslider-block-wrapper > .duplicate_handle {
+.unslider-block-wrapper > .duplicate_handle,
+.unslider-block-wrapper > .settings_handle {
   z-index: 20;
 }
 
@@ -279,6 +343,32 @@ body > .container, body > .mm-page > .container {
   }
  }
 
+ #caboose-notice {
+  position: fixed;
+  top: 40px;
+  right: 0;
+  width: 300px;
+  z-index: 1000;
+  background: #51883b;
+  color: white;
+  padding: 10px 12px 11px 12px;
+  font-size: 13px;
+  text-align: center;
+  font-family: 'Roboto';
+  font-weight: 300;
+  a {
+    position: absolute;
+    top: 1px;
+    right: 5px;
+    text-decoration: none;
+    color: #fff;
+    display: inline-block;
+    &:hover {
+      color: red;
+    }
+  }
+}
+
 .new_block_link { 
 	position: relative;
 	width: 100%;

data/app/controllers/caboose/application_controller.rb

@@ -57,7 +57,7 @@ module Caboose
       # Sets an instance variable of the logged in user
       @logged_in_user = logged_in_user  
 
-      @nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site) if request.fullpath.include?('/admin')
+   #   @nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site) if request.fullpath.include?('/admin')
       
       # Initialize the card
       init_cart if @site && @site.use_store && !@domain.under_construction

data/app/controllers/caboose/blocks_controller.rb

@@ -47,9 +47,10 @@ module Caboose
           end
           b.parent_id = params[:id]
           b.block_type_id = block_type_id
+          b.status = 'added'
           b.sort_order = Block.where(:parent_id => params[:id]).count              
           b.save
-          b.create_children
+          b.create_children(status: 'added')
           if params[:page_id]
             redirect_to "/admin/pages/#{b.page_id}/blocks/#{b.id}/edit"
           else
@@ -59,8 +60,16 @@ module Caboose
         end
       end
     
-      @page = Page.find(params[:page_id]) if params[:page_id]              
-      @post = Post.find(params[:post_id]) if params[:post_id]      
+      @page = Page.find(params[:page_id]) if params[:page_id]
+      if @page
+        @page.status = 'edited'
+        @page.save
+      end
+      @post = Post.find(params[:post_id]) if params[:post_id] 
+      if @post
+        @post.status = 'edited'
+        @post.save
+      end     
       @block = params[:id] ? Block.find(params[:id]) : (params[:page_id] ? Block.new(:page_id => params[:page_id]) : Block.new(:post_id => params[:post_id]))
       @after_id = params[:after_id] ? params[:after_id] : nil
       @before_id = params[:before_id] ? params[:before_id] : nil
@@ -77,15 +86,15 @@ module Caboose
       blocks = []
       if params[:id]
         b = Block.find(params[:id])
-        b.create_children
+        b.create_children(status: 'added') if Caboose::Block.where(:parent_id => b.id).count == 0
         bt = b.block_type
         blocks << { 
           'id'                 => b.id,
-          'parent_id'          => b.parent_id,
+          'parent_id'          => (b.new_parent_id.blank? ? b.parent_id : b.new_parent_id),
           'page_id'            => b.page_id,          
           'post_id'            => b.post_id,          
           'name'               => b.name,
-          'value'              => b.value,
+          'value'              => (b.new_value.blank? ? b.value : (b.new_value == 'EMPTY' ? nil : b.new_value)),
           'constrain'          => b.constrain,
           'full_width'         => b.full_width,
           'block_type'         => bt,
@@ -98,15 +107,15 @@ module Caboose
         }
       else
         q = params[:page_id] ? ["parent_id is null and page_id = ?", params[:page_id]] : ["parent_id is null and post_id = ?", params[:post_id]] 
-        Block.where(q).reorder(:sort_order).all.each do |b|
+        Block.where(q).reorder(:new_sort_order).all.each do |b|
           bt = b.block_type
           blocks << { 
             'id'                 => b.id,
-            'parent_id'          => b.parent_id,
+            'parent_id'          => (b.new_parent_id.blank? ? b.parent_id : b.new_parent_id),
             'page_id'            => b.page_id,            
             'post_id'            => b.post_id,                        
             'name'               => b.name, 
-            'value'              => b.value,
+            'value'              => (b.new_value.blank? ? b.value : (b.new_value == 'EMPTY' ? nil : b.new_value)),
             'constrain'          => b.constrain,
             'full_width'         => b.full_width,
             'block_type'         => bt,
@@ -118,6 +127,7 @@ module Caboose
           }
         end        
       end
+     # Caboose.log(blocks)
       render :json => blocks
     end
     
@@ -138,15 +148,15 @@ module Caboose
       
     def admin_tree_helper(b)
       arr = []
-      b.children.order(:block_type_id).each do |b2|
+      b.filtered_children(true,true).order(:block_type_id).each do |b2|
         bt = b2.block_type
         arr << {
           'id'                 => b2.id,
-          'parent_id'          => b2.parent_id,
+          'parent_id'          => (b2.new_parent_id.blank? ? b2.parent_id : b2.new_parent_id),
           'page_id'            => b2.page_id,
           'post_id'            => b2.post_id,
           'name'               => b2.name,
-          'value'              => b2.value,
+          'value'              => (b2.new_value.blank? ? b2.value : (b2.new_value == 'EMPTY' ? nil : b2.new_value)),
           'constrain'          => b2.constrain,
           'full_width'         => b2.full_width,
           'block_type'         => bt,
@@ -166,7 +176,12 @@ module Caboose
       return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = Caboose::StdClass.new   
       b = Block.find(params[:id])      
-      b.media = nil
+      b.new_media_id = 0
+      b.image_file_name = nil
+      b.image_file_size = nil
+      b.image_content_type = nil
+      b.image_updated_at = nil
+      b.status = 'edited' if b.status == 'published'
       resp.success = b.save
       render :json => resp      
     end 
@@ -196,9 +211,10 @@ module Caboose
         :site => @site,
         :page => params[:page_id] ? @p : nil,
         :post => params[:post_id] ? @p : nil,            
-        :request => request
+        :request => request,
+        :is_new => (params[:is_new].blank? ? false : true)
       })
-      render :inline => html            
+      render :inline => html
     end
           
     # @route GET /admin/pages/:page_id/blocks/render
@@ -236,7 +252,7 @@ module Caboose
     def admin_render_second_level
       return unless user_is_allowed("#{page_or_post}s", 'edit')      
       view = ActionView::Base.new(ActionController::Base.view_paths)      
-      blocks = @p.block.children.collect do |b|
+      blocks = @p.block.filtered_children(true,true).collect do |b|
         {           
           :id => b.id,
           :block_type_id => b.block_type.id,
@@ -321,7 +337,8 @@ module Caboose
 
       resp = Caboose::StdClass.new
 
-      b = Block.new      
+      b = Block.new
+      b.status = 'added'    
       if params[:page_id]
         b.page_id = params[:page_id].to_i
       else
@@ -331,51 +348,62 @@ module Caboose
       b.block_type_id = params[:block_type_id]
                       
       if !params[:index].nil?      
-        b.sort_order = params[:index].to_i
+        b.new_sort_order = params[:index].to_i
         
         i = 1
-        b.parent.children.where('sort_order >= ?', b.sort_order).reorder(:sort_order).all.each do |b3|
-          b3.sort_order = b.sort_order + i
+        b.parent.filtered_children(true).where('new_sort_order >= ?', b.new_sort_order).order('new_sort_order,id').all.each do |b3|
+          b3.new_sort_order = b.new_sort_order + i
+          b3.status = 'edited' if b3.status == 'published'
           b3.save
           i = i + 1                  
         end
         
       elsif params[:before_id] && !params[:before_id].blank?
         b2 = Block.find(params[:before_id].to_i)
-        b.sort_order = b2.sort_order
+        b.new_sort_order = b2.new_sort_order
         
         i = 1
-        b2.parent.children.where('sort_order >= ?', b.sort_order).reorder(:sort_order).all.each do |b3|
-          b3.sort_order = b.sort_order + i
+        b2.parent.filtered_children(true).where('new_sort_order >= ?', b.new_sort_order).order('new_sort_order,id').all.each do |b3|
+          b3.new_sort_order = b.new_sort_order + i
+          b3.status = 'edited' if b3.status == 'published'
           b3.save
           i = i + 1                  
         end
       
       elsif params[:after_id] && !params[:after_id].blank?
         b2 = Block.find(params[:after_id].to_i)
-        b.sort_order = b2.sort_order + 1
-        
+        b.new_sort_order = b2.new_sort_order + 1
+
         i = 1
-        b2.parent.children.where('sort_order >= ?', b.sort_order).reorder(:sort_order).all.each do |b3|
-          b3.sort_order = b.sort_order + i
+        b2.parent.filtered_children(true).where('new_sort_order >= ?', b.new_sort_order).order('new_sort_order,id').all.each do |b3|
+          b3.new_sort_order = b.new_sort_order + i
+          b3.status = 'edited' if b3.status == 'published'
           b3.save
           i = i + 1                  
         end
         
       elsif params[:id]
-        b.sort_order = Block.where(:parent_id => params[:id]).count        
+        b.new_sort_order = Block.where(:name => nil).where("(new_parent_id is null and parent_id = ? and status != ?) OR (new_parent_id = ? and status != ?)",params[:id],'deleted',params[:id],'deleted').count        
       end                  
       
       # Save the block
       b.save
 
+      # if b.page
+      #   b.page.status = 'edited'
+      #   b.page.save
+      # elsif b.post
+      #   b.post.status = 'edited'
+      #   b.post.save
+      # end
+
       if !b.block_type.default.blank?
         b.value = b.block_type.default
         b.save
       end
       
       # Ensure that all the children are created for the block
-      b.create_children
+      b.create_children(status: 'added')
 
       # Default child block count
       if !params[:child_count].blank? && params[:child_count].to_i > 0
@@ -388,9 +416,12 @@ module Caboose
           end
           b1.parent_id = b.id
           b1.sort_order = ind
+          b1.new_sort_order = ind
+     #     b1.new_parent_id = b.id
+          b1.status = 'added'
           b1.block_type_id = b.block_type.default_child_block_type_id
           b1.save
-          b1.create_children
+          b1.create_children(status: 'added')
           bw = b1.child('width')
           if bw
             bw.value = 'auto' # (100.0 / params[:child_count].to_f).to_i.to_s + '%'
@@ -427,12 +458,17 @@ module Caboose
           #when 'page_id'       then b.page_id       = v
           when 'parent_id'     then 
             b.parent_id  = v
-            b.sort_order = Block.where(:parent_id => v).count
+            b.new_sort_order = Block.where("(parent_id = ? and status = ?) or (new_parent_id = ? and (status = ? or status = ?))",v,'published',v,'edited','added').count
+            b.status = 'edited' if b.status == 'published'
           when 'block_type_id' then b.block_type_id = v
-          when 'sort_order'    then b.sort_order    = v
+          when 'sort_order'    then 
+            b.new_sort_order    = v
+            b.status = 'edited' if b.status == 'published'
           when 'constrain'     then b.constrain     = v
           when 'full_width'    then b.full_width    = v
-          when 'media_id'      then b.media_id      = v
+          when 'media_id'      then 
+            b.new_media_id      = v
+            b.status = 'edited' if b.status == 'published'
           when 'name'          then b.name          = v
           when 'value'         then
             
@@ -448,31 +484,54 @@ module Caboose
                 b = RichTextBlockParser.parse(b, v, request.host_with_port)
               else
                 if b.block_type.field_type == 'checkbox_multiple'
-                  b.value = Block.parse_checkbox_multiple_value(b, v)
+                  b.new_value = Block.parse_checkbox_multiple_value(b, v)
                 else                    
-                  b.value = v
+                  b.new_value = (v.blank? ? 'EMPTY' : v)
+                  b.status = 'edited' if b.status == 'published'
                 end
               end
             end
         end
       end
-      
-      # Trigger the page cache to be updated
-      # if params[:page_id]
-      #   pc = PageCache.where(:page_id => b.page_id).first
-      #   if pc
-      #     pc.refresh = true
-      #     pc.save
-      #     PageCacher.delay(:queue => 'caboose_cache').refresh
-      #   else
-      #     PageCacher.delay(:queue => 'caboose_cache').cache(b.page_id)
-      #   end
+
+      # if b.page
+      #   b.page.status = 'edited'
+      #   b.page.save
+      # elsif b.post
+      #   b.post.status = 'edited'
+      #   b.post.save
       # end
                 
       resp.success = save && b.save
-      b.create_children
+      b.create_children(status: 'added')
       render :json => resp      
     end
+
+    # @route PUT /admin/pages/:page_id/blocks/:id/value
+    # @route PUT /admin/posts/:post_id/blocks/:id/value
+    def admin_update_value
+      return unless user_is_allowed('pages', 'edit')
+      resp = StdClass.new({'attributes' => {}})
+      b = Block.find(params[:id])
+      # if b.block_type_id == 309 # Richtext
+      b.new_value = params[:value]
+      b.status = 'edited' if b.status == 'published'
+      # if b.page
+      #   b.page.status = 'edited'
+      #   b.page.save
+      # elsif b.post
+      #   b.post.status = 'edited'
+      #   b.post.save
+      # end
+
+      # elsif b.block_type_id == 1 # Heading
+      #   b1 = b.child('heading_text')
+      #   b1.value = params[:value]
+      #   b1.save
+      # end
+      resp.success = b.save
+      render :json => resp
+    end
     
     # @route POST /admin/pages/:page_id/blocks/:id/image
     # @route POST /admin/posts/:post_id/blocks/:id/image
@@ -525,6 +584,7 @@ module Caboose
       
       resp = StdClass.new
       b = Block.find(params[:id])
+    #  sibs = b.siblings
       parent_id = b.parent_id
       if b.parent_id
         if params[:page_id]
@@ -535,15 +595,43 @@ module Caboose
       else
         resp.close = true
       end
-      b.destroy
+
+      # if b.page
+      #   b.page.status = 'edited'
+      #   b.page.save
+      # elsif b.post
+      #   b.post.status = 'edited'
+      #   b.post.save
+      # end
+
+
+      child_ids = b.filtered_children(true).pluck(:id)
+      cids = child_ids.blank? ? 0 : child_ids
+
+      
+      bid1 = Block.where("id = ? or id in (?)",b.id,cids).where('status = ? or status = ?','edited','published')
+      # Caboose.log("marking as deleted: #{bid1.pluck(:id)}")
+      bid1.update_all(:status => 'deleted')
+      bid2 = Block.where("id = ? or id in (?)",b.id,cids).where(:status => 'added')
+      bid2.destroy_all
+      # Caboose.log("destroying: #{bid2.pluck(:id)}")
+
       
       if parent_id
-        i = 0
-        Block.where(:parent_id => parent_id).reorder(:sort_order).all.each do |b2|
-          b2.sort_order = i
+        # i = 0
+        # Block.where(:parent_id => parent_id).where('status != ?', 'deleted').order(:new_sort_order).all.each do |b2|
+        #   b2.new_sort_order = i
+        #   b2.status = 'edited' if b2.status == 'published'
+        #   b2.save
+        #   i = i + 1
+        # end
+        sibs = Caboose::Block.where(:name => nil).where("(new_parent_id is null and parent_id = ? and status != ?) OR (new_parent_id = ? and status != ?)",parent_id,'deleted',parent_id,'deleted').order(:new_sort_order, :id).all
+        sibs.each_with_index do |b2, i|      
+          b2.new_sort_order = i
+          b2.status = 'edited' if b2.status == 'published'
           b2.save
-          i = i + 1
-        end
+        end  
+
       end
 
       render :json => resp
@@ -555,11 +643,32 @@ module Caboose
       return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
-      resp.new_id = b.duplicate_block(@site.id, params[:page_id], params[:post_id], b.block_type_id, b.parent_id)
+      # if b.page
+      #   b.page.status = 'edited'
+      #   b.page.save
+      # elsif b.post
+      #   b.post.status = 'edited'
+      #   b.post.save
+      # end
+      resp.new_id = b.duplicate_block(@site.id, params[:page_id], params[:post_id], b.block_type_id, (b.new_parent_id.blank? ? b.parent_id : b.new_parent_id))
       resp.success = true
       render :json => resp
     end
 
+    # @route GET /admin/pages/:page_id/blocks/:id/new-child-blocks
+    # @route GET /admin/posts/:post_id/blocks/:id/new-child-blocks
+    # def admin_new_child_blocks
+    #   return unless user_is_allowed('pages', 'edit')
+    #   resp = StdClass.new
+    #   resp.blocks = []
+
+    #   Block.where(:new_parent_id => params[:id]).all.each do |b|
+    #     resp.blocks << b
+    #   end
+
+    #   render :json => resp
+    # end
+
     # @route GET /admin/pages/:page_id/blocks/:id/api-info
     # @route GET /admin/posts/:post_id/blocks/:id/api-info
     def admin_block_info
@@ -580,8 +689,10 @@ module Caboose
       return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
-      resp.parent_id = b.parent_id if b && b.parent && b.parent.name.blank?
-      resp.grandparent_id = b.parent.parent_id if b && b.parent && b.parent.parent && b.parent.parent.name.blank?
+      par = Block.where(:name => nil).where(:id => (b.new_parent_id.blank? ? b.parent_id : b.new_parent_id)).first
+      resp.parent_id = par ? par.id : nil
+      gp = par ? Block.where(:name => nil).where(:id => (par.new_parent_id.blank? ? par.parent_id : par.new_parent_id)).first : nil
+      resp.grandparent_id = gp ? gp.id : nil
       render :json => resp
     end
 
@@ -591,28 +702,42 @@ module Caboose
       return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
-      if params[:before_id] && !params[:before_id].blank?
+      if !params[:before_id].blank?
         b2 = Block.find(params[:before_id].to_i)
-        b.sort_order = b2.sort_order
+        b.new_sort_order = (b2.new_sort_order.blank? ? b2.sort_order : b2.new_sort_order)
         i = 1
-        b2.parent.children.where('sort_order >= ?', b.sort_order).reorder(:sort_order).all.each do |b3|
-          b3.sort_order = b.sort_order + i
+        sibs = b2.siblings(b.new_sort_order)
+    #    Caboose.log("updating #{sibs.count} siblings")
+        sibs.each do |b3|
+          b3.new_sort_order = b.new_sort_order + i
+          b3.status = 'edited' if b3.status == 'published'
           b3.save
           i = i + 1                  
         end
-      elsif params[:after_id] && !params[:after_id].blank?
+      elsif !params[:after_id].blank?
         b2 = Block.find(params[:after_id].to_i)
-        b.sort_order = b2.sort_order + 1
+        b.new_sort_order = (b2.new_sort_order.blank? ? (b2.sort_order + 1) : (b2.new_sort_order + 1))
         i = 1
-        b2.parent.children.where('sort_order >= ?', b.sort_order).reorder(:sort_order).all.each do |b3|
-          b3.sort_order = b.sort_order + i
+        sibs = b2.siblings(b.new_sort_order)
+    #    Caboose.log("updating #{sibs.count} siblings")
+        sibs.each do |b3|
+          b3.new_sort_order = b.new_sort_order + i
+          b3.status = 'edited' if b3.status == 'published'
           b3.save
-          i = i + 1                  
+          i = i + 1
         end
       elsif params[:parent_id]
-        b.sort_order = Block.where(:parent_id => params[:parent_id]).count
+        b.new_sort_order = b.siblings.count        
       end
-      b.parent_id = params[:parent_id]
+      b.new_parent_id = params[:parent_id]  # if params[:parent_id] != b.parent_id.to_s
+      b.status = 'edited' if b.status == 'published'
+      # if b.page
+      #   b.page.status = 'edited'
+      #   b.page.save
+      # elsif b.post
+      #   b.post.status = 'edited'
+      #   b.post.save
+      # end
       resp.success = true
       b.save
       render :json => resp
@@ -631,6 +756,13 @@ module Caboose
       else
         resp.success = "The block has been moved up successfully."
       end
+      # if b.page
+      #   b.page.status = 'edited'
+      #   b.page.save
+      # elsif b.post
+      #   b.post.status = 'edited'
+      #   b.post.save
+      # end
       render :json => resp
     end
     
@@ -641,16 +773,19 @@ module Caboose
       
       resp = StdClass.new
       b = Block.find(params[:id])
-      b2 = Block.where("parent_id = ? and sort_order = ?", b.parent_id, b.sort_order + 1).first
-      if b2.nil?
+      changed = b.move_down
+      if !changed
         resp.error = "The block is already at the bottom."
-      else        
-        b2.sort_order = b.sort_order
-        b2.save
-        b.sort_order = b.sort_order + 1
-        b.save
+      else
         resp.success = "The block has been moved down successfully."
       end
+      # if b.page
+      #   b.page.status = 'edited'
+      #   b.page.save
+      # elsif b.post
+      #   b.post.status = 'edited'
+      #   b.post.save
+      # end
 
       render :json => resp
     end