caboose-cms 0.9.82 → 0.9.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e6a4beb61272ea82d1b19d6189398b2a41c76a
-  data.tar.gz: a09557a901c823b7d12ce55d84d2640b34d6f625
+  metadata.gz: c2382d0cd7dca903db123294ab348c27cf479984
+  data.tar.gz: 69b9ff6480a2a4b4e4e5d8c78e5f5d27638678aa
 SHA512:
-  metadata.gz: 7af096ca809b22c615b5b71080bbe8d7c91b302fee8c8de8c298c0a8c462bf900f31b114ac2a2846f597862b3976cf1013a72e7f927e719f0f72b63c63ed4726
-  data.tar.gz: 0bb83c997ebde0c043438304c0c42c67400efee11f3e0daf10b5b136306dd216017ad8a3de9bf7e76a0b8e234009d86360c3aa49c33679555ccc8cb30297efc0
+  metadata.gz: f4836eb3d70e11c4a26fc6e3665584d531f56e68038d3c80f1a09afa7d47042fe0b63c638fc2709d7e9076ae08ca16d1d4e1594947883802f889a90cff0b3011
+  data.tar.gz: 822db3dcbf62ddb4e71affaf8fd4e1103eaaee2bfc4603c0abf76b58588fed42a0189e1e7aed18a0a65f579b28a11a9455d8b7cf22db1b717731369a812100aa

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

@@ -165,9 +165,6 @@ BlockContentController.prototype = {
       }
       that.move_block_save(block_id, parent_id, before_block_id, after_block_id);
     }
-    else {
-
-    }
   },
 
   move_block_save: function(block_id, parent_id, before_block_id, after_block_id) {
@@ -298,16 +295,23 @@ BlockContentController.prototype = {
     $('.new_block_link').remove();
     $("[id^='block_']").each(function(k,v) {
 
+      var is_unit = $(v).hasClass('flex-grid-unit');
+      var is_grid = $(v).hasClass('flex-grid-container');
       var bid = $(v).attr('id').replace('block_','');
+      var dropclass = (is_unit && is_unit == true ? 'column-dropper' : 'regular-dropper');
 
-      // empty post, page, column, or text area
+      // empty post, page, column, grid, or text area
       if ( $(v).find('.content_body').length > 0 && $(v).find('.content_body').first().children().length == 0 ) {
+        var msg = (is_grid && is_grid == true ? '<p>Empty grid. Drag a column here.</p>' : '<p>Empty content area. Drag blocks here.</p>');
         var el = $(v).find('.content_body').first();
+        if ( $(v).find('.flexbox').length > 0 && $(v).find('.flexbox').first().children().length == 0 )
+          $(v).addClass('empty');
         var first_parent_block = el.parents("[id^='block_']").first();
         if ( first_parent_block.attr('id') == $(v).attr('id') ) {
           el.html($('<div/>')
-            .addClass('new_block_link np')
-            .append($('<div/>').addClass('new-page line').html('<p>Empty content area. Drag blocks here.</p>').droppable({
+            .addClass('new_block_link np ' + (is_grid && is_grid == true ? 'column-dropper' : 'regular-dropper'))
+            .append($('<div/>').addClass('new-page line').html(msg).droppable({
+              accept: (is_grid && is_grid == true ? '.flex-grid-unit' : ':not(.flex-grid-unit)'),
               hoverClass: "highlight",
               tolerance: "pointer",
               drop: function(event, ui) {
@@ -326,8 +330,9 @@ BlockContentController.prototype = {
         var parent_id = $(v).parents("[id^='block_']").first().attr('id').replace('block_','');
         var is_last_child = $(v).next("[id^='block_']").length == 0 ? true : false;
         $(v).before($('<div/>')          
-          .addClass('new_block_link')
+          .addClass('new_block_link ' + dropclass)
           .append($('<div/>').addClass('line').droppable({
+            accept: (is_unit && is_unit == true ? '.flex-grid-unit' : ':not(.flex-grid-unit)'),
             hoverClass: "highlight",
             tolerance: "pointer",
             drop: function(event, ui) {
@@ -340,8 +345,9 @@ BlockContentController.prototype = {
         );
         if (is_last_child && is_last_child == true) {
           $(v).after($('<div/>')          
-            .addClass('new_block_link')
+            .addClass('new_block_link ' + dropclass).addClass(dropclass)
             .append($('<div/>').addClass('line').droppable({
+              accept: (is_unit && is_unit == true ? ".flex-grid-unit" : ':not(.flex-grid-unit)'),
               hoverClass: "highlight",
               tolerance: "pointer",
               drop: function(event, ui) {
@@ -361,13 +367,18 @@ BlockContentController.prototype = {
           revert: "invalid",
           scroll: false,
           zIndex: 999,
-          start: function(event, ui) { $(".line.ui-droppable").addClass('dropzone'); },
-          stop: function(event, ui) { $(".line.ui-droppable").removeClass('dropzone'); }
+          start: function(event, ui) { $((is_unit && is_unit == true ? '.column-dropper' : '.regular-dropper') + " .line.ui-droppable").addClass('dropzone'); },
+          stop: function(event, ui) { $((is_unit && is_unit == true ? '.column-dropper' : '.regular-dropper') + " .line.ui-droppable").removeClass('dropzone'); }
         });
       }
 
       that.add_handles_to_block(bid);
 
+      $(".flex-grid-container").each(function(k, v) {
+        var h = $(v).outerHeight();
+        $(v).find(".flexbox > .new_block_link .line").css('height',h);
+      });
+
     });
 
   },
@@ -375,23 +386,25 @@ BlockContentController.prototype = {
   add_handles_to_block: function(block_id) {
     var that = this;
     var el = $('#block_' + block_id);
-    if ( el.attr('id').indexOf('_value') >= 0 || el.children('.drag_handle').length > 0 )
-      return true;
-    if ( el.parents('.content_body').length > 0 ) {
-      $('#block_' + block_id + ' *').attr('onclick', '').unbind('click');
-      el.prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_drag'      ).addClass('drag_handle'      ).append($('<span/>').addClass('ui-icon ui-icon-arrow-4'    )).click(function(e) { e.preventDefault(); e.stopPropagation();  }))
-        .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_select'    ).addClass('select_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-check'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.select_block(block_id);    }))
-        .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_duplicate' ).addClass('duplicate_handle' ).append($('<span/>').addClass('ui-icon ui-icon-copy'       )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.duplicate_block(block_id); }))
-        .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_delete'    ).addClass('delete_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-close'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(block_id);    }));
-      el.mouseover(function(el) { $('#block_' + block_id).addClass(   'block_over'); });
-      el.mouseout(function(el)  { $('#block_' + block_id).removeClass('block_over'); });
+    if (el.length > 0) {
+      if ( el.attr('id').indexOf('_value') >= 0 || el.children('.drag_handle').length > 0 )
+        return true;
+      if ( el.parents('.content_body').length > 0 ) {
+        $('#block_' + block_id + ' *').attr('onclick', '').unbind('click');
+        el.prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_drag'      ).addClass('drag_handle'      ).append($('<span/>').addClass('ui-icon ui-icon-arrow-4'    )).click(function(e) { e.preventDefault(); e.stopPropagation();  }))
+          .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_select'    ).addClass('select_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-check'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.select_block(block_id);    }))
+          .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_duplicate' ).addClass('duplicate_handle' ).append($('<span/>').addClass('ui-icon ui-icon-copy'       )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.duplicate_block(block_id); }))
+          .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_delete'    ).addClass('delete_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-close'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(block_id);    }));
+        el.mouseover(function(el) { $('#block_' + block_id).addClass(   'block_over'); });
+        el.mouseout(function(el)  { $('#block_' + block_id).removeClass('block_over'); });
+      }
+      el.attr('onclick','').unbind('click');
+      el.click(function(e) {      
+        e.preventDefault();
+        e.stopPropagation();      
+        that.edit_block(block_id);
+      });
     }
-    el.attr('onclick','').unbind('click');
-    el.click(function(e) {      
-      e.preventDefault();
-      e.stopPropagation();      
-      that.edit_block(block_id);
-    });
   },
   
   /*****************************************************************************

data/app/assets/stylesheets/caboose/admin_edit_page_content_dragdrop.scss

@@ -239,10 +239,10 @@ body > .container, body > .mm-page > .container {
 .block_over > .delete_handle    span { position: absolute; top: 0; right:  0px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 .block_over > .duplicate_handle    span { position: absolute; top: 0; right:  36px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 
-.flex-grid-unit.block_over > .delete_handle span { right: auto; left: 36px; background-color: #f1e9e9; }
-.flex-grid-unit.block_over > .duplicate_handle span { right: auto; left: 0; background-color: #f1e9e9; }
-.flex-grid-unit.block_over > .select_handle span { right: auto; left: 18px; background-color: #f1e9e9; }
-.flex-grid-unit.block_over > .drag_handle span { display: none; }
+.flex-grid-unit.block_over > .delete_handle span { right: auto; left: 54px; background-color: #f1e9e9; }
+.flex-grid-unit.block_over > .duplicate_handle span { right: auto; left: 18px; background-color: #f1e9e9; }
+.flex-grid-unit.block_over > .select_handle span { right: auto; left: 36px; background-color: #f1e9e9; }
+.flex-grid-unit.block_over > .drag_handle span { right: auto; left: 0; background-color: #f1e9e9; }
 
 .unslider-block-wrapper > .delete_handle,
 .unslider-block-wrapper > .drag_handle,
@@ -278,7 +278,7 @@ body > .container, body > .mm-page > .container {
       background: #dbeff7;
     }
     &.highlight {
-      background: #b0d5e4;
+      background: shade(#dbeff7, 15%);
     }
     &.new-page {
       text-align: center;
@@ -295,10 +295,68 @@ body > .container, body > .mm-page > .container {
       p {
         color: #1d1d1d;
       }
+      &.dropzone {
+        background: #dbeff7;
+      }
       &.highlight {
-        background: #9cb9fb;
+        background: shade(#dbeff7, 15%);
         color: transparent;
       }
     }
 	}
-}
+}
+
+.flex-grid-container .flexbox > .new_block_link {
+  height: 0;
+  width: 0;
+  flex: 0 0 0;
+  .line {
+    background-color: transparent;
+    left: -8px;
+    bottom: auto;
+    top: 0;
+    width: 16px;
+    height: 70px;
+    &.dropzone {
+      background: #c8ffca;
+    }
+    &.highlight {
+      background: shade(#c8ffca, 15%);
+    }
+  }
+}
+
+.flex-grid-container.empty {
+  & > .flexbox > .new_block_link.np, & > .constrain > .flexbox > .new_block_link.np {
+    flex: 1 1 100%;
+    width: auto;
+    height: auto;
+    .new-page.line {
+      width: 100%;
+      bottom: auto;
+      top: auto;
+      background: #ecebe8;
+      left: 0;
+      height: auto;
+      z-index: 2;
+      &.dropzone {
+        background: #c8ffca;
+      }
+      &.highlight {
+        background: shade(#c8ffca, 15%);
+      }
+    }
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+

data/app/controllers/caboose/blocks_controller.rb

@@ -393,7 +393,7 @@ module Caboose
           b1.create_children
           bw = b1.child('width')
           if bw
-            bw.value = (100.0 / params[:child_count].to_f).to_i.to_s + '%'
+            bw.value = 'auto' # (100.0 / params[:child_count].to_f).to_i.to_s + '%'
             bw.save
           end
         end

data/app/controllers/caboose/pages_controller.rb

@@ -324,7 +324,7 @@ module Caboose
       parent_id            = params[:parent_id]
       block_type_id        = params[:block_type_id]
       child_block_type_id  = params[:child_block_type_id]
-      duplicate_children   = params[:duplicate_children] ? true : false
+      duplicate_children   = params[:duplicate_children] == 'true' ? true : false
       
       if p.nil?            then resp.error = "Invalid page"
       elsif site_id.nil?   then resp.error = "Invalid site"

data/app/models/caboose/block.rb

@@ -587,12 +587,11 @@ class Caboose::Block < ActiveRecord::Base
   
   # Assumes that we start the duplicate process at the top level block
   def duplicate_page_block(site_id, page_id, new_block_type_id = nil, new_parent_id = nil)        
-    m = self.media_id ? self.media.duplicate(site_id) : nil
     b = Caboose::Block.create(
       :page_id            => page_id,          
       :post_id            => nil,         
       :parent_id          => new_parent_id,
-      :media_id           => self.media_id ? m.id : nil,
+      :media_id           => self.media_id,
       :block_type_id      => new_block_type_id,    
       :sort_order         => self.sort_order,
       :constrain          => self.constrain,

data/app/models/caboose/page.rb

@@ -413,7 +413,7 @@ class Caboose::Page < ActiveRecord::Base
       p = Caboose::Page.create(:site_id => site_id, :parent_id => parent_id)
     end
 
-    p.title                = self.title                 
+    p.title                = "Copy of " + self.title                 
     p.menu_title           = self.menu_title            
     p.slug                 = self.slug                  
     p.alias                = self.alias                 

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

@@ -7,25 +7,25 @@ btsm = Caboose::BlockTypeSiteMembership.where(:site_id => @site.id).pluq(:block_
   <h4>Drag a block<br />onto the page.</h4>
   <ul id='new_blocks'>
   	<li class='title'><span>Structure</span></li>
-  	<li class='blocktype' id='new_block_3159_2' data-btid='3159' data-children='2'>
+  	<li class='blocktype bt' id='new_block_3159_2' data-btid='3159' data-children='2'>
   		<span class='icon icon-insert-template'></span>
   		<span class='bname'>2 Column Row</span>
   	</li>
-  	<li class='blocktype' id='new_block_3159_3' data-btid='3159' data-children='3'>
+  	<li class='blocktype bt' id='new_block_3159_3' data-btid='3159' data-children='3'>
   		<span class='icon icon-insert-template'></span>
   		<span class='bname'>3 Column Row</span>
   	</li>
-  	<li class='blocktype' id='new_block_3159_4' data-btid='3159' data-children='4'>
+  	<li class='blocktype bt' id='new_block_3159_4' data-btid='3159' data-children='4'>
   		<span class='icon icon-insert-template'></span>
   		<span class='bname'>4 Column Row</span>
   	</li>
-  	<li class='blocktype' id='new_block_3159_5' data-btid='3159' data-children='5'>
+  	<li class='blocktype bt' id='new_block_3159_5' data-btid='3159' data-children='5'>
   		<span class='icon icon-insert-template'></span>
   		<span class='bname'>5 Column Row</span>
   	</li>
   	<li class='title'><span>Content</span></li>
     <% @block_types.each do |block_type| %>
-    	<li class='blocktype' id='new_block_<%= block_type.id %>' data-btid='<%= block_type.id %>'>
+    	<li class='blocktype bt' id='new_block_<%= block_type.id %>' data-btid='<%= block_type.id %>'>
     		<span class='icon icon-<%= block_type.icon %>'></span>
     		<span class='bname'><%= block_type.description %></span>
     	</li>

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

@@ -54,7 +54,7 @@ $(document).ready(function() {
     .append(html)
   );
   $("#new_blocks li.blocktype").draggable({ revert: true, helper: 'clone', appendTo: 'body', zIndex: 999999, scroll: false, start: function(event, ui) {
-    $(".line.ui-droppable").addClass('dropzone'); }, stop: function(event, ui) { $(".line.ui-droppable").removeClass('dropzone'); } });
+  $(".regular-dropper .line.ui-droppable").addClass('dropzone'); }, stop: function(event, ui) { $(".regular-dropper .line.ui-droppable").removeClass('dropzone'); } });
   $('body').addClass('icons');
   $('body').append($('<div/>').attr('id','caboose-loading').append( $('<div/>').addClass('table').append($('<div/>').addClass('table-cell').append('<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg id="loader" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="60px" height="60px" viewBox="0 0 128 128" xml:space="preserve"><g><path d="M64 0L40.08 21.9a10.98 10.98 0 0 0-5.05 8.75C34.37 44.85 64 60.63 64 60.63V0z" fill="#ffb118"/><path d="M128 64l-21.88-23.9a10.97 10.97 0 0 0-8.75-5.05C83.17 34.4 67.4 64 67.4 64H128z" fill="#80c141"/><path d="M63.7 69.73a110.97 110.97 0 0 1-5.04-20.54c-1.16-8.7.68-14.17.68-14.17h38.03s-4.3-.86-14.47 10.1c-3.06 3.3-19.2 24.58-19.2 24.58z" fill="#cadc28"/><path d="M64 128l23.9-21.88a10.97 10.97 0 0 0 5.05-8.75C93.6 83.17 64 67.4 64 67.4V128z" fill="#cf171f"/><path d="M58.27 63.7a110.97 110.97 0 0 1 20.54-5.04c8.7-1.16 14.17.68 14.17.68v38.03s.86-4.3-10.1-14.47c-3.3-3.06-24.58-19.2-24.58-19.2z" fill="#ec1b21"/><path d="M0 64l21.88 23.9a10.97 10.97 0 0 0 8.75 5.05C44.83 93.6 60.6 64 60.6 64H0z" fill="#018ed5"/><path d="M64.3 58.27a110.97 110.97 0 0 1 5.04 20.54c1.16 8.7-.68 14.17-.68 14.17H30.63s4.3.86 14.47-10.1c3.06-3.3 19.2-24.58 19.2-24.58z" fill="#00bbf2"/><path d="M69.73 64.34a111.02 111.02 0 0 1-20.55 5.05c-8.7 1.14-14.15-.7-14.15-.7V30.65s-.86 4.3 10.1 14.5c3.3 3.05 24.6 19.2 24.6 19.2z" fill="#f8f400"/><circle cx="64" cy="64" r="2.03"/><animateTransform attributeName="transform" type="rotate" from="0 64 64" to="-360 64 64" dur="2100ms" repeatCount="indefinite"></animateTransform></g></svg>').append('<h4>Loading...</h4>') )  ));
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.82'
+  VERSION = '0.9.83'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.82
+  version: 0.9.83
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1325,12 +1325,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: CMS built on rails.
 test_files:
+- spec/factories/caboose_blocks.rb
+- spec/factories/caboose_users.rb
 - spec/models/block_spec.rb
 - spec/models/user_spec.rb
-- spec/factories/caboose_users.rb
-- spec/factories/caboose_blocks.rb