caboose-cms 0.4.41 → 0.4.42

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODgxOTZjNGJiMDUxMzU4ODc5MTJmZjQ0NGJmODQ1NTgzYTU4NDFjYg==
+    ZWNmYTkwYTBkOTc0NTY2MzI2MzIzODI1MmU3NDAyNWY3ZDcwZjRhYg==
   data.tar.gz: !binary |-
-    NTE2NzJlZmNiY2QwNzI3YTU3ZDY0MmE5ZmYyMTViNzZjODRjYzg2Mg==
+    MjFhOTA0OGNiOTUwMTIyNGZkZjBiOWUwMzAwYWNhZDBiZGM4OGVjMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDBkMjk3ZjA1OTA1MmM3NDFmYjAyN2JhODI4MGMzMWNmMjlhZDM5YTIwMDg0
-    Yzk4YTA0ZjEzMTg4MzU1NWU4OGFkODdkM2ZkYjNmYTdmMzVlMWI2MTZlNGIz
-    NWI0ZTljZjA3Y2RlNzVlODllYTE0MDNjYzc1Nzg1ODMxZDE5ZjM=
+    ZDYxNjcyODcwM2YxMGUyM2IzOTFlODI4NjU5NzM0Y2EwY2Q3NmM3NGM5NDIx
+    ZDlhYWI2MWFkZWZlYmQ0ZTg2NjY1MDBhMjk1YTQ5ZjA2NDg5MjI3MDk3ODRm
+    ZGVjMmI4NDhhMTU0NzE5OTFhNzI1NDkwYzRiMzVlZjFjZjY2Mzc=
   data.tar.gz: !binary |-
-    NWZkODkxNWEyMzFhYmNlN2YwMDExYjc2Nzk4ZmY1NzkzZGZhZWVjY2NmMGFh
-    ZTcxZTYwMDhjNjkzMjljMDBhOTkzZjhjOGFhZDVhZDUyNDhhZGU2OWMzY2U4
-    NDQ3ZTUzZWIxMjM3M2UwYjg1YWNmNzQyZjFjNmFlMGM2OWQzNjI=
+    M2NkY2FiNjlmNjc3YTk0YTE2MWFiYjAzZGUzZDE2MTQ0MGFkMTFjZmE2NDE2
+    NDMzMmQyMGQ3Y2M4OTY3OTNkNGRiMjMzNmFhZWVlZDE2ZDc0ZDQ4MTNjN2Ux
+    NzVmN2VjYzUyYmMzYThjYjQxYTM4NWMwZjJkMDE2ZmVmMDgyYzM=

data/app/assets/javascripts/caboose/admin_page_edit_content.js

@@ -1,4 +1,4 @@
-
+ 
 var PageContentController = function(page_id) { this.init(page_id); };
 
 PageContentController.prototype = {
@@ -10,9 +10,8 @@ PageContentController.prototype = {
   {
     this.page_id = page_id;
     var that = this;
-    that.set_clickable();   
-    //this.render_blocks(function() {
-    //  that.sortable_blocks();
+    that.set_clickable();       
+    that.sortable_blocks();
     //  that.draggable_blocks();
     //});
   },
@@ -20,7 +19,7 @@ PageContentController.prototype = {
   sortable_blocks: function()
   { 
     var that = this;
-    $('#blocks').sortable({
+    $('.sortable').sortable({
       //hoverClass: "ui-state-active",
       placeholder: 'sortable-placeholder',
       forcePlaceholderSize: true,
@@ -40,11 +39,19 @@ PageContentController.prototype = {
           that.new_block_type_id = false;
         }
         else
-        {        
+        {
+          var ids = [];
+          $.each($(e.target).children(), function(i, el) {
+            var id = $(el).attr('id');
+            if (id.substr(0, 6) == 'block_') ids.push(id.substr(6));
+          });          
+            
           $.ajax({
             url: '/admin/pages/' + that.page_id + '/block-order',
             type: 'put',
-            data: $('#blocks').sortable('serialize', { key: "block_ids[]" }),
+            data: {
+              block_ids: ids,
+            },
             success: function(resp) {}
           });
         }
@@ -78,12 +85,12 @@ PageContentController.prototype = {
     if (!confirm)
     {
       var p = $('<p/>')
-        .addClass('note warning')
+        .addClass('caboose_note')
         .append("Are you sure you want to delete the block? ")
-        .append($('<input/>').attr('type', 'button').val('Yes').click(function() { that.delete_block(block_id, true); })).append(" ")
-        .append($('<input/>').attr('type', 'button').val('No').click(function() { that.render_block(block_id); }));
-      $('#block_container_' + block_id).attr('onclick','').unbind('click');
-      $('#block_container_' + block_id).empty().append(p);
+        .append($('<input/>').attr('type', 'button').val('Yes').click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(block_id, true); })).append(" ")
+        .append($('<input/>').attr('type', 'button').val('No').click(function(e) {  e.preventDefault(); e.stopPropagation(); that.render_blocks(); }));
+      $('#block_' + block_id).attr('onclick','').unbind('click');
+      $('#block_' + block_id).empty().append(p);
       return;
     }
     $.ajax({
@@ -105,7 +112,7 @@ PageContentController.prototype = {
       url: '/admin/pages/' + this.page_id + '/blocks/render-second-level',
       success: function(blocks) {
         $(blocks).each(function(i, b) {
-          $('#block_' + b.id).replaceWith(b.html);
+          $('#block_' + b.id).replaceWith(b.html);                              
         });
         that.set_clickable();
       }
@@ -119,36 +126,51 @@ PageContentController.prototype = {
       url: '/admin/pages/' + this.page_id + '/blocks/tree',
       success: function(blocks) {        
         $(blocks).each(function(i,b) {
-          that.set_clickable_helper(b);                      
-        });
+          that.set_clickable_helper(b, false, false);
+        });                
       }
     });    
   },
   
-  set_clickable_helper: function(b)
+  set_clickable_helper: function(b, parent_id, parent_allows_child_blocks)
   {    
-    var that = this;        
+    var that = this;
+        
+    $('#block_' + b.id)      
+      .prepend($('<a/>').attr('id', 'block_' + b.id + '_sort_handle'  ).addClass('sort_handle'  ).append($('<span/>').addClass('ui-icon ui-icon-arrow-2-n-s')).click(function(e) { e.preventDefault(); e.stopPropagation(); }))
+      .prepend($('<a/>').attr('id', 'block_' + b.id + '_delete_handle').addClass('delete_handle').append($('<span/>').addClass('ui-icon ui-icon-close'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(b.id); }));
+      
+    if (parent_allows_child_blocks && (!b.name || b.name.length == 0))
+    {            
+      $('#block_' + b.id).prepend($('<div/>')          
+        .addClass('new_block_link')
+        .append($('<div/>').addClass('line'))
+        .append($('<a/>')
+          .attr('href', '#')
+          .html("New Block")
+          .click(function(e) { 
+            e.preventDefault(); e.stopPropagation();
+            caboose_modal_url('/admin/pages/' + that.page_id + '/blocks/' + parent_id + '/new?before_id=' + b.id);                        
+          })
+        )
+        .mouseover(function(e) { $(this).addClass('new_block_link_over');    e.stopPropagation(); })
+        .mouseout(function(e)  { $(this).removeClass('new_block_link_over'); e.stopPropagation(); })
+      );      
+    }
+            
     $('#block_' + b.id).attr('onclick','').unbind('click');    
     $('#block_' + b.id).click(function(e) {
       e.stopPropagation();
       that.edit_block(b.id); 
     });
-    if (b.allow_child_blocks == true)
-    {
-      $('#new_block_' + b.id).replaceWith($('<input/>')
-        .attr('type', 'button')
-        .val('New Block')
-        .click(function(e) { e.stopPropagation(); that.new_block(b.id);          
-        })
-      );
-    } 
+     
     var show_mouseover = true;
     if (b.children && b.children.length > 0)
     {
       $.each(b.children, function(i, b2) {
         if (b2.block_type_id = 34)
           show_mouseover = false;
-        that.set_clickable_helper(b2);
+        that.set_clickable_helper(b2, b.id, b.allow_child_blocks);
       });
     }    
     if (show_mouseover)

data/app/controllers/caboose/blocks_controller.rb

@@ -1,3 +1,4 @@
+require 'nokogiri'
 
 module Caboose
   class BlocksController < ApplicationController
@@ -18,7 +19,9 @@ module Caboose
     def admin_new
       return unless user_is_allowed('pages', 'add')
       @page = Page.find(params[:page_id])
-      @block = params[:id] ? Block.find(params[:id]) : Block.new(:page_id => params[:page_id])             
+      @block = params[:id] ? Block.find(params[:id]) : Block.new(:page_id => params[:page_id])
+      @after_id = params[:after_id] ? params[:after_id] : nil
+      @before_id = params[:before_id] ? params[:before_id] : nil
       render :layout => 'caboose/modal'
     end
     
@@ -138,9 +141,12 @@ module Caboose
       @document_domain = request.host
       @document_domain.gsub('http://', '')
       @document_domain.gsub('https://', '')
-                                  
-      #render "caboose/blocks/admin_edit_#{@block.block_type}", :layout => 'caboose/modal'
-      render :layout => 'caboose/modal'
+
+      begin        
+        render "caboose/blocks/admin_edit_#{@block.block_type.full_name}", :layout => 'caboose/modal'
+      rescue
+        render :layout => 'caboose/modal'
+      end
     end
     
     # POST /admin/pages/:page_id/blocks
@@ -160,19 +166,39 @@ module Caboose
                     
       if !params[:index].nil?      
         b.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
+          b3.save
+          i = i + 1                  
+        end
+        
+      elsif params[:before_id]
+        b2 = Block.find(params[:before_id].to_i)
+        b.sort_order = b2.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
+          b3.save
+          i = i + 1                  
+        end
+      
       elsif params[:after_id]
         b2 = Block.find(params[:after_id].to_i)
         b.sort_order = b2.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
+          b3.save
+          i = i + 1                  
+        end
+        
       elsif params[:id]
-        b.sort_order = Block.where(:parent_id => params[:id]).count       
-      end
-      
-      i = b.sort_order + 1
-      Block.where("page_id = ? and sort_order >= ?", b.page_id, b.sort_order).reorder(:sort_order).each do |b2|
-        b2.sort_order = i
-        b2.save        
-        i = i + 1
-      end      
+        b.sort_order = Block.where(:parent_id => params[:id]).count        
+      end                  
       
       # Save the block
       b.save
@@ -196,12 +222,17 @@ module Caboose
       save = true
       params.each do |k,v|
         case k
-          when 'page_id'       then b.page_id       = v
+          #when 'page_id'       then b.page_id       = v
           when 'parent_id'     then b.parent_id     = v
           when 'block_type_id' then b.block_type_id = v
           when 'sort_order'    then b.sort_order    = v
           when 'name'          then b.name          = v
-          when 'value'         then b.value         = v                                        
+          when 'value'         then
+            if b.block_type.field_type == 'richtext'
+              b = RichTextBlockParser.parse(b, v, request.host_with_port)
+            else              
+              b.value = v
+            end
         end
       end
     

data/app/controllers/caboose/pages_controller.rb

@@ -171,12 +171,10 @@ module Caboose
     # PUT /admin/pages/:id/block-order
     def admin_update_block_order
       return unless user_is_allowed('pages', 'edit')
-      block_ids = params[:block_ids]
+      block_ids = params[:block_ids]      
       i = 0
       block_ids.each do |block_id|
-        b = Block.find(block_id)
-        b.sort_order = i
-        b.save
+        Block.find(block_id).update_attribute(:sort_order, i)        
         i = i + 1
       end      
       render :json => true

data/app/models/caboose/block.rb

@@ -181,7 +181,15 @@ class Caboose::Block < ActiveRecord::Base
         
   def child_block_link        
     return "<div class='new_block' id='new_block_#{self.id}'>New Block</div>"    
-  end    
+  end
+  
+  def new_block_before_link        
+    return "<div class='new_block_before' id='new_block_before_#{self.id}'>New Block</div>"    
+  end
+  
+  def new_block_after_link        
+    return "<div class='new_block_after' id='new_block_after_#{self.id}'>New Block</div>"    
+  end
   
   def js_hash
     kids = self.children.collect { |b| b.js_hash }

data/app/models/caboose/block_type.rb

@@ -25,6 +25,11 @@ class Caboose::BlockType < ActiveRecord::Base
     :share,      # Whether or not to share the block type in the existing block store.
     :downloaded  # Whether the full block type has been download or just the name and description.
     
+  def full_name
+    return name if parent_id.nil?
+    return "#{parent.full_name}_#{name}"
+  end
+  
   def render_options(empty_text = nil)    
     return eval(self.options_function)    
   end

data/app/models/caboose/block_type_source.rb

@@ -14,7 +14,7 @@ class Caboose::BlockTypeSource < ActiveRecord::Base
   # Just get the names and descriptions of all block types from the source
   def refresh_summaries
     resp = nil
-    begin                             
+    begin
       resp = HTTParty.get("#{self.url}/caboose/block-types?token=#{self.token}")
     rescue HTTParty::Error => e
       Caboose.log(e.message)

data/app/models/caboose/rich_text_block_parser.rb

@@ -0,0 +1,195 @@
+
+module Caboose
+  class RichTextBlockParser
+    
+    def self.parse(block, html, domain)
+      
+      html = html.strip
+      page = Nokogiri::HTML("<div>#{html}</div>")
+      if page.css('div').children.count == 1
+        block.value = html
+        block.save
+        return block
+      end
+      
+      nodes = []
+      page.css('div').children.each do |node|
+        case node.name.downcase
+          when 'h1'    then nodes << node           
+          when 'h2'    then nodes << node
+          when 'h3'    then nodes << node
+          when 'h4'    then nodes << node
+          when 'h5'    then nodes << node
+          when 'h6'    then nodes << node
+          when 'p'     then
+            str = node.inner_html.strip
+            nodes << node if str.length > 0 && str != "&#160;" && str != "&nbsp;"
+          when 'ul'    then nodes << node
+          when 'div'   then nodes << node
+          when 'a'     then nodes << node
+          when 'img'   then nodes << node
+          when 'table' then nodes << node
+        end                    
+      end
+      
+      # Increment the sort order of any blocks after the current one                
+      sort_order = block.sort_order + nodes.count                
+      block.parent.children.where('sort_order > ?', block.sort_order).reorder(:sort_order).all.each do |b2|
+        b2.sort_order = sort_order
+        b2.save
+        sort_order = sort_order + 1                  
+      end
+      
+      # Now add all the new blocks
+      sort_order = block.sort_order
+      new_first_block_id = false
+      paragraphs = []
+      nodes.each do |node|
+        b = Block.create(   
+          :page_id       => block.page_id,              
+          :parent_id     => block.parent_id,
+          :sort_order    => sort_order
+        )
+        if sort_order == block.sort_order
+          new_first_block_id = b.id
+        end
+        
+        case node.name.downcase
+          when 'h1'
+            b.block_type_id = BlockType.where(:name => 'heading').first.id
+            b.save            
+            b.create_children            
+            b.child('size').update_attribute(:value, 1)                        
+            b.child('text').update_attribute(:value, node.inner_html)            
+          when 'h2'
+            b.block_type_id = BlockType.where(:name => 'heading').first.id
+            b.save            
+            b.create_children            
+            b.child('size').update_attribute(:value, 2)                        
+            b.child('text').update_attribute(:value, node.inner_html)
+          when 'h3'
+            b.block_type_id = BlockType.where(:name => 'heading').first.id
+            b.save            
+            b.create_children            
+            b.child('size').update_attribute(:value, 3)                        
+            b.child('text').update_attribute(:value, node.inner_html)
+          when 'h4'
+            b.block_type_id = BlockType.where(:name => 'heading').first.id
+            b.save            
+            b.create_children            
+            b.child('size').update_attribute(:value, 4)                        
+            b.child('text').update_attribute(:value, node.inner_html)
+          when 'h5'
+            b.block_type_id = BlockType.where(:name => 'heading').first.id
+            b.save            
+            b.create_children            
+            b.child('size').update_attribute(:value, 5)                        
+            b.child('text').update_attribute(:value, node.inner_html)
+          when 'h6'
+            b.block_type_id = BlockType.where(:name => 'heading').first.id
+            b.save            
+            b.create_children            
+            b.child('size').update_attribute(:value, 6)                        
+            b.child('text').update_attribute(:value, node.inner_html)
+          when 'p'
+            b.block_type_id = BlockType.where(:name => 'richtext').first.id
+            b.value = node.to_s                        
+            b.save
+            paragraphs << b
+          when 'ul'
+            b.block_type_id = BlockType.where(:name => 'richtext').first.id
+            b.value = node.to_s                        
+            b.save
+          when 'div'
+            b.block_type_id = BlockType.where(:name => 'richtext').first.id
+            b.value = node.to_s                        
+            b.save
+          when 'a'
+            b.block_type_id = BlockType.where(:name => 'richtext').first.id
+            b.value = "<p>#{node.to_s}</p>"                        
+            b.save
+          when 'img'
+            b.block_type_id = BlockType.where(:name => 'richtext').first.id
+            b.value = node.to_s                        
+            b.save
+          when 'table'
+            b.block_type_id = BlockType.where(:name => 'richtext').first.id
+            b.value = node.to_s                        
+            b.save            
+        end                    
+        sort_order = sort_order + 1
+      end
+      
+      paragraphs.each do |p|
+        self.parse_paragraph(p, domain)
+      end
+      
+      # Now delete the original block      
+      block.destroy
+      block = Block.find(new_first_block_id)
+      return block
+
+    end
+    
+    def self.parse_paragraph(block, domain)
+            
+      page = Nokogiri::HTML(block.value)
+      return if page.css('img').count == 0
+      
+      image_count = page.css('img').count
+      sort_order = block.sort_order
+      
+      # Increment the sort order of any blocks after and including the current one      
+      i = 0
+      block.parent.children.where('sort_order >= ?', block.sort_order).reorder(:sort_order).all.each do |b2|
+        b2.sort_order = sort_order + image_count + i
+        b2.save
+        i = i + 1                  
+      end
+      
+      # Create blocks for each image
+      i = 0
+      image_block_type_id = BlockType.where("name = ? and parent_id is null", 'image').first.id
+      page.css('img').each do |node|
+        b = Block.create(          
+          :page_id       => block.page_id,              
+          :parent_id     => block.parent_id,
+          :block_type_id => image_block_type_id,
+          :sort_order    => sort_order + i
+        )
+        b.create_children
+        
+        # Set the alignment
+        if node['align'] && node['align'].length > 0
+          align = node['align']
+          align[0] = align[0].capitalize
+          b.child('align').update_attribute(:value, align)
+        end
+        
+        # Download the image
+        src = node['src']
+        src = "http://#{domain}#{src}" if src.starts_with?('/')        
+        img = b.child('image_src')
+        img.image = URI.parse(src)
+        img.save
+        
+        #b.child('image_style'   ).update_attribute(:value, )
+        #b.child('link'          ).update_attribute(:value, )
+        #b.child('width'         ).update_attribute(:value, )
+        #b.child('height'        ).update_attribute(:value, )
+        #b.child('margin_top'    ).update_attribute(:value, )
+        #b.child('margin_bottom' ).update_attribute(:value, )
+        #b.child('margin_right'  ).update_attribute(:value, )
+        #b.child('margin_left'   ).update_attribute(:value, )
+                     
+        i = i + 1        
+      end
+      
+      # Now remove any images from the paragraph
+      page.search('.//img').remove
+      block.value = page.to_s
+      block.save
+      
+    end
+  end
+end

data/app/views/caboose/blocks/_heading.html.erb

@@ -4,4 +4,5 @@ text = block.child('text').value
 size = 1 if size.nil?
 text = (empty_text ? empty_text : "") if text.nil? || text == ""
 
-%><h<%= size %>><%= raw text %></h<%= size %>>
+if editing %><div id='block_<%= block.id %>'><h<%= size %>><%= raw text %></h<%= size %>></div><% 
+else       %><h<%= size %> id='block_<%= block.id %>'><%= raw text %></h<%= size %>><% end %>

data/app/views/caboose/blocks/_layout_left_sidebar_content.html.erb

@@ -1,8 +1,7 @@
 <div class="content_wrapper" id='block_<%= block.id %>'>          
-  <div class="content_body">                      
-    <% if block.children.count > 0 %>
-      <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>
-    <% end %>                          
-    <% if editing %><%= raw block.child_block_link %><% end %>    
+  <div class="content_body">    
+    <% if editing %><div class='sortable'><% end %>        
+    <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>
+    <% if editing %></div><% end %>        
   </div>
 </div>

data/app/views/caboose/blocks/admin_edit.html.erb

@@ -98,10 +98,7 @@ $(document).ready(function() {
 </script>
 <% if @block.block_type.field_type == 'richtext' %>
   <script src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>    
-  <%= tinymce :caboose, 
-    :width => '800px', 
-    :height => '300px' 
-  %>
+  <%= tinymce :caboose, :width => '800px', :height => '300px' %>
 <% end %>
 
 <% end %>

data/app/views/caboose/blocks/admin_edit_heading.html

@@ -0,0 +1,52 @@
+<%
+crumbs = []
+b = @block
+while b
+  href    = b.id == @block.id ? "#" : "/admin/pages/#{b.page_id}/blocks/#{b.id}/edit"
+  onclick = b.id == @block.id ? " onclick=\"$('#block_#{@block.id}_block_type_id_container').slideToggle(100, function() { modal.autosize(); });\"" : ''
+  text = b.name ? "#{b.block_type.description} (#{b.name})" : b.block_type.description  
+  crumbs << "<a href=\"#{href}\"#{onclick}>#{text}</a>"     
+  b = b.parent
+end
+%>
+<h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
+<p id='block_type_container'><div id='block_<%= @block.id %>_block_type_id'></div></p>                                                
+<p><div id='block_<%= b.child('style').id %>_value'></div></p>
+<p><div id='block_<%= b.child('size').id  %>_value'></div></p>
+<p><div id='block_<%= b.child('text').id  %>_value'></div></p>
+
+<div id='message'></div>
+<p>  
+<input type='button' value='Close' onclick="modal.close();" />
+<input type='button' value='Delete Block' onclick="controller.delete_block();" />
+<input type='button' value='Move Up'   onclick="controller.move_up();" />
+<input type='button' value='Move Down' onclick="controller.move_down();" />
+</p>
+
+<% content_for :caboose_css do %>
+<style type='text/css'>
+.block { border: #ccc 1px dotted; }
+#block_<%= @block.id %>_block_type_id_container { }
+</style>
+<% end %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<%= javascript_include_tag "caboose/admin_block_edit" %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+    
+var controller = false;
+$(document).ready(function() {
+  controller = new BlockController({
+    block: <%= raw Caboose.json(@block.js_hash) %>,    
+    authenticity_token: '<%= form_authenticity_token %>',
+    modal: modal    
+  });    
+});    
+
+</script>
+<% end %>

data/app/views/caboose/blocks/admin_new.html.erb

@@ -16,6 +16,8 @@ b = @block
 <h1>New Block</h1>
 <form action='/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>' method='post' id='new_block_form' onsubmit="add_child_block(); return false;">
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
+<% if @before_id %><input type='hidden' name='before_id' value='<%= @before_id %>' /><% end %>
+<% if @after_id  %><input type='hidden' name='after_id'  value='<%= @after_id  %>' /><% end %>
 <p><select name='block_type_id'>
 <option value=''>-- Select a block type --</option>
 <% Caboose::BlockType.where("parent_id is null").reorder(:name).all.each do |bt| %>

data/app/views/caboose/pages/admin_edit_content.html.erb

@@ -1,5 +1,6 @@
 
 <% content_for :caboose_css do %>
+<%= stylesheet_link_tag 'jquery.ui.all' %>
 <style type='text/css'>
 #tiny_header {
   display: block;  
@@ -19,11 +20,29 @@
   color: #fff;
   padding: 16px 10px;  
 }
-.block_over { background: #fff799; }
+.block_over { background: #e3e3e3; }
+.sort_handle   { display: none; }
+.delete_handle { display: none; }
+.block_over .sort_handle   { display: block; position: relative; }
+.block_over .delete_handle { display: block; position: relative; }
+.block_over .sort_handle   span { position: absolute; top: 0; right: 18px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+.block_over .delete_handle span { position: absolute; top: 0; right:  0px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+
+.new_block_link { position: relative; width: 100%; }
+.new_block_link .line { position: absolute; top: -11px; width: 100%; height: 2px; background: transparent; }
+.new_block_link a { position: absolute; top: -20px; left: 45%; background: transparent; color: transparent; display: block; padding: 4px 8px; }
+
+.new_block_link_over { position: relative; width: 100%; }
+.new_block_link_over .line { position: absolute; top: -11px; width: 100%; height: 2px; background: #ccc; }
+.new_block_link_over a { position: absolute; top: -22px; left: 45%; color: #fff; background: #666; display: block; padding: 2px 4px; text-decoration: none; font-size: 12px; }
+
+.caboose_note { padding: 10px 20px; background: #990000; color: #fff; font-size: 16px; }
+
 </style>
 <% end %>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag 'jquery.ui.all' %>
 <%= javascript_include_tag 'caboose/admin_page_edit_content' %>
 <script type='text/javascript'>
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.41'
+  VERSION = '0.4.42'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.41
+  version: 0.4.42
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -293,6 +293,7 @@ files:
 - app/models/caboose/post.rb
 - app/models/caboose/post_category.rb
 - app/models/caboose/post_category_membership.rb
+- app/models/caboose/rich_text_block_parser.rb
 - app/models/caboose/role.rb
 - app/models/caboose/role_membership.rb
 - app/models/caboose/role_permission.rb
@@ -348,6 +349,7 @@ files:
 - app/views/caboose/blocks/admin_edit_h4.html.erb
 - app/views/caboose/blocks/admin_edit_h5.html.erb
 - app/views/caboose/blocks/admin_edit_h6.html.erb
+- app/views/caboose/blocks/admin_edit_heading.html
 - app/views/caboose/blocks/admin_edit_richtext.html.erb
 - app/views/caboose/blocks/admin_new.html.erb
 - app/views/caboose/blocks/admin_render_second_level.json.erb