caboose-cms 0.9.141 → 0.9.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a12ce0605a6ada50a69e1bd6acce2c85e2644d9
-  data.tar.gz: 3884dd6153bd714da7819b86db0361f39061941f
+  metadata.gz: 4101ff715f3350bdf7f403582837404239a21b14
+  data.tar.gz: acdfda2009f0ea2c7f645638f1835d43d093f27c
 SHA512:
-  metadata.gz: ddff9ac7a922f69933783d8c072d9839429d214a457d486f626ff30a76340343affd4c5f2a937c6239f9776ad52aaa2603cd95476b1299c080bf4e4fb7d5fea3
-  data.tar.gz: faa9dc225784b397a2ae1e58d44456f2264fe6a573a31300a93904e45eb99e52084faf7193a59c2fd0c046ca92c7f23a0967eefef4a9cc2ce7dfd47fed4ab92f
+  metadata.gz: 46ee55cdbb2d71c15fe7cc6102aea19b78c19528ccdf4d948bcac9da2350a98182c9faefaedeeac5108ef64acc67667a2424225d01c2aac7f001b0cb7088a879
+  data.tar.gz: 4c945c4379334ab43ac7fc7cfa20dbed51f31da4439c39b2dc46694c56d7c9d33d37eef544b5ee0f7d98e8e763190bd6c8e478fe1b14e93b0e46ee916a8f702c

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

@@ -64,6 +64,7 @@ BlockContentController.prototype = {
 
           editor.on('blur', function(ev) {
             if ( !is_saved ) {
+              $(b).find("span > span[contenteditable='false']").remove();
               var html = $(b).html();
               $.ajax({
                 url: that.base_url() + '/' + target_id + '/value',
@@ -79,6 +80,7 @@ BlockContentController.prototype = {
 
           $(b).on('mouseleave', function(ev) {
             if ( !is_saved ) {
+              $(b).find("span > span[contenteditable='false']").remove();
               var html = $(b).html();
               $.ajax({
                 url: that.base_url() + '/' + target_id + '/value',
@@ -268,7 +270,7 @@ BlockContentController.prototype = {
   
   delete_block: function(block_id, confirm)
   {
-    var that = this;      
+    var that = this;
     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;
@@ -288,11 +290,10 @@ BlockContentController.prototype = {
       return;
     }
     else {
-      for (var i in this.selected_block_ids) {
-        var bid = this.selected_block_ids[i];
-        $('#block_' + bid).remove();
-        that.delete_block_save(bid);
-      }
+      $.each( this.selected_block_ids, function(k1,v1) {
+        $('#block_' + v1).remove();
+        that.delete_block_save(v1);
+      });
       that.selected_block_ids = [];
       that.add_dropzones();
       that.is_modified();

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

@@ -112,7 +112,7 @@ var BlockModalController = ModalController.extend({
       }
       if (that.block.block_type.allow_child_blocks)
       {        
-        div.append($('<p/>').css('clear', 'both').append($('<a/>').attr('href', '#').html(that.add_child_link_text ? that.add_child_link_text : "Add a child block!").click(function(e) {
+        div.append($('<p/>').css('clear', 'both').append($('<a/>').addClass('caboose-btn').attr('href', '#').html(that.add_child_link_text ? that.add_child_link_text : "Add a child block!").click(function(e) {
           e.preventDefault();
           that.add_block();
         })));                            
@@ -205,7 +205,7 @@ var BlockModalController = ModalController.extend({
 
   render_child_blocks: function()
   {
-    var that = this;    
+    var that = this;
     if (that.block.block_type.field_type != 'block' && that.block.children.length == 0)
       return;
     $.each(that.block.children, function(i, b) { if ( b.name != null || that.block.block_type.default_child_block_type_id == b.block_type.id ) { that.render_child_block(b); } });        
@@ -213,7 +213,7 @@ var BlockModalController = ModalController.extend({
   
   render_child_block: function(b)
   {
-    var that = this;    
+    var that = this;
     if (that.complex_field_types.indexOf(b.block_type.field_type) > -1)
     {
       if (!b.rendered_value)
@@ -223,7 +223,6 @@ var BlockModalController = ModalController.extend({
           type: 'get',
           success: function(html) {
             $('#the_modal #block_' + b.id).replaceWith(html);
-            
             var b2 = that.block_with_id(b.id);            
             b2.rendered_value = html;
             that.set_clickable(b2);                            

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

@@ -112,7 +112,7 @@ var BlockModalController = ModalController.extend({
       }
       if (that.block.block_type.allow_child_blocks)
       {        
-        div.append($('<p/>').css('clear', 'both').append($('<a/>').attr('href', '#').html(that.add_child_link_text ? that.add_child_link_text : "Add a child block!").click(function(e) {
+        div.append($('<p/>').css('clear', 'both').append($('<a/>').addClass('caboose-btn').attr('href', '#').html(that.add_child_link_text ? that.add_child_link_text : "Add a child block!").click(function(e) {
           e.preventDefault();
           that.add_block();
         })));                            

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

@@ -30,8 +30,8 @@ var ModalController = Class.extend({
       closeButton: false,
       opacity: 0.50,
       onComplete: function() {        
-        var arr = ['TopLeft','TopCenter','TopRight','BottomLeft','BottomCenter','BottomRight','MiddleLeft','MiddleRight'];
-        for (var i in arr) $('#cbox' + arr[i]).css('background-color', '#fff !important');        
+        // var arr = ['TopLeft','TopCenter','TopRight','BottomLeft','BottomCenter','BottomRight','MiddleLeft','MiddleRight'];
+        // for (var i in arr) $('#cbox' + arr[i]).css('background-color', '#fff !important');        
         $("#cboxClose").hide();
         if (callback) callback();        
       }

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

@@ -20,6 +20,7 @@
       text-align: center;
       height: 52px;
       margin-bottom: 10px;
+      color: #252525;
     }
   }
   #new_blocks {
@@ -98,6 +99,7 @@
     font-weight: 300 !important;
     font-size: 15px !important;
     padding: 8px 6px 6px 6px;
+    color: #252525;
     &:focus {
       outline-width: 0;
       border-color: #28acc1;

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

@@ -8,7 +8,7 @@
 #the_modal div.icons a:hover span.icon { color: #000 !important; }
 #the_modal div.icons a:hover span.name { color: #000 !important; }
 
-#the_modal { box-sizing: border-box; }   
+#the_modal { box-sizing: border-box; color: #252525; }   
 #the_modal p { margin-bottom: 10px; }
 #the_modal .mb_container input { border: #ccc 1px solid; }                                                          
 #the_modal div.mb_container div.mb_placeholder { top: 9px; }

data/app/controllers/caboose/blocks_controller.rb

@@ -85,7 +85,7 @@ module Caboose
       blocks = []
       if params[:id]
         b = Block.find(params[:id])
-        b.create_children(status: 'added') if Caboose::Block.where(:parent_id => b.id).count == 0
+        b.create_children(status: 'added') # if Caboose::Block.where(:parent_id => b.id).count == 0
         bt = b.block_type
         blocks << { 
           'id'                 => b.id,
@@ -138,7 +138,7 @@ module Caboose
           :block_id => b.id,
           :text => bt.description
         }        
-        b = b.parent
+        b = (b.new_parent_id.blank? ? b.parent : Caboose::Block.find(b.new_parent_id))
       end
       return crumbs.reverse
     end
@@ -146,7 +146,8 @@ module Caboose
     def admin_tree_helper(b,level)
       arr = []
       if level < 3
-        b.filtered_children(true,true).each do |b2|
+        sort_by_id = b.block_type.default_child_block_type_id.nil? ? true : false
+        b.filtered_children(true,sort_by_id).each do |b2|
           bt = b2.block_type
           arr << {
             'id'                 => b2.id,
@@ -483,7 +484,9 @@ module Caboose
                 b = RichTextBlockParser.parse(b, v, request.host_with_port)
               else
                 if b.block_type.field_type == 'checkbox_multiple'
-                  b.new_value = Block.parse_checkbox_multiple_value(b, v)
+                  pv = Block.parse_checkbox_multiple_value(b, v)
+                  b.new_value = (pv.blank? ? 'EMPTY' : pv)
+                  b.status = 'edited' if b.status == 'published'
                 else                    
                   b.new_value = (v.blank? ? 'EMPTY' : v)
                   b.status = 'edited' if b.status == 'published'
@@ -689,9 +692,9 @@ module Caboose
       return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
-      par = Block.where(:name => nil).where(:id => (b.new_parent_id.blank? ? b.parent_id : b.new_parent_id)).first
+      par = Block.where("name is null or name like '%column%'").where(:id => (b.new_parent_id.blank? ? b.parent_id : b.new_parent_id)).first
       resp.parent_id = par ? par.id : nil
-      gp = par ? Block.where(:name => nil).where(:id => (par.new_parent_id.blank? ? par.parent_id : par.new_parent_id)).first : nil
+      gp = par ? Block.where("name is null or name like '%column%'").where(:id => (par.new_parent_id.blank? ? par.parent_id : par.new_parent_id)).first : nil
       resp.grandparent_id = gp ? gp.id : nil
       render :json => resp
     end
@@ -707,7 +710,7 @@ module Caboose
         b.new_sort_order = (b2.new_sort_order.blank? ? b2.sort_order : b2.new_sort_order)
         i = 1
         sibs = b2.siblings(b.new_sort_order)
-        Caboose.log("updating #{sibs.count} siblings")
+    #    Caboose.log("updating #{sibs.count} siblings")
         sibs.each do |b3|
           b3.new_sort_order = b.new_sort_order + i
           b3.status = 'edited' if b3.status == 'published'
@@ -719,7 +722,7 @@ module Caboose
         b.new_sort_order = (b2.new_sort_order.blank? ? (b2.sort_order + 1) : (b2.new_sort_order + 1))
         i = 1
         sibs = b2.siblings(b.new_sort_order)
-        Caboose.log("updating #{sibs.count} siblings")
+     #   Caboose.log("updating #{sibs.count} siblings")
         sibs.each do |b3|
           b3.new_sort_order = b.new_sort_order + i
           b3.status = 'edited' if b3.status == 'published'

data/app/models/caboose/block.rb

@@ -130,7 +130,7 @@ class Caboose::Block < ActiveRecord::Base
     blocks = []
     if editing
       sortby = sort_by_id ? 'block_type_id' : 'new_sort_order,id'
-      blocks = Caboose::Block.where("new_parent_id = ? or (parent_id = ? and new_parent_id is null)", self.id, self.id).order(sortby)
+      blocks = Caboose::Block.where("status != ?","deleted").where("new_parent_id = ? or (parent_id = ? and new_parent_id is null)", self.id, self.id).order(sortby)
     else
       blocks = Caboose::Block.where(:parent_id => self.id).order('sort_order,id')
     end
@@ -526,15 +526,24 @@ class Caboose::Block < ActiveRecord::Base
   
   # Parses the value given for a checkbox multiple block
   def self.parse_checkbox_multiple_value(b, arr)
-    current_value = b.value ? b.value.split('|') : []
+    current_value = b.new_value.blank? ? (b.value ? b.value.split('|') : []) : (b.new_value ? b.new_value.split('|') : [])
     v = arr[0]
     checked = arr[1].to_i == 1
-    if checked && !current_value.include?(v)
-      current_value << v      
-    elsif !checked && current_value.include?(v)
-      current_value.delete(v)
+    if v == 'all'
+      if checked && b.block_type && !b.block_type.options.blank?
+        Caboose.log(b.block_type.options)
+        return b.block_type.options.split("\n").join('|')
+      else
+        return ''
+      end
+    else
+      if checked && !current_value.include?(v)
+        current_value << v      
+      elsif !checked && current_value.include?(v)
+        current_value.delete(v)
+      end
+      return current_value.join('|')
     end
-    return current_value.join('|')
   end
 
   # block siblings (in editing mode)

data/app/models/caboose/media_category.rb

@@ -37,17 +37,21 @@ class Caboose::MediaCategory < ActiveRecord::Base
   
   def self.flat_tree_helper(cat, prefix, str)        
     cat.name = "#{str}#{cat.name}"
-    arr = [{
-      :id          => cat.id,
-      :parent_id   => cat.parent_id,
-      :site_id     => cat.site_id,      
-      :name        => cat.name,
-      :media_count => cat.media.count      
-    }]
-    cat.children.each do |cat2|
-      arr += self.flat_tree_helper(cat2, prefix, "#{str}#{prefix}")
+    if cat.name == "-&nbsp;&nbsp;Products"
+      return []
+    else
+      arr = [{
+        :id          => cat.id,
+        :parent_id   => cat.parent_id,
+        :site_id     => cat.site_id,      
+        :name        => cat.name,
+        :media_count => cat.media.count      
+      }]
+      cat.children.each do |cat2|
+        arr += self.flat_tree_helper(cat2, prefix, "#{str}#{prefix}")
+      end
+      return arr
     end
-    return arr
   end
   
   def self.tree_hash(site_id)
@@ -60,7 +64,7 @@ class Caboose::MediaCategory < ActiveRecord::Base
       :id => cat.id,
       :name => cat.name,
       :media_count => cat.media.count,
-      :children => cat.children.collect{ |kid| self.tree_hash_helper(kid) }
+      :children => (cat.name == 'Products' ? [] : cat.children.collect{ |kid| self.tree_hash_helper(kid) })
     }
   end
   

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.141'
+  VERSION = '0.9.142'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.141
+  version: 0.9.142
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg