caboose-cms 0.3.129 → 0.4.1

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

@@ -0,0 +1,164 @@
+
+var PageContentController = function(page_id) { this.init(page_id); };
+
+PageContentController.prototype = {
+
+  page_id: false,    
+  new_block_type_id: false,
+  
+  init: function(page_id)
+  {
+    this.page_id = page_id;
+    var that = this;
+    //this.render_blocks(function() {
+    //  that.sortable_blocks();
+    //  that.draggable_blocks();
+    //});
+  },
+  
+  sortable_blocks: function()
+  { 
+    var that = this;
+    $('#blocks').sortable({
+      //hoverClass: "ui-state-active",
+      placeholder: 'sortable-placeholder',
+      forcePlaceholderSize: true,
+      handle: '.sort_handle',
+      receive: function(e, ui) {      
+        that.new_block_type_id = ui.item.attr('id').replace('new_block_', '');    
+      },
+      update: function(e, ui) {        
+        if (that.new_block_type_id)
+        {
+          $.ajax({
+            url: '/admin/pages/' + that.page_id + '/blocks',
+            type: 'post',
+            data: { block_type_id: that.new_block_type_id, index: ui.item.index() },
+            success: function(resp) { that.render_blocks(function() { that.edit_block(resp.block.id); }); }
+          });                    
+          that.new_block_type_id = false;
+        }
+        else
+        {        
+          $.ajax({
+            url: '/admin/pages/' + that.page_id + '/block-order',
+            type: 'put',
+            data: $('#blocks').sortable('serialize', { key: "block_ids[]" }),
+            success: function(resp) {}
+          });
+        }
+      }
+    });
+  },
+  
+  draggable_blocks: function() 
+  {
+    $('#new_blocks li').draggable({
+      dropOnEmpty: true,
+      connectToSortable: "#blocks",
+      helper: "clone",
+      revert: "invalid"    
+    });    
+  },
+    
+  edit_block: function(block_id)
+  {
+    caboose_modal_url('/admin/pages/' + this.page_id + '/blocks/' + block_id + '/edit');    
+  },
+  
+  delete_block: function(block_id, confirm)
+  {
+    var that = this;        
+    if (!confirm)
+    {
+      var p = $('<p/>')
+        .addClass('note warning')
+        .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);
+      return;
+    }
+    $.ajax({
+      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id,
+      type: 'delete',
+      success: function(resp) {
+        that.render_blocks();      
+      }
+    });    
+  },
+    
+  /*****************************************************************************
+  Block Rendering
+  *****************************************************************************/
+
+  render_blocks: function(after)
+  {
+    $('#blocks').empty();    
+    var that = this;
+    $.ajax({      
+      url: '/admin/pages/' + this.page_id + '/blocks/render?empty_text=[Empty, click to edit]',
+      success: function(blocks) {
+        if (blocks.length == 0)
+        {
+          $('#blocks').parent().append("<p>This page is empty.  Please add a new block.</p>");
+        }          
+        $(blocks).each(function(i,b) {
+          $('#blocks')
+            .append($('<li/>')
+              .attr('id', 'block_container_' + b.id)                                          
+              //.append($('<a/>').attr('id', 'block_' + b.id + '_sort_handle'  ).addClass('sort_handle'  ).append($('<span/>').addClass('ui-icon ui-icon-arrow-2-n-s')))
+              //.append($('<a/>').attr('id', 'block_' + b.id + '_delete_handle').addClass('delete_handle').append($('<span/>').addClass('ui-icon ui-icon-close')).click(function(e) { e.preventDefault(); that.delete_block(b.id); }))
+              //.append($('<div/>').attr('id', 'block_' + b.id).addClass('block'))
+            );
+        });                
+        $(blocks).each(function(i,b) { 
+          that.render_block_html(b.id, b.html); 
+        });
+        that.set_clickable();        
+        if (after) after();
+      }
+    });    
+  },
+  
+  render_block_html: function(block_id, html)
+  {        
+    var that = this;    
+    $('#block_container_' + block_id).empty().html(html);    
+  },
+  
+  set_clickable: function()
+  {        
+    var that = this;                
+    $.ajax({      
+      url: '/admin/pages/' + this.page_id + '/blocks/tree',
+      success: function(blocks) {        
+        $(blocks).each(function(i,b) {
+          that.set_clickable_helper(b);                      
+        });
+      }
+    });    
+  },
+  
+  set_clickable_helper: function(b)
+  {
+    var that = this;    
+    if (!b.children || b.children.length == 0)
+    {      
+      $('#block_' + b.id).attr('onclick','').unbind('click');    
+      $('#block_' + b.id).click(function(e) { that.edit_block(b.id); });
+    }
+    else
+    {      
+      $.each(b.children, function(i, b2) {
+        that.set_clickable_helper(b2);
+      });
+    }
+  }
+};
+
+function toggle_blocks()
+{
+  $('#new_blocks_container2').slideToggle();
+}

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

@@ -15,15 +15,15 @@ PageContentEditor.prototype = {
   add_controls: function(id)
   {
     var that = this;
-    //$('#pageblock_controls').empty();          
-    //$('#pageblock_controls')
+    //$('#block_controls').empty();          
+    //$('#block_controls')
     //  .append($('<h2/>').attr('id', 'edit_blocks_header').html('Edit Blocks'))
     //  .append($('<div/>').addClass('content').append($('<p/>').html('Select a block to edit.')));
-    $('#pageblocks').selectable({ 
+    $('#blocks').selectable({ 
       filter: "li", 
       cancel: ".handle",
       selected: function(e, ui) {
-        var block_id = ui.selected.id.replace("pageblock_container_", "");
+        var block_id = ui.selected.id.replace("block_container_", "");
         that.edit_block(block_id);         
       }
     });              

data/app/assets/stylesheets/caboose/admin_page_edit_content.css

@@ -1,22 +1,22 @@
 
-#content .page_block h1 {
+#content .block h1 {
   background: transparent;
   border-bottom: none;
 }
 
-#pageblocks { list-style: none; margin: 0 20px 0 -20px; padding: 0; min-height: 100px; }
-#pageblocks > li { list-style: none; margin: 0; padding: 0; position: relative; }
-#pageblocks > li:hover { background: #fff799; }
-#pageblocks .ui-selecting { background: #ddd; }
-#pageblocks .ui-selected  { background: #fff799; }
-#pageblocks .sortable-placeholder { height: 40px; background: #fff799; border: #ccc 1px solid; }
+#blocks { list-style: none; margin: 0 20px 0 -20px; padding: 0; min-height: 100px; }
+#blocks > li { list-style: none; margin: 0; padding: 0; position: relative; }
+#blocks > li:hover { background: #fff799; }
+#blocks .ui-selecting { background: #ddd; }
+#blocks .ui-selected  { background: #fff799; }
+#blocks .sortable-placeholder { height: 40px; background: #fff799; border: #ccc 1px solid; }
 
-#pageblocks li .sort_handle   { display: none; }
-#pageblocks li .delete_handle { display: none; }
-#pageblocks li:hover .sort_handle   { position: absolute; top: 0; right: 22px; display: block; width: 20px; height: 20px; background-color: #ccc; }
-#pageblocks li:hover .delete_handle { position: absolute; top: 0; right:  0px; display: block; width: 20px; height: 20px; background-color: #ccc; }
-#pageblocks li:hover .sort_handle   span { margin: 2px 1px; }
-#pageblocks li:hover .delete_handle span { margin: 2px 1px; }
+#blocks li .sort_handle   { display: none; }
+#blocks li .delete_handle { display: none; }
+#blocks li:hover .sort_handle   { position: absolute; top: 0; right: 22px; display: block; width: 20px; height: 20px; background-color: #ccc; }
+#blocks li:hover .delete_handle { position: absolute; top: 0; right:  0px; display: block; width: 20px; height: 20px; background-color: #ccc; }
+#blocks li:hover .sort_handle   span { margin: 2px 1px; }
+#blocks li:hover .delete_handle span { margin: 2px 1px; }
 
 .sortable_placeholder {
   background: #ccc;
@@ -24,17 +24,17 @@
   width: 100%;  
 }
 
-.page_block.over {
+.block.over {
   background: #fef49c;
 }
 
-.page_block {
+.block {
   z-index: 19;  
   border: transparent 1px solid;
   margin: 0 0 2px 20px;
 }
 
-#page_block_new {  
+#block_new {  
   border: #ccc 1px solid;
   padding: 10px;
   background: #fef49c;
@@ -61,3 +61,24 @@
 #new_blocks_container2 input { margin-left: 28px; }
 #new_blocks { list-style: none; margin: 0; padding: 0; }
 #new_blocks li { list-style: none; margin: 2px; padding: 4px; background: #eee; border: #ccc 1px solid; text-align: left; }
+
+/*********************************/
+
+#content h1#page_title { 
+  position: absolute;
+  top: -36px;
+  left: 60px;
+  background: transparent;
+  margin: 0;
+  padding: 0;
+  color: #fff;
+  border: 0;
+  font-size: 20pt;
+}
+#tabs { display: none; }
+#content2 { margin-left: 0; }
+.block { border: #ccc 1px dotted; }
+#new_blocks_container1 {
+  top: -58px;
+  right: 250px;
+}

data/app/controllers/caboose/block_types_controller.rb

@@ -0,0 +1,162 @@
+
+module Caboose
+  class BlockTypesController < ApplicationController
+    
+    #===========================================================================
+    # Admin actions
+    #===========================================================================
+    
+    # GET /admin/block-types
+    def admin_index
+      return if !user_is_allowed('pages', 'view')
+      @block_types = BlockType.where("parent_id is null or parent_id = 0").reorder(:name).all
+      render :layout => 'caboose/admin'      
+    end
+    
+    # GET /admin/block-types/:id
+    def admin_show
+      return if !user_is_allowed('pages', 'view')
+      block_type = BlockType.find(params[:id])
+      render :json => block_type      
+    end
+
+    # GET /admin/block-types/new
+    # GET /admin/block-types/:id/new
+    def admin_new
+      return unless user_is_allowed('pages', 'add')      
+      @block_type = BlockType.new
+      @parent_id = params[:id]
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/block-types/:id/edit
+    def admin_edit
+      return unless user_is_allowed('pages', 'edit')      
+      @block_type = BlockType.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+    
+    # POST /admin/block-types
+    def admin_create
+      return unless user_is_allowed('pages', 'add')
+
+      resp = Caboose::StdClass.new({
+          'error' => nil,
+          'redirect' => nil
+      })
+
+      bt = BlockType.new(
+        :parent_id           => params[:parent_id] ? params[:parent_id] : nil,
+        :name                => params[:name].downcase.gsub(' ', '_'),
+        :description         => params[:name],                                                                
+        :field_type          => params[:field_type],
+        :allow_child_blocks  => true        
+      )       
+      bt.save      
+      
+      # Send back the response
+      resp.redirect = "/admin/block-types/#{bt.id}/edit"
+      render :json => resp
+    end
+    
+    # PUT /admin/block-types/:id
+    def admin_update
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      bt = BlockType.find(params[:id])
+      save = true      
+
+      params.each do |k,v|
+        case k
+          when 'parent_id'                       then bt.parent_id                      = v
+          when 'name'                            then bt.name                           = v
+          when 'description'                     then bt.description                    = v
+          when 'render_function'                 then bt.render_function                = v
+          when 'use_render_function'             then bt.use_render_function            = v
+          when 'use_render_function_for_layout'  then bt.use_render_function_for_layout = v
+          when 'allow_child_blocks'              then bt.allow_child_blocks             = v
+          when 'name'                            then bt.name                           = v
+          when 'field_type'                      then bt.field_type                     = v                       
+          when 'default'                         then bt.default                        = v
+          when 'width'                           then bt.width                          = v
+          when 'height'                          then bt.height                         = v
+          when 'fixed_placeholder'               then bt.fixed_placeholder              = v
+          when 'options'                         then bt.options                        = v
+          when 'options_function'                then bt.options_function               = v
+          when 'options_url'                     then bt.options_url                    = v         
+        end
+      end
+    
+      resp.success = save && bt.save
+      render :json => resp
+    end
+    
+    # DELETE /admin/block-types/:id
+    def admin_delete
+      return unless user_is_allowed('pages', 'delete')                  
+      BlockType.find(params[:id]).destroy            
+      resp = StdClass.new({
+        'redirect' => "/admin/block-types"
+      })
+      render :json => resp
+    end
+    
+    # GET /admin/block-types/field-type-options
+    def admin_field_type_options
+      return unless user_is_allowed('pages', 'edit')      
+      options = [ 
+        { 'value' => 'checkbox'           , 'text' => 'Checkbox'                     }, 
+        { 'value' => 'checkbox_multiple'  , 'text' => 'Checkbox (multiple)'          }, 
+        { 'value' => 'image'              , 'text' => 'Image'                        },
+        { 'value' => 'file'               , 'text' => 'File'                         },
+        { 'value' => 'richtext'           , 'text' => 'Rich Text'                    }, 
+        { 'value' => 'select'             , 'text' => 'Multiple choice (select box)' }, 
+        { 'value' => 'text'               , 'text' => 'Textbox'                      }, 
+        { 'value' => 'textarea'           , 'text' => 'Textarea'                     },
+        { 'value' => 'block'              , 'text' => 'Block'                        }
+      ]      
+      render :json => options
+    end
+    
+    # GET /admin/block-types/:id/options
+    def admin_value_options
+      return unless user_is_allowed('pages', 'edit')
+      bt = BlockType.find(params[:id])            
+      options = []
+      if bt.options_function
+        options = bt.render_options
+      elsif bt.options
+        options = bt.options.strip.split("\n").collect { |line| { 'value' => line, 'text' => line }}
+      end        
+      render :json => options
+    end
+    
+    # GET /admin/block-types/options
+    def admin_options
+      return unless user_is_allowed('pages', 'edit')      
+      options = BlockType.where("parent_id is null").reorder(:name).all.collect do |bt| 
+        { 'value' => bt.id, 'text' => bt.description } 
+      end      
+      render :json => options
+    end
+    
+    # GET /admin/block-types/tree-options
+    def admin_tree_options
+      return unless user_is_allowed('pages', 'edit')
+      options = []            
+      BlockType.where("parent_id is null or parent_id = 0").reorder(:name).all.each do |bt|        
+        admin_tree_options_helper(options, bt, '')         
+      end      
+      render :json => options
+    end
+    
+    def admin_tree_options_helper(options, bt, prefix)      
+      options << { 'value' => bt.id, 'text' => "#{prefix}#{bt.description}" }
+      bt.children.each do |bt2|
+        admin_tree_options_helper(options, bt2, " - #{prefix}")
+      end      
+    end
+		
+  end  
+end

data/app/controllers/caboose/blocks_controller.rb

@@ -0,0 +1,293 @@
+
+module Caboose
+  class BlocksController < ApplicationController
+    
+    #===========================================================================
+    # Admin actions
+    #===========================================================================
+    
+    # GET /admin/pages/:page_id/blocks
+    def admin_index
+      return if !user_is_allowed('pages', 'view')
+      blocks = Block.where(:page_id => params[:page_id]).reorder(:sort_order)
+      render :json => blocks      
+    end
+
+    # GET /admin/pages/:page_id/blocks/:id/new
+    # GET /admin/pages/:page_id/blocks/new
+    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])             
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /admin/pages/:page_id/blocks/:id
+    def admin_show
+      return unless user_is_allowed('pages', 'edit')      
+      block = Block.find(params[:id])
+      render :json => block      
+    end
+    
+    # GET /admin/pages/:page_id/blocks/tree
+    # GET /admin/pages/:page_id/blocks/:id/tree    
+    def admin_tree
+      return unless user_is_allowed('pages', 'edit')      
+      
+      blocks = []
+      if params[:id]
+        b = Block.find(params[:id])
+        blocks << { 'id' => b.id, 'children' => admin_tree_helper(b) }
+      else
+        Block.where("parent_id is null and page_id = ?", params[:page_id]).reorder(:sort_order).all.each do |b|      
+          blocks << { 'id' => b.id, 'allow_child_blocks' => b.block_type.allow_child_blocks, 'children' => admin_tree_helper(b) }
+        end
+      end
+      render :json => blocks
+    end
+    
+    def admin_tree_helper(b)
+      arr = []
+      b.children.each do |b2|
+        arr << { 'id' => b2.id, 'allow_child_blocks' => b2.block_type.allow_child_blocks, 'children' => admin_tree_helper(b2) }
+      end
+      return arr
+    end      
+      
+    # GET /admin/pages/:page_id/blocks/:id/render
+    def admin_render
+      return unless user_is_allowed('pages', 'edit')      
+      b = Block.find(params[:id])      
+      bt = b.block_type
+      if bt.nil?
+        bt = BlockType.where(:name => 'richtext').first 
+        b.block_type_id = bt.id
+        b.save
+      end
+      #b.create_children
+      html = b.render(b, {
+        :empty_text => params[:empty_text],
+        :editing => true
+      })
+      render :json => html            
+    end
+    
+    # GET /admin/pages/:page_id/blocks/render
+    def admin_render_all
+      return unless user_is_allowed('pages', 'edit')
+      p = Page.find(params[:page_id])
+      blocks = Block.where("page_id = ? and parent_id is null", p.id).reorder(:sort_order).collect do |b|
+        #bt = b.block_type
+        #if bt.nil?
+        #  bt = BlockType.where(:name => 'richtext').first 
+        #  b.block_type_id = bt.id
+        #  b.save
+        #end
+        #b.create_children
+        {
+          :id => b.id,
+          :block_type_id => b.block_type.id,
+          :sort_order => b.sort_order,
+          :html => b.render(b, {
+            :empty_text => params[:empty_text],
+            :editing => true
+          })        
+        }
+      end
+      render :json => blocks
+    end
+    
+    # GET /admin/pages/:page_id/blocks/render-second-level
+    def admin_render_second_level
+      return unless user_is_allowed('pages', 'edit')
+      p = Page.find(params[:page_id])
+      blocks = p.block.children.collect do |b|
+        {          
+          :id => b.id,
+          :block_type_id => b.block_type.id,
+          :sort_order => b.sort_order,
+          :html => b.render(b, {
+            :empty_text => params[:empty_text],
+            :editing => true
+          })
+        }
+      end
+      render :json => blocks
+    end
+    
+    # GET /admin/pages/:page_id/blocks/:id/edit
+    def admin_edit
+      return unless user_is_allowed('pages', 'edit')
+      @page = Page.find(params[:page_id])
+      @block = Block.find(params[:id])
+      @block.create_children
+      @modal = true      
+                    
+      #render "caboose/blocks/admin_edit_#{@block.block_type}", :layout => 'caboose/modal'
+      render :layout => 'caboose/modal'
+    end
+    
+    # POST /admin/pages/:page_id/blocks
+    # POST /admin/pages/:page_id/blocks/:id
+    def admin_create
+      return unless user_is_allowed('pages', 'add')
+
+      resp = Caboose::StdClass.new({
+          'error' => nil,
+          'redirect' => nil
+      })
+
+      b = Block.new
+      b.page_id = params[:page_id].to_i
+      b.parent_id = params[:id] ? params[:id] : nil
+      b.block_type_id = params[:block_type_id] 
+                    
+      if !params[:index].nil?      
+        b.sort_order = params[:index].to_i
+      elsif params[:after_id]
+        b2 = Block.find(params[:after_id].to_i)
+        b.sort_order = b2.sort_order + 1
+      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      
+      
+      # Save the block
+      b.save
+      
+      # Ensure that all the children are created for the block
+      b.create_children
+
+      # Send back the response
+      #resp.block = b
+      resp.redirect = "/admin/pages/#{b.page_id}/blocks/#{b.id}/edit"
+      render :json => resp
+    end
+    
+    # PUT /admin/pages/:page_id/blocks/:id
+    def admin_update
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      b = Block.find(params[:id])
+
+      save = true
+      params.each do |k,v|
+        case k
+          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                                        
+        end
+      end
+    
+      resp.success = save && b.save
+      b.create_children
+      render :json => resp      
+    end
+    
+    # POST /admin/pages/:page_id/blocks/:id/image
+    def admin_update_image
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      b = Block.find(params[:id])
+      b.image = params[:value]
+      b.save
+      resp.success = true 
+      resp.attributes = { 'value' => { 'value' => b.image.url(:tiny) }}
+      
+      render :json => resp
+    end
+    
+    # POST /admin/pages/:page_id/blocks/:id/file
+    def admin_update_file
+      return unless user_is_allowed('pages', 'edit')
+      
+      resp = StdClass.new({'attributes' => {}})
+      b = Field.find(params[:id])
+      b.file = params[:value]
+      b.save
+      resp.success = true      
+      resp.attributes = { 'value' => { 'value' => b.file.url }}
+      
+      render :json => resp
+    end
+    
+    # DELETE /admin/pages/:page_id/blocks/:id
+    def admin_delete
+      return unless user_is_allowed('pages', 'delete')
+      
+      resp = StdClass.new
+      b = Block.find(params[:id])
+      parent_id = b.parent_id
+      if b.parent_id
+        resp.redirect = "/admin/pages/#{b.page_id}/blocks/#{b.parent_id}/edit"
+      else
+        resp.close = true
+      end
+      b.destroy
+      
+      if parent_id
+        i = 0
+        Block.where(:parent_id => parent_id).reorder(:sort_order).all.each do |b2|
+          b2.sort_order = i
+          b2.save
+          i = i + 1
+        end
+      end
+
+      render :json => resp
+    end
+    
+    # PUT /admin/pages/:page_id/blocks/:id/move-up
+    def admin_move_up
+      return unless user_is_allowed('pages', 'delete')
+      
+      resp = StdClass.new
+      b = Block.find(params[:id])
+      if b.sort_order == 0
+        resp.error = "The block is already at the top."
+      else
+        b2 = Block.where("parent_id = ? and sort_order = ?", b.parent_id, b.sort_order - 1).first
+        b2.sort_order = b.sort_order
+        b2.save
+        b.sort_order = b.sort_order - 1
+        b.save
+        resp.success = "The block has been moved up successfully."
+      end
+
+      render :json => resp
+    end
+    
+    # PUT /admin/pages/:page_id/blocks/:id/move-down
+    def admin_move_down
+      return unless user_is_allowed('pages', 'delete')
+      
+      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?
+        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
+        resp.success = "The block has been moved down successfully."
+      end
+
+      render :json => resp
+    end
+		
+  end
+  
+end