caboose-cms 0.5.201 → 0.5.202

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWFhNjhhZjc5NGZjNDE4MWI2OGQzZTEyNWUwZTRkYTAyODllMzY5Mw==
+    YzIwZTAxZjI1NzYyZDNkMTBhOGNlZGZhY2JkMzEwYzg5ZmY2NzNlMQ==
   data.tar.gz: !binary |-
-    ZTMwNzVmY2RhZWFlMTI2YTMwNmU4YjU4OWNkYWQyOTU5Yzk5Yjc2Mg==
+    MTkwNThiMTFjNTEzZTZhOGJmMTgzMzM2N2U2N2U3MjE1MTU3OGJhNg==
 SHA512:
   metadata.gz: !binary |-
-    OTI0Yjg1YWRjOGFmOGY2NjMzYzc3ODc0MGE0NjVmYjNkN2I2OGQxODNlZGI3
-    MGQ1ZTFmYWRkOGY5YTg5YjQyMDdkNjBhMmMxNmU5YTZkMzZlNjQyOWQ4MWNm
-    NmE4NjNhMDc3NTBmYjFlNTQ3YmI0NzUxOGU4MDA0ZTRjMDNiMjI=
+    MTNkN2IzOTYwNWViODAzOWZlZjEyOTQ3NjQwYjlhNzE5YWJjMTk2YjIxZTQx
+    N2YwODk4NzRkZDFkMTNiOWVlMTVhNGFkMGE1ODBhZTFlNDM4NzdiODFkZjdm
+    MzAwZmU3YzNiZWIyMzU3MWRjZTJkZTQyNTAwNWM0NzBlMDgzM2Y=
   data.tar.gz: !binary |-
-    ODdjM2MzNzM1MWQ2ZTQzYTUwZmRmZDE2NWQ4MzI5ZGZkOTJjODMyNTQ1ZDgy
-    MWRjYTkwNTE4ZjVjNWJiYjUyODI0ZWZhZmMzYzQ1NzMzZjI0MGE1ODAyMDJh
-    NGQ5ZDZmMWRjMGZmNjQ0MjVkYjBiMjY5MTQ4ZTgyNWM3ZGU3ZGY=
+    MmM1YTE0MTFmNzFmNzhiZGQwNzAwOThiM2RmODQ1OWNmNTA3Zjc5Y2I3ZDNj
+    NWE0ZTZhMzI3YWQ4OGNkODI0ZjExMDU5N2VlMzUzN2ExZTEzMzNmZWMwMzg4
+    YTExNDcyY2ZjNzZkNmQ3OTliZDc1NmVkMjcxZWEyMWNiOWQxNDg=

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

@@ -19,10 +19,20 @@ BlockController.prototype = {
     this.set_child_blocks_editable();
     this.set_clickable();
   },
+  
+  base_url: function(b)
+  {    
+    return '/admin/' + (b.page_id ? 'pages/' + b.page_id : 'posts/' + b.post_id) + '/blocks';        
+  },
+  
+  block_url: function(b)
+  {         
+    return this.base_url(b) + '/' + b.id;          
+  },
     
   edit_block: function(block_id)
-  {
-    window.location = '/admin/pages/' + this.block.page_id + '/blocks/' + block_id + '/edit';    
+  {    
+    window.location = this.block_url(that.block) + '/edit';    
   },    
     
   /*****************************************************************************
@@ -33,7 +43,7 @@ BlockController.prototype = {
   {        
     var that = this;                
     $.ajax({      
-      url: '/admin/pages/' + this.block.page_id + '/blocks/tree',
+      url: that.base_url(that.block) + '/tree',
       success: function(blocks) {        
         $(blocks).each(function(i,b) {
           that.set_clickable_helper(b);                      
@@ -139,17 +149,17 @@ BlockController.prototype = {
     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 == 'file')           h['update_url'] = that.block_url(b) + '/file';
     if (bt.field_type == 'image')
     {
-      h['update_url'] = '/admin/pages/' + b.page_id + '/blocks/' + b.id + '/image'
+      h['update_url'] = that.block_url(b) + '/image'
       h['image_refresh_delay'] = 100;
     }
         
     m = new ModelBinder({
       name: 'Block',
       id: b.id,
-      update_url: '/admin/pages/' + b.page_id + '/blocks/' + b.id,
+      update_url: that.block_url(b),
       authenticity_token: that.authenticity_token,
       attributes: [h]            
     });
@@ -206,7 +216,7 @@ BlockController.prototype = {
     }
     modal.autosize("<p class='loading'>Adding block...</p>");
     $.ajax({
-      url: '/admin/pages/' + that.block.page_id + '/blocks/' + that.block.id,
+      url: that.block_url(block),
       type: 'post',
       data: { block_type_id: block_type_id },
       success: function(resp) {
@@ -230,7 +240,7 @@ BlockController.prototype = {
     }
     modal.autosize("<p class='loading'>Deleting block...</p>");
     $.ajax({
-      url: '/admin/pages/' + that.block.page_id + '/blocks/' + that.block.id,
+      url: that.block_url(that.block),
       type: 'delete',    
       success: function(resp) {
         if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
@@ -248,7 +258,7 @@ BlockController.prototype = {
     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',
+      url: that.block_url(that.block) + '/move-up',
       type: 'put',    
       success: function(resp) {
         if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
@@ -266,7 +276,7 @@ BlockController.prototype = {
     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',
+      url: that.block_url(that.block) + '/move-down',
       type: 'put',    
       success: function(resp) {
         if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");

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

@@ -0,0 +1,313 @@
+ 
+var PostContentController = function(post_id) { this.init(post_id); };
+
+PostContentController.prototype = {
+
+  post_id: false,    
+  new_block_type_id: false,
+  selected_block_ids: [],
+  
+  init: function(post_id)
+  {
+    this.post_id = post_id;
+    var that = this;
+    that.set_clickable();       
+    that.sortable_blocks();
+    //  that.draggable_blocks();
+    //});
+  },
+  
+  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() 
+  {
+    $('#new_blocks li').draggable({
+      dropOnEmpty: true,
+      connectToSortable: "#blocks",
+      helper: "clone",
+      revert: "invalid"    
+    });    
+  },
+    
+  edit_block: function(block_id)
+  {
+    caboose_modal_url('/admin/posts/' + this.post_id + '/blocks/' + block_id + '/edit');    
+  },
+  
+  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');    
+  },
+  
+  select_block: function(block_id)
+  {            
+    i = this.selected_block_ids.indexOf(block_id);
+    if (i == -1) // Not there
+    {
+      this.selected_block_ids.push(block_id);
+      $('#block_' + block_id).addClass('selected');
+    }
+    else
+    {
+      this.selected_block_ids.splice(i, 1);
+      $('#block_' + block_id).removeClass('selected');
+    }    
+  },
+  
+  delete_block: function(block_id, confirm)
+  {
+    var that = this;        
+    if (!confirm)
+    {
+      if (this.selected_block_ids.indexOf(block_id) == -1)
+        this.selected_block_ids.push(block_id);
+      var other_count = this.selected_block_ids.length - 1;
+      
+      var message = "Are you sure you want to delete this block";      
+      if (other_count > 0)
+        message += " and the " + other_count + " other selected block" + (other_count == 1 ? '' : 's');
+      message += "?<br />";
+      
+      var p = $('<p/>')
+        .addClass('caboose_note')
+        .append(message)
+        .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;
+    }
+    for (var i in this.selected_block_ids)
+    {               
+      $.ajax({
+        url: '/admin/posts/' + this.post_id + '/blocks/' + this.selected_block_ids[i],
+        type: 'delete',
+        async: false,
+        success: function(resp) {}
+      });
+    }
+    that.render_blocks();
+  },
+  
+  move_block_up: function(block_id)
+  {
+    var that = this;
+    this.loadify($('#block_' + block_id + '_move_up_handle span'));    
+    $.ajax({
+      url: '/admin/posts/' + this.post_id + '/blocks/' + block_id + '/move-up',
+      type: 'put',      
+      success: function(resp) {        
+        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
+      }
+    });    
+  },
+  
+  move_block_down: function(block_id)
+  {   
+    var that = this;
+    this.loadify($('#block_' + block_id + '_move_down_handle span'));
+    $.ajax({
+      url: '/admin/posts/' + this.post_id + '/blocks/' + block_id + '/move-down',
+      type: 'put',      
+      success: function(resp) {        
+        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
+      }
+    });    
+  },
+  
+  loadify: function(el)
+  {
+    var that = this;
+    if      (el.hasClass('ui-icon-arrowrefresh-1-e')) el.removeClass('ui-icon-arrowrefresh-1-e').addClass('ui-icon-arrowrefresh-1-s');
+    else if (el.hasClass('ui-icon-arrowrefresh-1-s')) el.removeClass('ui-icon-arrowrefresh-1-s').addClass('ui-icon-arrowrefresh-1-w');
+    else if (el.hasClass('ui-icon-arrowrefresh-1-w')) el.removeClass('ui-icon-arrowrefresh-1-w').addClass('ui-icon-arrowrefresh-1-n');
+    else if (el.hasClass('ui-icon-arrowrefresh-1-n')) el.removeClass('ui-icon-arrowrefresh-1-n').addClass('ui-icon-arrowrefresh-1-e');
+    else el.addClass('ui-icon-arrowrefresh-1-e');
+    this.loadify_el = el;
+    this.loadify_timer = setTimeout(function() { that.loadify(el); }, 200);                       
+  },
+  
+  stop_loadify: function()
+  {
+    if (this.loadify_el)
+    {
+      this.loadify_el.removeClass('ui-icon-arrowrefresh-1-e')
+        .removeClass('ui-icon-arrowrefresh-1-s')
+        .removeClass('ui-icon-arrowrefresh-1-w')
+        .removeClass('ui-icon-arrowrefresh-1-n');
+    } 
+    if (this.loadify_timer)
+      clearTimeout(this.loadify_timer);                
+  },
+    
+  /*****************************************************************************
+  Block Rendering
+  *****************************************************************************/
+  
+  render_blocks: function(before_render) {
+    $('.sortable').sortable('destroy');
+    var that = this;                
+    $.ajax({
+      url: '/admin/posts/' + this.post_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.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));
+        });        
+      }
+    });    
+  },
+  
+  set_clickable_helper: function(b, parent_id, parent_allows_child_blocks, is_last_child)
+  {
+    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);   }))
+      .prepend($('<a/>').attr('id', 'block_' + b.id + '_move_down_handle' ).addClass('move_down_handle' ).append($('<span/>').addClass('ui-icon ui-icon-arrow-1-s'  )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.move_block_down(b.id); }))
+      .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/posts/' + that.post_id + '/blocks/' + parent_id + '/new?before_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 (is_last_child && is_last_child == true)
+      {
+        $('#block_' + b.id).append($('<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);                        
+            })
+          )
+          .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(); })
+        );
+      }
+    }
+            
+    $('#block_' + b.id).attr('onclick','').unbind('click');    
+    $('#block_' + b.id).click(function(e) {
+      e.stopPropagation();
+      that.edit_block(b.id); 
+    });
+     
+    var show_mouseover = true;
+    if (b.children && b.children.length > 0)
+    {
+      var count = b.children.length;
+      $.each(b.children, function(i, b2) {        
+        if (b2.field_type == 'block')
+          show_mouseover = false;
+        that.set_clickable_helper(b2, b.id, b.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'); }); 
+    }    
+  }    
+  
+};
+
+function toggle_blocks()
+{
+  $('#new_blocks_container2').slideToggle();
+}
+
+

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

@@ -0,0 +1,46 @@
+
+#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; }