caboose-cms 0.3.129 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI5NDBjM2Q4OWEyMTRhZGZmZjQ0OTMxYmE2OTQ4YmI3NGRiMzU4NA==
+    ZDYwMjExOGUxOTgxZGM1ZWI4ZDkxNTBmZTg2NzEyN2MwODRhMGU2MA==
   data.tar.gz: !binary |-
-    NjAyNjUwZDczNWNiMTg4YmYwNzI3YTA5YjU4MDY1ZmM5YzAyZWVhNA==
+    OWVkZDNiNDdmZGI5ZjZmMzEyZjE4MmM2NWNhZWM2NTc1MWM1YWZiNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmIzYTY3ZDliZWU2ZmQxMmIzMDgwMzFjMmU2MDA2YzQ0MDA1ZTQ4YjgyM2Yz
-    MDljYTkwNDI1NzY5MWUxNTZiMWYyYzU1NTg3NTI0YTYyNTFhZWU1Mzk4ZDJh
-    NjczNTA0NmEwN2E1MjBkNTliOGZmY2I2YTVkMzg2MzBhZmVkZjA=
+    MTE1OTdkZTA4YTFkMDE5NWJmNDIxODUwZjM3ZDM4NDQ0ZTZjMWFlMmY1NTFi
+    Yjc2Y2ViNzY2MWQwZGNlMmM3YjA3NjEwZGQ5YmQ3MzUwMGJlM2Y3MTVhNzk0
+    OWIwODkwNmQzY2YzZjlhNzUzYTJiNTlhOWIxNTA1ZTZhMjdhMjA=
   data.tar.gz: !binary |-
-    ZGU3NzgxNDljNWQ2M2U5NDhjZDMyMjQ5ZmEzNDhlODAwN2UyNDAwYmFjMDVk
-    NDMyYzZjMWQwOWRmYjdkMWU1MTYxZjU1OWY3ZDBjMTk5NWYxZThhOGM2NmU3
-    MzA1MDQzOWYwNzQyNzQ2YzQ0ZWQ3N2U3MzgyZjUyM2I3YmI2Yzk=
+    Yjg1YWUxMzNlYWFmMWYzYzdiYmIyN2NkZmEyYWE3YWM0MDk3NWViYjQwYzUx
+    MmE3ODA3N2Y0NDllMjEzYTgwZjNjMzQ2NzJjOWFmYWUyMTBhOThhNTNlYjc2
+    MzliN2RiM2UxYWM2NjBmNzFhNDA1ZGQ3MjQ0ZmVhNGQ4ODNhY2U=

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

@@ -0,0 +1,267 @@
+
+var BlockController = function(options) { this.init(options) };
+
+BlockController.prototype = {
+
+  block: false,  
+  authenticity_token: false,
+  //new_block_type_id: false,
+  block_types: false,
+  
+  init: function(options)
+  {
+    for (var thing in options)
+      this[thing] = options[thing];
+
+    this.set_block_type_editable();
+    this.set_block_value_editable(this.block);
+    this.set_child_blocks_editable();
+    this.set_clickable();
+  },
+    
+  edit_block: function(block_id)
+  {
+    window.location = '/admin/pages/' + this.block.page_id + '/blocks/' + block_id + '/edit';    
+  },    
+    
+  /*****************************************************************************
+  Block Rendering
+  *****************************************************************************/
+
+  set_clickable: function()
+  {        
+    var that = this;                
+    $.ajax({      
+      url: '/admin/pages/' + this.block.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;        
+    $('#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);
+      });
+    }    
+    if (show_mouseover)
+    {
+      $('#block_' + b.id).mouseover(function(el) { $('#block_' + b.id).addClass(   'block_over'); });
+      $('#block_' + b.id).mouseout(function(el)  { $('#block_' + b.id).removeClass('block_over'); }); 
+    }    
+  },
+
+  /****************************************************************************/
+
+  set_block_type_editable: function()
+  {        
+    var that = this;
+    var b = this.block;    
+    m = new ModelBinder({
+      name: 'Block',
+      id: b.id,
+      update_url: '/admin/pages/' + b.page_id + '/blocks/' + b.id,
+      authenticity_token: that.authenticity_token,
+      attributes: [{      
+        name: 'block_type_id',
+        nice_name: 'Block type',
+        type: 'select',
+        value: b.block_type_id,             
+        text: b.block_type.name,                  
+        width: 200,
+        fixed_placeholder: true,
+        options_url: '/admin/block-types/options',
+        after_update: function() { parent.controller.render_blocks(); window.location.reload(true); },
+        after_cancel: function() { parent.controller.render_blocks(); window.location.reload(true); }
+      }]
+    });
+    $('#block_' + b.id + '_block_type_id_container').hide();
+  },
+  
+  set_block_value_editable: function(b)
+  {
+    var that = this;    
+    var bt = b.block_type;
+    if (b.block_type.field_type == 'block') 
+      return;
+        
+    var h = {
+      name: 'value',
+      type: bt.field_type,      
+      nice_name: bt.description ? bt.description : bt.name,
+      width: bt.width ? bt.width : 780,      
+      after_update: function() { parent.controller.render_blocks(); },
+      after_cancel: function() { parent.controller.render_blocks(); }
+    };     
+    h['value'] = b.value
+    if (bt.field_type == 'checkbox')       h['value'] = b.value ? 'true' : 'false';
+    if (bt.field_type == 'image')          h['value'] = b.image.tiny_url;
+    if (bt.field_type == 'file')           h['value'] = b.image.url;                
+    if (bt.field_type == 'select')         h['text'] = b.value;
+    if (bt.height)                         h['height'] = bt.height;
+    if (bt.fixed_placeholder)              h['fixed_placeholder'] = bt.fixed_placeholder;      
+    if (bt.options || bt.options_function) h['options_url'] = '/admin/block-types/' + bt.id + '/options';
+    else if (bt.options_url)               h['options_url'] = bt.options_url;
+    if (bt.field_type == 'file')           h['update_url'] = '/admin/pages/' + b.page_id + '/blocks/' + b.id + '/file';
+    if (bt.field_type == 'image')
+    {
+      h['update_url'] = '/admin/pages/' + b.page_id + '/blocks/' + b.id + '/image'
+      h['image_refresh_delay'] = 100;
+    }
+        
+    m = new ModelBinder({
+      name: 'Block',
+      id: b.id,
+      update_url: '/admin/pages/' + b.page_id + '/blocks/' + b.id,
+      authenticity_token: that.authenticity_token,
+      attributes: [h]            
+    });
+  },
+    
+  set_child_blocks_editable: function()
+  {
+    var that = this;
+    $.each(this.block.children, function(i, b) {
+      var bt = b.block_type;      
+      if (bt.field_type == 'block' || bt.field_type == 'richtext')
+      {
+        //$('#block_' + b.id).attr('onclick','').unbind('click');    
+        //$('#block_' + b.id).click(function(e) {
+        //  window.location = '/admin/pages/' + b.page_id + '/blocks/' + b.id + '/edit';               
+        //});
+      }
+      else
+        that.set_block_value_editable(b);           
+    });
+  },
+  
+  add_child_block: function(block_type_id)
+  {
+    var that = this;
+    if (!this.block_types)
+    {
+      modal.autosize("<p class='loading'>Getting block types...</p>");
+      $.ajax({
+        url: '/admin/block-types/options',
+        type: 'get',
+        success: function(resp) {
+          that.block_types = resp;
+          that.add_child_block();
+        }
+      });
+      return;
+    }        
+    if (!block_type_id)
+    {
+      var select = $('<select/>').attr('id', 'new_block_type_id');
+      $.each(this.block_types, function(i, bt) {
+        var opt = $('<option/>').val(bt.value).html(bt.text);
+        select.append(opt);
+      });            
+      var p = $('<p/>').addClass('note warning')
+        .append("Select a type of page block: ")
+        .append(select)
+        .append("<br/>")
+        .append($('<input/>').attr('type','button').val('Confirm Add Block').click(function() { that.add_child_block($('#new_block_type_id').val()) })).append(' ')
+        .append($('<input/>').attr('type','button').val('Cancel').click(function() { $('#message').empty(); modal.autosize(); }));
+      modal.autosize(p);
+      return;
+    }
+    modal.autosize("<p class='loading'>Adding block...</p>");
+    $.ajax({
+      url: '/admin/pages/' + that.block.page_id + '/blocks/' + that.block.id,
+      type: 'post',
+      data: { block_type_id: block_type_id },
+      success: function(resp) {
+        if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+        if (resp.block) window.location.reload(true);
+      }
+    });
+  },
+
+  delete_block: function(confirm)
+  {
+    var that = this;
+    if (!confirm)
+    {
+      var p = $('<p/>').addClass('note warning')
+        .append("Are you sure you want to delete the block? This can't be undone.<br />")      
+        .append($('<input/>').attr('type','button').val('Yes').click(function() { that.delete_block(true); })).append(' ')
+        .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); modal.autosize(); }));
+      modal.autosize(p);
+      return;
+    }
+    modal.autosize("<p class='loading'>Deleting block...</p>");
+    $.ajax({
+      url: '/admin/pages/' + that.block.page_id + '/blocks/' + that.block.id,
+      type: 'delete',    
+      success: function(resp) {
+        if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+        if (resp.redirect) 
+        {
+          parent.controller.render_blocks();
+          modal.close();
+        }
+      }
+    });
+  },
+  
+  move_up: function()
+  {
+    var that = this;
+    modal.autosize("<p class='loading'>Moving up...</p>");
+    $.ajax({
+      url: '/admin/pages/' + that.block.page_id + '/blocks/' + that.block.id + '/move-up',
+      type: 'put',    
+      success: function(resp) {
+        if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+        if (resp.success) 
+        {
+          modal.autosize("<p class='note success'>" + resp.success + "</p>");          
+          parent.controller.render_blocks();
+        }
+      }
+    });    
+  },
+  
+  move_down: function()
+  {
+    var that = this;
+    modal.autosize("<p class='loading'>Moving down...</p>");
+    $.ajax({
+      url: '/admin/pages/' + that.block.page_id + '/blocks/' + that.block.id + '/move-down',
+      type: 'put',    
+      success: function(resp) {
+        if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+        if (resp.success) 
+        {
+          modal.autosize("<p class='note success'>" + resp.success + "</p>");          
+          parent.controller.render_blocks();
+        }
+      }
+    });    
+  }
+};

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

@@ -10,16 +10,17 @@ PageContentController.prototype = {
   {
     this.page_id = page_id;
     var that = this;
-    this.render_blocks(function() {
-      that.sortable_blocks();
-      that.draggable_blocks();
-    });
+    that.set_clickable();   
+    //this.render_blocks(function() {
+    //  that.sortable_blocks();
+    //  that.draggable_blocks();
+    //});
   },
   
   sortable_blocks: function()
   { 
     var that = this;
-    $('#pageblocks').sortable({
+    $('#blocks').sortable({
       //hoverClass: "ui-state-active",
       placeholder: 'sortable-placeholder',
       forcePlaceholderSize: true,
@@ -33,7 +34,7 @@ PageContentController.prototype = {
           $.ajax({
             url: '/admin/pages/' + that.page_id + '/blocks',
             type: 'post',
-            data: { page_block_type_id: that.new_block_type_id, index: ui.item.index() },
+            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;
@@ -43,7 +44,7 @@ PageContentController.prototype = {
           $.ajax({
             url: '/admin/pages/' + that.page_id + '/block-order',
             type: 'put',
-            data: $('#pageblocks').sortable('serialize', { key: "block_ids[]" }),
+            data: $('#blocks').sortable('serialize', { key: "block_ids[]" }),
             success: function(resp) {}
           });
         }
@@ -55,7 +56,7 @@ PageContentController.prototype = {
   {
     $('#new_blocks li').draggable({
       dropOnEmpty: true,
-      connectToSortable: "#pageblocks",
+      connectToSortable: "#blocks",
       helper: "clone",
       revert: "invalid"    
     });    
@@ -66,6 +67,11 @@ PageContentController.prototype = {
     caboose_modal_url('/admin/pages/' + this.page_id + '/blocks/' + block_id + '/edit');    
   },
   
+  new_block: function(block_id)
+  {
+    caboose_modal_url('/admin/pages/' + this.page_id + '/blocks/' + block_id + '/new');    
+  },
+  
   delete_block: function(block_id, confirm)
   {
     var that = this;        
@@ -76,8 +82,8 @@ PageContentController.prototype = {
         .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); }));
-      $('#pageblock_' + block_id).attr('onclick','').unbind('click');
-      $('#pageblock_' + block_id).empty().append(p);
+      $('#block_container_' + block_id).attr('onclick','').unbind('click');
+      $('#block_container_' + block_id).empty().append(p);
       return;
     }
     $.ajax({
@@ -92,51 +98,71 @@ PageContentController.prototype = {
   /*****************************************************************************
   Block Rendering
   *****************************************************************************/
-
-  render_blocks: function(after)
-  {
-    $('#pageblocks').empty();    
-    var that = this;
-    $.ajax({      
-      url: '/admin/pages/' + this.page_id + '/blocks/render?empty_text=[Empty, click to edit]',
+  
+  render_blocks: function() {
+    var that = this;                
+    $.ajax({
+      url: '/admin/pages/' + this.page_id + '/blocks/render-second-level',
       success: function(blocks) {
+        $(blocks).each(function(i, b) {
+          $('#block_' + b.id).replaceWith(b.html);
+        });
+        that.set_clickable();
+      }
+    });
+  },
+         
+  set_clickable: function()
+  {        
+    var that = this;                
+    $.ajax({      
+      url: '/admin/pages/' + this.page_id + '/blocks/tree',
+      success: function(blocks) {        
         $(blocks).each(function(i,b) {
-          $('#pageblocks')
-            .append($('<li/>')
-              .attr('id', 'pageblock_container_' + b.id)                                          
-              .append($('<a/>').attr('id', 'pageblock_' + b.id + '_sort_handle'  ).addClass('sort_handle'  ).append($('<span/>').addClass('ui-icon ui-icon-arrow-2-n-s')))
-              .append($('<a/>').attr('id', 'pageblock_' + 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', 'pageblock_' + b.id).addClass('page_block'))
-            );
-        });                
-        $(blocks).each(function(i,b) { that.render_block_html(b.id, b.html); });                        
-        if (after) after();
+          that.set_clickable_helper(b);                      
+        });
       }
     });    
   },
   
-  render_block: function(block_id, after)
+  set_clickable_helper: function(b)
   {    
-    var that = this;
-    $.ajax({
-      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id + '/render?empty_text=[Empty, click to edit]',
-      success: function(html) {
-        that.render_block_html(block_id, html);
-        if (after) after();
-      }
+    var that = this;        
+    $('#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);
+      });
+    }    
+    if (show_mouseover)
+    {
+      $('#block_' + b.id).mouseover(function(el) { $('#block_' + b.id).addClass(   'block_over'); });
+      $('#block_' + b.id).mouseout(function(el)  { $('#block_' + b.id).removeClass('block_over'); }); 
+    }    
+  }    
   
-  render_block_html: function(block_id, html)
-  {        
-    var that = this;    
-    $('#pageblock_' + block_id).empty().html(html);
-    $('#pageblock_' + block_id).attr('onclick','').unbind('click');    
-    $('#pageblock_' + block_id).click(function(e) { that.edit_block(block_id); });
-  }        
 };
 
-function toggle_page_blocks()
+function toggle_blocks()
 {
   $('#new_blocks_container2').slideToggle();
-}
+}
+
+