caboose-cms 0.5.30 → 0.5.31

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmJiNzg3OTk5YWQxNWNmM2NhMTU0ZTMzN2FjNDMxODk4NjgwZTVkMw==
+    MmNiOTkyNWRjMjA0ZmI0YmRmYWY3NmI3Zjk4ZjlmMTI5OWI3NGUwNg==
   data.tar.gz: !binary |-
-    YjA0MWM2Mjc5YzNkOWE0MjEyYTFiMzBkYzc5MzliOTYxNjQ1Y2I3ZA==
+    YmUwMzY1NTJjNDg4N2U4NGE0M2NjODhjYTBiMDU2M2Q2M2YxZTdiYw==
 SHA512:
   metadata.gz: !binary |-
-    MmE1ZWFkYzk1NjM1NDYxY2MzODJkMmMwNzJiOTg3NzIzZDk1NDBiNGQwZjg1
-    ODI1NjMyOWZkZDVkYTMwMjA1NWZhZWVkMTE1NDNhY2QwOGJiYTBmYTQzMDli
-    ZjFhMjgyMGZlYmMwOTQyY2Q3YTk3MjYwNjlmYTQ0MWYwNDRjZmQ=
+    OGJmYWJjYThjMDkwMDg2ZjM4Y2YwN2YwNjE1MDdmZjc5NzM4OGUzOGQzOTU4
+    ZjNlMDM3MjhhYzdjMjQwNDRiMzIzYWFkNzc2N2M5MTQ3MzUzMDlmNDZjYTE0
+    OTY3Mzc2ZTEyZTkwMzE5NTVmN2M5MzVjOWNiYzEzN2I5NTFlMjM=
   data.tar.gz: !binary |-
-    MjQwNzc0M2E3NjVlMTZiMDQ1NmVhZjIyOTRlZjc3NjQzZjY2ODY5NGZhZDc2
-    ZmE3ZjA3YzBkOGFmZThjNTYwNTZjNTQ5YTVmODZmZGU0ZTYyMmE0ZGVlODBk
-    ODQ4YmVlOTY0YWQ1ZjYzNzc3YWY3NzQzZGZhZjgzOWJlMDdmYzU=
+    Nzc1MzNlOWYzMzBmZjk5YTMyMTVmMjQwMmRiMDU1NjM2NTE4NDQxZDRmZDdi
+    NTg5YThkOGYyNmRlZDhjYTYzMjI1ZjQ5MTQwNWZiZDg5MmYzZWJiYzk2MGM4
+    ODgyMGRhNzM1NTUwOTE0NTBmZWViYTU0NWJhMTJmNGRkZjVlNGI=

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

@@ -179,15 +179,16 @@ PageContentController.prototype = {
     var that = this;                
     $.ajax({      
       url: '/admin/pages/' + this.page_id + '/blocks/tree',
-      success: function(blocks) {        
+      success: function(blocks) {
+        var count = blocks.length;        
         $(blocks).each(function(i,b) {
-          that.set_clickable_helper(b, false, false);
+          that.set_clickable_helper(b, false, false, (i == count-1));
         });        
       }
     });    
   },
   
-  set_clickable_helper: function(b, parent_id, parent_allows_child_blocks)
+  set_clickable_helper: function(b, parent_id, parent_allows_child_blocks, is_last_child)
   {
     var that = this;
         
@@ -212,7 +213,24 @@ PageContentController.prototype = {
         )
         .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/pages/' + that.page_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');    
@@ -223,30 +241,31 @@ PageContentController.prototype = {
      
     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);
+        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/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 (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'); });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.30'
+  VERSION = '0.5.31'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.5.31
 platform: ruby
 authors:
 - William Barry