caboose-cms 0.8.58 → 0.8.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 440bc611b18b2f1eb2f0a621e820b72e6ececc79
-  data.tar.gz: e09a55fef27861960533f9c9d65b61c84d7ee055
+  metadata.gz: 8854c5eb4ae1dee3f1374f0fb4d2a62068aa9760
+  data.tar.gz: b2d414cfa6f72c0fd78cafcea2de5cd26345031e
 SHA512:
-  metadata.gz: f4b4168e893ce2587c56b7dfb4602d4115e769fbc6e5fb1d88fe238e3fb83456af91825214d6f2194317c80cf8fde4d564b088b6ce5f2e28c7c715e854b2ecdc
-  data.tar.gz: 3525e34ebdc132c1298bb0264d07f94304a1250535da8ee0c3c50d6f30639532eb870afceea4c98f1cb5144091c1f1cbabdd614630eb1b68005228bd69072753
+  metadata.gz: 31d8ad0c0727e6e7fac55698f42936be2edc61195ffc7cff9697578a754a283b32029db0cf10d7ad47ce5b2b817ea84230876306dc0a605d8fd6d25012e38917
+  data.tar.gz: 4b643e9870a550a767c6878e396204cb09e1414b4b25c821364c820cabf2573b9d0bdb6fbb29eb033548a13b54c356373087ba589b114124e70950b64031ad80

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

@@ -6,80 +6,68 @@ PostContentController.prototype = {
   post_id: false,    
   new_block_type_id: false,
   selected_block_ids: [],
+  blocks: false,
+  assets_path: false,
+  included_assets: false,
   
-  init: function(post_id)
+  init: function(params)
   {
-    this.post_id = post_id;
     var that = this;
-    that.set_clickable();       
-    that.sortable_blocks();
-    //  that.draggable_blocks();
-    //});
+    for (var i in params)
+      that[i] = params[i];      
+    that.refresh_blocks(function() {
+      that.set_clickable();
+    });        
   },
   
-  sortable_blocks: function()
-  { 
-    //var that = this;
-    //$('.sortable').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/posts/' + that.post_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
-    //    {
-    //      var ids = [];
-    //      $.each($(e.target).children(), function(i, el) {
-    //        var id = $(el).attr('id');            
-    //        if (id && id.substr(0, 6) == 'block_') ids.push(id.substr(6));
-    //      });          
-    //        
-    //      $.ajax({
-    //        url: '/admin/posts/' + that.post_id + '/block-order',
-    //        type: 'put',
-    //        data: {
-    //          block_ids: ids,
-    //        },
-    //        success: function(resp) {}
-    //      });
-    //    }
-    //  }
-    //});
-  },
-  
-  draggable_blocks: function() 
+  refresh_blocks: function(callback)
   {
-    $('#new_blocks li').draggable({
-      dropOnEmpty: true,
-      connectToSortable: "#blocks",
-      helper: "clone",
-      revert: "invalid"    
+    var that = this;
+    $.ajax({
+      url: '/admin/posts/' + that.page_id + '/blocks/tree',
+      type: 'get',
+      success: function(resp) {
+        that.blocks = resp;
+        if (callback) callback();
+      }
     });    
   },
     
   edit_block: function(block_id)
   {
-    caboose_modal_url('/admin/posts/' + this.post_id + '/blocks/' + block_id + '/edit');    
+    var that = this;
+    var b = that.block_with_id(block_id);
+    var modal_controller = '';    
+    if (b.block_type.use_js_for_modal == true) {
+      if (b.name)
+        $.each(b.name.split('_'), function(j, word) { modal_controller += word.charAt(0).toUpperCase() + word.toLowerCase().slice(1); });
+      else
+        $.each(b.block_type.name.split('_'), function(j, word) { modal_controller += word.charAt(0).toUpperCase() + word.toLowerCase().slice(1); });      
+    }    
+    else if (b.block_type.field_type == 'image')    { modal_controller = 'Media';    }
+    else if (b.block_type.field_type == 'richtext') { modal_controller = 'Richtext'; }
+    else                                            { modal_controller = 'Block';    }    
+    that.modal = eval("new " + modal_controller + "ModalController({ " +
+      "  post_id: " + that.post_id + ", " +
+      "  block_id: " + block_id + ", " + 
+      "  authenticity_token: '" + that.authenticity_token + "', " + 
+      "  parent_controller: this, " +
+      "  assets_path: '" + that.assets_path + "'" +
+      "})"
+    );    
   },
   
   new_block: function(block_id)
   {
-    console.log('this.post_id = ' + this.post_id);
-    console.log('block_id = ' + block_id);    
-    caboose_modal_url('/admin/posts/' + this.post_id + '/blocks/' + block_id + '/new');    
+    var that = this;    
+    that.modal = new BlockModalController({ 
+      post_id: that.post_id,
+      block_id: parent_id,
+      authenticity_token: that.authenticity_token,
+      parent_controller: this,      
+      assets_path: that.assets_path,
+      new_block_on_init: true
+    })    
   },
   
   select_block: function(block_id)
@@ -187,35 +175,31 @@ PostContentController.prototype = {
   Block Rendering
   *****************************************************************************/
   
-  render_blocks: function(before_render) {
+  render_blocks: function(before_render) 
+  {
+    var that = this;
     $('.sortable').sortable('destroy');
     var that = this;                
     $.ajax({
-      url: '/admin/posts/' + this.post_id + '/blocks/render-second-level',
-      success: function(blocks) {
+      url: '/admin/pages/' + this.page_id + '/blocks/render-second-level',
+      success: function(blocks) {        
         if (before_render) before_render();
         $(blocks).each(function(i, b) {
           $('#block_' + b.id).replaceWith(b.html);                              
         });
-        that.set_clickable();
-        that.sortable_blocks();
+        that.refresh_blocks(function() { that.set_clickable(); });                
         that.selected_block_ids = [];
       }
     });
-  },                                                                                                                               
-         
+  },   
+  
   set_clickable: function()
-  {        
-    var that = this;                
-    $.ajax({      
-      url: '/admin/posts/' + this.post_id + '/blocks/tree',
-      success: function(blocks) {
-        var count = blocks.length;        
-        $(blocks).each(function(i,b) {
-          that.set_clickable_helper(b, false, false, (i == count-1));
-        });        
-      }
-    });    
+  {
+    var that = this;            
+    var count = that.blocks.length;        
+    $(that.blocks).each(function(i,b) {
+      that.set_clickable_helper(b, false, false, (i == count-1));
+    });                    
   },
   
   set_clickable_helper: function(b, parent_id, parent_allows_child_blocks, is_last_child)
@@ -230,15 +214,15 @@ PostContentController.prototype = {
       
     if (parent_allows_child_blocks && (!b.name || b.name.length == 0))
     {            
-      $('#block_' + b.id).prepend($('<div/>')          
+      $('#block_' + b.id).before($('<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/posts/' + that.post_id + '/blocks/' + parent_id + '/new?before_id=' + b.id);                        
+            e.preventDefault(); e.stopPropagation();           
+            that.new_block(parent_id, b.id);
           })
         )
         .mouseover(function(e) { $(this).removeClass('new_block_link').addClass('new_block_link_over'); e.stopPropagation(); })
@@ -246,15 +230,15 @@ PostContentController.prototype = {
       );
       if (is_last_child && is_last_child == true)
       {
-        $('#block_' + b.id).append($('<div/>')          
+        $('#block_' + b.id).after($('<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/posts/' + that.post_id + '/blocks/' + parent_id + '/new?after_id=' + b.id);                        
+              e.preventDefault(); e.stopPropagation();              
+              that.new_block(parent_id, null, b.id);
             })
           )
           .mouseover(function(e) { $(this).removeClass('new_block_link').addClass('new_block_link_over'); e.stopPropagation(); })
@@ -262,9 +246,11 @@ PostContentController.prototype = {
         );
       }
     }
-            
-    $('#block_' + b.id).attr('onclick','').unbind('click');    
+    
+    $('#block_' + b.id + ' *').attr('onclick', '').unbind('click');
+    $('#block_' + b.id).attr('onclick','').unbind('click');
     $('#block_' + b.id).click(function(e) {
+      e.preventDefault();
       e.stopPropagation();
       that.edit_block(b.id); 
     });
@@ -274,40 +260,41 @@ PostContentController.prototype = {
     {
       var count = b.children.length;
       $.each(b.children, function(i, b2) {        
-        if (b2.field_type == 'block')
+        if (b2.block_type.field_type == 'block')
           show_mouseover = false;
-        that.set_clickable_helper(b2, b.id, b.allow_child_blocks, i == (count-1));
+        that.set_clickable_helper(b2, b.id, b.block_type.allow_child_blocks, i == (count-1));
       });            
-    }
-    //if (b.allow_child_blocks)
-    //{      
-    //  $('#block_' + b.id).after($('<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/posts/' + that.post_id + '/blocks/' + b.id + '/new?after_id=' + b.id);                        
-    //      })
-    //    )
-    //    .mouseover(function(e) { $(this).removeClass('new_block_link').addClass('new_block_link_over'); e.stopPropagation(); })
-    //    .mouseout(function(e)  { $(this).removeClass('new_block_link_over').addClass('new_block_link'); e.stopPropagation(); })
-    //  );
-    //}
+    }    
     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'); }); 
     }    
-  }    
+  },
+  
+  /*****************************************************************************
+  Helper methods
+  *****************************************************************************/
   
+  block_with_id: function(block_id, b)
+  {
+    var that = this;                
+    if (b && b.id == block_id)
+      return b;
+    var the_block = false;
+    if ((!b && that.blocks) || (b && b.children))
+    {
+      $.each(b ? b.children : that.blocks, function(i, b2) {        
+        the_block = that.block_with_id(block_id, b2);
+        if (the_block)
+          return false;
+      });
+    }
+    return the_block;
+  }  
 };
 
 function toggle_blocks()
 {
   $('#new_blocks_container2').slideToggle();
 }
-
-

data/app/assets/javascripts/caboose/{admin_page_edit_content.js → block_content_controller.js}

@@ -1,14 +1,16 @@
  
-var PageContentController = function(params) { this.init(params); };
+var BlockContentController = function(params) { this.init(params); };
 
-PageContentController.prototype = {
+BlockContentController.prototype = {
 
+  post_id: false,
   page_id: false,    
   new_block_type_id: false,
   selected_block_ids: [],
   blocks: false,
   assets_path: false,
   included_assets: false,
+  mc: false,
   
   init: function(params)
   {
@@ -16,15 +18,16 @@ PageContentController.prototype = {
     for (var i in params)
       that[i] = params[i];      
     that.refresh_blocks(function() {
-      that.set_clickable();
-    });        
+      that.set_clickable();    
+    });
+    that.mc = new ModalController({ parent_controller: this, assets_path: that.assets_path });
   },
   
   refresh_blocks: function(callback)
   {
     var that = this;
     $.ajax({
-      url: '/admin/pages/' + that.page_id + '/blocks/tree',
+      url: that.base_url() + '/tree',
       type: 'get',
       success: function(resp) {
         that.blocks = resp;
@@ -32,55 +35,62 @@ PageContentController.prototype = {
       }
     });    
   },
-  
-  draggable_blocks: function() 
-  {
-    $('#new_blocks li').draggable({
-      dropOnEmpty: true,
-      connectToSortable: "#blocks",
-      helper: "clone",
-      revert: "invalid"    
-    });    
-  },
     
   edit_block: function(block_id)
-  {     
-    console.log('PageContentController.edit_block');
+  {
     var that = this;
     var b = that.block_with_id(block_id);
+    var bt = b.block_type;
+    var ft = bt.field_type; // == 'image' || bt.field_type == 'file' ? 'media' : bt.field_type;
+    
     var modal_controller = '';    
-    if (b.block_type.use_js_for_modal == true) {
-      if (b.name)
-        $.each(b.name.split('_'), function(j, word) { modal_controller += word.charAt(0).toUpperCase() + word.toLowerCase().slice(1); });
-      else
-        $.each(b.block_type.name.split('_'), function(j, word) { modal_controller += word.charAt(0).toUpperCase() + word.toLowerCase().slice(1); });      
-    }    
-    else if (b.block_type.field_type == 'image')    { modal_controller = 'Media';    }
-    else if (b.block_type.field_type == 'richtext') { modal_controller = 'Richtext'; }
-    else                                            { modal_controller = 'Block';    }    
-    that.modal = eval("new " + modal_controller + "ModalController({ " +
-      "  page_id: " + that.page_id + ", " +
+    if (bt.use_js_for_modal == true) { modal_controller = b.name ? b.name : bt.name; }      
+    else if (ft == 'image')          { modal_controller = 'media';    }
+    else if (ft == 'file')           { modal_controller = 'media';    }
+    else if (ft == 'richtext')       { modal_controller = 'richtext'; }
+    else                             { modal_controller = 'block';    }
+        
+    var new_modal_eval_string = "new " + that.underscores_to_camelcase(modal_controller) + "ModalController({ " +
+      "  " + (that.page_id && that.page_id != null ? "page_id: " + that.page_id : "post_id: " + that.post_id) + ", " +
       "  block_id: " + block_id + ", " + 
       "  authenticity_token: '" + that.authenticity_token + "', " + 
-      "  parent_controller: this, " +
+      "  parent_controller: that, " +
       "  assets_path: '" + that.assets_path + "'" +
-      "})"
-    );
+      "})";
+
+    var js_file = 'caboose/block_modal_controllers/' + modal_controller + '_modal_controller.js';
+    if (!that.mc.asset_included(js_file))    
+    {
+      // Include the file before instantiating the controller      
+      $(document).on(modal_controller + '_modal_controller_loaded', function() { that.modal = eval(new_modal_eval_string); });
+      that.mc.include_assets(js_file);      
+    }
+    else // We're good, go ahead and instantiate
+    {      
+      that.modal = eval(new_modal_eval_string);                  
+    }
   },
   
-  new_block: function(parent_id, before_block_id, after_block_id)
+  underscores_to_camelcase: function(str)
   {
-    console.log('PageContentController.new_block');
-    var that = this;
-    //caboose_modal_url('/admin/pages/' + this.page_id + '/blocks/' + parent_id + '/new');
-    that.modal = new BlockModalController({ 
-      page_id: that.page_id,
+    var str2 = '';
+    $.each(str.split('_'), function(j, word) { str2 += word.charAt(0).toUpperCase() + word.toLowerCase().slice(1); });
+    return str2;
+  },
+      
+  new_block: function(parent_id, before_block_id, after_block_id)
+  {    
+    var that = this;    
+    var options = {      
       block_id: parent_id,
       authenticity_token: that.authenticity_token,
       parent_controller: this,      
       assets_path: that.assets_path,
       new_block_on_init: true
-    })
+    }
+    if (that.page_id && that.page_id != null) options['page_id'] = that.page_id;
+    else                                      options['post_id'] = that.post_id;
+    that.modal = new BlockModalController(options)
   },
   
   select_block: function(block_id)
@@ -124,7 +134,7 @@ PageContentController.prototype = {
     for (var i in this.selected_block_ids)
     {               
       $.ajax({
-        url: '/admin/pages/' + this.page_id + '/blocks/' + this.selected_block_ids[i],
+        url: that.base_url() + '/' + this.selected_block_ids[i],
         type: 'delete',
         async: false,
         success: function(resp) {}
@@ -138,7 +148,7 @@ PageContentController.prototype = {
     var that = this;
     this.loadify($('#block_' + block_id + '_move_up_handle span'));    
     $.ajax({
-      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id + '/move-up',
+      url: that.base_url() + '/' + block_id + '/move-up',
       type: 'put',      
       success: function(resp) {        
         if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
@@ -151,7 +161,7 @@ PageContentController.prototype = {
     var that = this;
     this.loadify($('#block_' + block_id + '_move_down_handle span'));
     $.ajax({
-      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id + '/move-down',
+      url: that.base_url() + '/' + block_id + '/move-down',
       type: 'put',      
       success: function(resp) {        
         if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
@@ -194,7 +204,7 @@ PageContentController.prototype = {
     $('.sortable').sortable('destroy');
     var that = this;                
     $.ajax({
-      url: '/admin/pages/' + this.page_id + '/blocks/render-second-level',
+      url: that.base_url() + '/render-second-level',
       success: function(blocks) {        
         if (before_render) before_render();
         $(blocks).each(function(i, b) {
@@ -207,7 +217,7 @@ PageContentController.prototype = {
   },                                                                                                                               
          
   set_clickable: function()
-  {            
+  {
     var that = this;            
     var count = that.blocks.length;        
     $(that.blocks).each(function(i,b) {
@@ -216,9 +226,8 @@ PageContentController.prototype = {
   },
   
   set_clickable_helper: function(b, parent_id, parent_allows_child_blocks, is_last_child)
-  {
-    var that = this;
-        
+  {    
+    var that = this;            
     $('#block_' + b.id)      
       .prepend($('<a/>').attr('id', 'block_' + b.id + '_select_handle'    ).addClass('select_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-check'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.select_block(b.id);    }))      
       .prepend($('<a/>').attr('id', 'block_' + b.id + '_move_up_handle'   ).addClass('move_up_handle'   ).append($('<span/>').addClass('ui-icon ui-icon-arrow-1-n'  )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.move_block_up(b.id);   }))
@@ -234,8 +243,7 @@ PageContentController.prototype = {
           .attr('href', '#')
           .html("New Block")
           .click(function(e) { 
-            e.preventDefault(); e.stopPropagation();
-            console.log('Adding new block...');
+            e.preventDefault(); e.stopPropagation();            
             that.new_block(parent_id, b.id);
           })
         )
@@ -251,8 +259,7 @@ PageContentController.prototype = {
             .attr('href', '#')
             .html("New Block")
             .click(function(e) { 
-              e.preventDefault(); e.stopPropagation();
-              console.log('Adding new block...');
+              e.preventDefault(); e.stopPropagation();              
               that.new_block(parent_id, null, b.id);
             })
           )
@@ -264,9 +271,9 @@ PageContentController.prototype = {
     
     $('#block_' + b.id + ' *').attr('onclick', '').unbind('click');
     $('#block_' + b.id).attr('onclick','').unbind('click');
-    $('#block_' + b.id).click(function(e) {
+    $('#block_' + b.id).click(function(e) {      
       e.preventDefault();
-      e.stopPropagation();
+      e.stopPropagation();      
       that.edit_block(b.id); 
     });
      
@@ -279,24 +286,7 @@ PageContentController.prototype = {
           show_mouseover = false;
         that.set_clickable_helper(b2, b.id, b.block_type.allow_child_blocks, i == (count-1));
       });            
-    }
-    //if (b.allow_child_blocks)
-    //{      
-    //  $('#block_' + b.id).after($('<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/' + b.id + '/new?after_id=' + b.id);                        
-    //      })
-    //    )
-    //    .mouseover(function(e) { $(this).removeClass('new_block_link').addClass('new_block_link_over'); e.stopPropagation(); })
-    //    .mouseout(function(e)  { $(this).removeClass('new_block_link_over').addClass('new_block_link'); e.stopPropagation(); })
-    //  );
-    //}
+    }   
     if (show_mouseover)
     {
       $('#block_' + b.id).mouseover(function(el) { $('#block_' + b.id).addClass(   'block_over'); });
@@ -323,12 +313,16 @@ PageContentController.prototype = {
       });
     }
     return the_block;
-  }      
+  },
+  
+  base_url: function()
+  {
+    var that = this;
+    return '/admin/' + (that.page_id && that.page_id != null ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/blocks';        
+  }    
 };
 
 function toggle_blocks()
 {
   $('#new_blocks_container2').slideToggle();
 }
-
-

data/app/assets/javascripts/caboose/block_modal_controllers/block_modal_controller.js

@@ -2,6 +2,7 @@
 var BlockModalController = ModalController.extend({
   
   page_id: false,
+  post_id: false,
   block_id: false,
   block: false,
   block_types: false,
@@ -33,12 +34,12 @@ var BlockModalController = ModalController.extend({
   
   refresh_block: function(callback)
   {    
-    var that = this
+    var that = this;
     $.ajax({
-      url: '/admin/pages/' + that.page_id + '/blocks/' + that.block_id + '/tree',
+      url: that.block_url() + '/tree',
       type: 'get',
       success: function(arr) {
-        that.block = arr[0];
+        that.block = arr[0];        
         if (callback) callback();
       }        
     });
@@ -180,10 +181,10 @@ var BlockModalController = ModalController.extend({
       update_url: that.block_url(b),      
       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: 400, fixed_placeholder: true, options_url: '/admin/block-types/options'                      , after_update: function() { that.parent_controller.render_blocks(); that.block.block_type.id = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
-        { name: 'parent_id'     , nice_name: 'Parent ID'  , type: 'select'   , value: b.parent_id             , text: b.parent ? b.parent.title : '' , width: 400, fixed_placeholder: true, options_url: '/admin/pages/' + that.page_id + '/block-options' , after_update: function() { that.parent_controller.render_blocks(); that.block.parent_id     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
-        { name: 'constrain'     , nice_name: 'Constrain'  , type: 'checkbox' , value: b.constrain     ? 1 : 0 ,                                        width: 400, fixed_placeholder: true,                                                                  after_update: function() { that.parent_controller.render_blocks(); that.block.constrain     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
-        { name: 'full_width'    , nice_name: 'Full Width' , type: 'checkbox' , value: b.full_width    ? 1 : 0 ,                                        width: 400, fixed_placeholder: true,                                                                  after_update: function() { that.parent_controller.render_blocks(); that.block.full_width    = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }}
+        { name: 'block_type_id' , nice_name: 'Block type' , type: 'select'   , value: b.block_type.id         , text: b.block_type.name              , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.block_type.id = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/block-types/options' },
+        { name: 'parent_id'     , nice_name: 'Parent ID'  , type: 'select'   , value: b.parent_id             , text: b.parent ? b.parent.title : '' , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.parent_id     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/' + (that.page_id ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/block-options' },
+        { name: 'constrain'     , nice_name: 'Constrain'  , type: 'checkbox' , value: b.constrain     ? 1 : 0 ,                                        width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.constrain     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
+        { name: 'full_width'    , nice_name: 'Full Width' , type: 'checkbox' , value: b.full_width    ? 1 : 0 ,                                        width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.full_width    = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }}
       ]
     });
     that.autosize();
@@ -209,14 +210,13 @@ var BlockModalController = ModalController.extend({
     {
       if (!b.rendered_value)
       {
-        $.ajax({
-          block_id: b.id, // Used in the success function
+        $.ajax({          
           url: that.block_url(b) + '/render',
           type: 'get',
           success: function(html) {
-            $('#the_modal #block_' + this.block_id).replaceWith(html);
+            $('#the_modal #block_' + b.id).replaceWith(html);
             
-            var b2 = that.block_with_id(this.block_id);
+            var b2 = that.block_with_id(b.id);            
             b2.rendered_value = html;
             that.set_clickable(b2);                            
             that.autosize();
@@ -282,8 +282,8 @@ var BlockModalController = ModalController.extend({
   
   set_clickable: function(b)
   {        
-    var that = this;       
-    
+    var that = this;
+        
     if (!b)
     {
       $.each(that.block.children, function(i,b) {
@@ -292,19 +292,10 @@ var BlockModalController = ModalController.extend({
     }
 
     $('#the_modal #block_' + b.id).attr('onclick','').unbind('click');    
-    $('#the_modal #block_' + b.id).click(function(e) {
+    $('#the_modal #block_' + b.id).click(function(e) {      
       e.stopPropagation();
       that.parent_controller.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)
     {
@@ -394,8 +385,9 @@ var BlockModalController = ModalController.extend({
       type: 'get',      
       success: function(resp) { bt = resp; },
       async: false      
-    });        
-    that.include_assets('caboose/block_modal_controllers/' + bt.name + '_modal_controller.js');
+    });
+    if (bt.use_js_for_modal)    
+      that.include_assets('caboose/block_modal_controllers/' + bt.name + '_modal_controller.js');
     
     var h = {                      
       authenticity_token: that.authenticity_token,
@@ -404,7 +396,7 @@ var BlockModalController = ModalController.extend({
     if (that.before_id ) h['before_id'] = that.before_id;
     if (that.after_id  ) h['after_id' ] = that.after_id;
     $.ajax({
-      url: '/admin/' + (that.page_id ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/blocks/' + that.block_id,
+      url: that.block_url(),
       type: 'post',
       data: h,
       success: function(resp) {
@@ -505,16 +497,17 @@ var BlockModalController = ModalController.extend({
   
   base_url: function(b)
   {
-    var that = this;
-    if (!b) b = that.block;    
-    return '/admin/' + (b.page_id ? 'pages/' + b.page_id : 'posts/' + b.post_id) + '/blocks';        
+    var that = this;        
+    if (!b)
+      return '/admin/' + (that.page_id && that.page_id != null ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/blocks';            
+    return '/admin/' + (b.page_id && b.page_id != null ? 'pages/' + b.page_id : 'posts/' + b.post_id) + '/blocks';        
   },
   
   block_url: function(b)
   {
-    var that = this;
-    if (!b) b = that.block;
-    return this.base_url(b) + '/' + b.id;          
+    var that = this;    
+    if (!b) return that.base_url() + '/' + that.block_id;    
+    return that.base_url(b) + '/' + b.id;          
   },
   
   child_block: function(name, b)
@@ -541,3 +534,5 @@ var BlockModalController = ModalController.extend({
   },
 
 });
+
+$(document).trigger('block_modal_controller_loaded');

data/app/assets/javascripts/caboose/block_modal_controllers/button_modal_controller.js

@@ -58,3 +58,5 @@ var ButtonModalController = BlockModalController.extend({
   }
   
 });
+
+$(document).trigger('button_modal_controller_loaded');

data/app/assets/javascripts/caboose/block_modal_controllers/media_modal_controller.js

@@ -171,7 +171,7 @@ var MediaModalController = BlockModalController.extend({
           .data('media_id', m.id)
           .click(function(e) { that.print_media_detail($(this).data('media_id')); })
           .append($('<span/>').addClass('name').html(m.original_name));
-        if (m.image_urls)
+        if (m.image_urls && m.image_urls != undefined)
           li.append($('<img/>').attr('src', m.image_urls.tiny_url + '?' + d));
         //if (that.selected_media.indexOf(m.id) > -1)
         //  li.addClass('selected ui-selected');
@@ -202,25 +202,28 @@ var MediaModalController = BlockModalController.extend({
     var m = that.media_with_id(media_id);
          
     var image_urls = $('<div/>').attr('id', 'image_urls').css('margin-bottom', '20px');
-    for (var size in m.image_urls)
+    if (m.image_urls)
     {
-      var s = size.replace('_url', '');
-      s = s[0].toUpperCase() + s.slice(1);
-      var url = m.image_urls[size];
-      image_urls.append($('<div/>')
-        .append($('<span/>').addClass('size').append(s))
-        .append($('<input/>').attr('type', 'text').attr('id', 'size_' + s).addClass('url').val(url))
-        .append($('<button/>').addClass('clippy').data('clipboard-target', '#size_' + s).append('Copy'))                
-      );                        
-    }    
+      image_urls.append($('<h2/>').append('Image URLs'));
+      for (var size in m.image_urls)
+      {
+        var s = size.replace('_url', '');
+        s = s[0].toUpperCase() + s.slice(1);
+        var url = m.image_urls[size];
+        image_urls.append($('<div/>')
+          .append($('<span/>').addClass('size').append(s))
+          .append($('<input/>').attr('type', 'text').attr('id', 'size_' + s).addClass('url').val(url))
+          .append($('<button/>').addClass('clippy').data('clipboard-target', '#size_' + s).append('Copy'))                
+        );                        
+      }
+    }
     
     $('#top_controls').empty();
     $('#media').empty()              
-      .append($('<img/>').attr('id', 'detail_image').attr('src', m.image_urls.thumb_url))      
+      .append($('<img/>').attr('id', 'detail_image').attr('src', m.image_urls ? m.image_urls.thumb_url : '//placehold.it/250x250'))      
       .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_media_category_id' ))) 
       .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_name'              )))
-      .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_description'       )))
-      .append($('<h2/>').append('Image URLs'))
+      .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_description'       )))      
       .append(image_urls);
     $('#modal_controls').empty()
       .append($('<p/>').css('clear', 'both')
@@ -248,9 +251,9 @@ var MediaModalController = BlockModalController.extend({
     $('#media_' + media_id + '_name'              + '_container').css('width', '400px');
     $('#media_' + media_id + '_description'       + '_container').css('width', '400px');
        
-    $('#image_urls span.size'       ).css('width', '70px').css('display', 'inline-block');
-    $('#image_urls input.url'       ).css('width', '270px').css('border', '#ccc 1px solid');
-    $('#image_urls button').css('width', '60px');
+    $('#image_urls span.size' ).css('width', '70px').css('display', 'inline-block');
+    $('#image_urls input.url' ).css('width', '270px').css('border', '#ccc 1px solid');
+    $('#image_urls button'    ).css('width', '60px');
     
     //c = new Clipboard('.clippy');
     //c.on('success', function(e) {
@@ -429,3 +432,5 @@ var MediaModalController = BlockModalController.extend({
   },    
 
 });
+
+$(document).trigger('media_modal_controller_loaded');

data/app/assets/javascripts/caboose/block_modal_controllers/richtext_modal_controller.js

@@ -90,3 +90,5 @@ var RichtextModalController = BlockModalController.extend({
     }
   }  
 });
+
+$(document).trigger('richtext_modal_controller_loaded');

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

@@ -6,6 +6,13 @@ var ModalController = Class.extend({
   modal_element: false,  
   parent_controller: false,
   
+  init: function(params)
+  {
+    var that = this;
+    for (var i in params)
+      that[i] = params[i];
+  },
+  
   modal: function(el, width, height, callback)
   {
     var that = this;
@@ -68,7 +75,7 @@ var ModalController = Class.extend({
   
   // Called at the beginning of init to include modal assets,
   // and can be called at anytime with more assets
-  include_assets: function(arr)
+  include_assets: function(arr, after)
   {
     var that = this;    
     if (!arr) arr = that.assets_to_include();
@@ -77,15 +84,36 @@ var ModalController = Class.extend({
     if (!that.parent_controller.included_assets || that.parent_controller.included_assets == undefined)
       that.parent_controller.included_assets = [];
     if (typeof arr == 'string') arr = [arr];
-    $.each(arr, function(i, url) {        
-      if (that.parent_controller.included_assets.indexOf(url) > -1) return;
+    $.each(arr, function(i, url) {      
+      if (that.asset_included(url)) return;      
       var full_url = url.match(/^http:.*?/) || url.match(/^https:.*?$/) || url.match(/^\/\/.*?$/) ? url : that.assets_path + url;        
       if (url.match(/\.js/))
-      {
+      {        
         var el = document.createElement('script');    
         el.setAttribute('type', 'text/javascript');                  
         el.setAttribute('src', full_url);        
         document.getElementsByTagName('head')[0].appendChild(el)
+        
+        //$.getScript(full_url, function() {
+        //  if (after) after();
+        //});
+        //        
+        //var trigger = 'script_' + Math.floor((Math.random() * 1000) + 1) + '_loaded'
+        //$(document).on(trigger, function() {
+        //  if (after) after();
+        //  $(document).unbind(trigger);
+        //});                          
+        //$.ajax({
+        //  trigger: trigger,
+        //  url: full_url,
+        //  type: 'get',
+        //  success: function(js) {                                     
+        //    var el = document.createElement('script');            
+        //    el.setAttribute('type', 'text/javascript');                  
+        //    el.innerHTML = js + "\n$(document).trigger('" + this.trigger + "');\n",
+        //    document.getElementsByTagName('head')[0].appendChild(el);
+        //  }                      
+        //});
       }
       else if (url.match(/\.css/))
       {
@@ -99,6 +127,14 @@ var ModalController = Class.extend({
     });
   },
   
+  asset_included: function(url)
+  {
+    var that = this;
+    if (!that.parent_controller.included_assets || that.parent_controller.included_assets == undefined)
+      that.parent_controller.included_assets = [];
+    return that.parent_controller.included_assets.indexOf(url) > -1;    
+  },
+  
   include_inline_css: function(str)  
   {
     var that = this;

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

@@ -1,7 +1,11 @@
+<%
+# app/views/caboose/pages/admin_edit_content.html.erb
+%>
 
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'jquery-ui' %>
 <%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
+
 <%= stylesheet_link_tag "caboose/modal_inline" %>
 <style type='text/css'>
 
@@ -59,22 +63,18 @@
 <%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
 <%= javascript_include_tag "caboose/clipboard" %>
-<%= javascript_include_tag 'caboose/admin_page_edit_content' %>
+<%= javascript_include_tag 'caboose/block_content_controller' %>
 <%= javascript_include_tag "caboose/class" %>
 <%= javascript_include_tag "caboose/modal_controller" %>
 <%= javascript_include_tag "caboose/block_modal_controllers/block_modal_controller" %>
-<%= javascript_include_tag "caboose/block_modal_controllers/media_modal_controller" %>
-<%= javascript_include_tag "caboose/block_modal_controllers/richtext_modal_controller" %>
-<% @page.block.modal_js_block_names.each do |s| %>
-  <%= javascript_include_tag "caboose/block_modal_controllers/#{s}_modal_controller" %>
-<% end %>   
 <script type='text/javascript'>
 
 var controller = false;
 $(document).ready(function() {
-  controller = new PageContentController({
+  controller = new BlockContentController({
     page_id: <%= @page.id %>,
-    assets_path: <%= raw Caboose.json(asset_path('loading.gif').gsub('loading.gif', '')) %>
+    assets_path: <%= raw Caboose.json(asset_path('loading.gif').gsub('loading.gif', '')) %>,
+    included_assets: ['caboose/block_modal_controllers/block_modal_controller.js']
   });
 
   $('body').append($('<div/>')        

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

@@ -3,7 +3,9 @@
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/admin" %>
 <%= javascript_include_tag "caboose/model/all" %>
-<%= javascript_include_tag 'caboose/admin_page_edit_content' %>
+<%
+#= javascript_include_tag 'caboose/admin_page_edit_content' 
+%>
 <script type='text/javascript'>
 
 var controller = false;

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

@@ -1,23 +1,88 @@
+<%
+# app/views/caboose/posts/admin_edit_content.html.erb
+%>
 
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'jquery-ui' %>
+<%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
 <%= stylesheet_link_tag 'caboose/admin_post_edit_content' %>
+<%= stylesheet_link_tag "caboose/modal_inline" %>
+<style type='text/css'>
+
+#tiny_header {
+  display: block;  
+  color: #fff;
+  background-image: url(/assets/caboose/caboose_logo_small.png);
+  background-color: #000;  
+  background-repeat: no-repeat;
+  background-position: right 0;
+  padding: 0 50px 0 10px;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  z-index: 100000;
+  border-left: #fff 1px solid;
+  border-bottom: #fff 1px solid;  
+}
+#tiny_header a {
+  display: inline-block;
+  color: #fff;
+  padding: 16px 10px;  
+}
+.block_over { background: #e3e3e3; }
+.select_handle    { display: none; }
+.move_up_handle   { display: none; }
+.move_down_handle { display: none; }
+.delete_handle    { display: none; }
+.block_over > .select_handle    { display: block; position: relative; }
+.block_over > .move_up_handle   { display: block; position: relative; }
+.block_over > .move_down_handle { display: block; position: relative; }
+.block_over > .delete_handle    { display: block; position: relative; }
+.block_over > .select_handle    span { position: absolute; top: 0; right: 54px; 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; }
+.block_over > .delete_handle    span { position: absolute; top: 0; right:  0px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
+
+.selected { background: #fff799; }
+
+.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 !important; 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' %>
-<%= javascript_include_tag 'caboose/admin_post_edit_content' %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
+<%= javascript_include_tag "caboose/clipboard" %>
+<%= javascript_include_tag 'caboose/block_content_controller' %>
+<%= javascript_include_tag "caboose/class" %>
+<%= javascript_include_tag "caboose/modal_controller" %>
+<%= javascript_include_tag "caboose/block_modal_controllers/block_modal_controller" %>
 <script type='text/javascript'>
 
 var controller = false;
-$(document).ready(function() {
-  controller = new PostContentController(<%= @post.id %>);
+$(document).ready(function() {  
+  controller = new BlockContentController({
+    post_id: <%= @post.id %>,
+    assets_path: <%= raw Caboose.json(asset_path('loading.gif').gsub('loading.gif', '')) %>,
+    included_assets: ['caboose/block_modal_controllers/block_modal_controller.js']
+  });
 
   $('body').append($('<div/>')        
     .attr('id', 'tiny_header')
     .append($('<a/>').attr('href', '/admin/posts').html("< Back"))
-    .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>/layout').html("Post Layout"))
-    .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>').html("Post Settings"))        
+    .append($('<a/>').attr('href', '#').html('Post Options').click(function(e) { e.preventDefault(); caboose_modal_url('/admin/posts/<%= @post.id %>/custom-fields'); }))
+    .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>/layout').html("Layout"))
+    .append($('<a/>').attr('href', '/admin/posts/<%= @post.id %>').html("Settings"))        
   );    
 });
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.58'
+  VERSION = '0.8.59'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.58
+  version: 0.8.59
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -517,13 +517,13 @@ files:
 - app/assets/javascripts/caboose/admin_main.js
 - app/assets/javascripts/caboose/admin_media_index.js
 - app/assets/javascripts/caboose/admin_media_index_new.js
-- app/assets/javascripts/caboose/admin_page_edit_content.js
 - app/assets/javascripts/caboose/admin_page_new_blocks.js
 - app/assets/javascripts/caboose/admin_post_edit_content.js
 - app/assets/javascripts/caboose/admin_products.js
 - app/assets/javascripts/caboose/application.js
 - app/assets/javascripts/caboose/assets_controller.js
 - app/assets/javascripts/caboose/authorize.net.js
+- app/assets/javascripts/caboose/block_content_controller.js
 - app/assets/javascripts/caboose/block_media_controller.js
 - app/assets/javascripts/caboose/block_modal_controllers/block_modal_controller.js
 - app/assets/javascripts/caboose/block_modal_controllers/button_modal_controller.js