caboose-cms 0.5.112 → 0.5.113

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzNkMThkYWRmNGE4MDhjMDdlZjBjM2EyMGIzNGEyYjM3Y2M5MjcxMQ==
+    MzAyYTgwZTFiYWRkY2ZlZmZhZTAyZmYwZGZlYzE0MWQ3ZmY0MjE2OA==
   data.tar.gz: !binary |-
-    MzI5ODQ2ODVjNjNmYTYyMDE5NGY2OTlmMjE1ZmFiMmRkOWM4NzUyMg==
+    OGU1OTZhNDljNzE4MTM3ZGI0NzZlNWMzZTg3MThkOGQ3ODAwOGY1ZA==
 SHA512:
   metadata.gz: !binary |-
-    ZmViYzYxMDVkMzc1Y2RmMGIzMjhkMDYyZDY0OTcyZTk0ZGE5NTgxZDY4OWJk
-    MDQ1ZWFjZTA0NzdiOTM1ZjkzMTU5YTc1ZWVkZGQwMjcwNGExZWZiNmM4M2Fm
-    MWY0YTA4YWMzNDIwMjFjNWJiY2E5MzQxNTVmYmEyMzRhNmExYTA=
+    YWFmM2FmN2JiY2E0N2JhNjBiNWRiNjhhMDY5NDQwMzdjZDEwMTIwMDg2ODNm
+    MjNjNGI1NjU2NzRmYTllMzA0ZTUxMmIxZGUyMzQ5NjQ0YmRmMzUyNjBiNTMx
+    MTI4NzY4NGVjY2Q3M2JiOWZkNGQyNzJjMjIxM2E0MzU3NzQ2YWQ=
   data.tar.gz: !binary |-
-    N2U4MjFkN2E1YWRkODU2YjA0MjhiZWY0MjVhMzczMTcyMTg5Nzk2NTE2NTI2
-    Yjk1YjAzZDgxYjZlZWFiZjk3MjZjMDliNmQ2OTdiNTFkZTk1Y2I0ZGQ3Yjdl
-    NGU2ZTRlN2ViOWFmOWQ1YmRhYTRkZDNiYzRjZGQ5ZWE2YWFiY2Y=
+    NTJkNjc3MGEzNmQ4ZDhlNmRjMzU4ZGZmYmRmOGYwNDBkY2NhNjE3YTE3NWM0
+    YzEwMDkxNDUyODc3OWM0ZjUwNzZiODI1YTIzMTk3NjEzZWVjY2NjODM0MDE1
+    YjQ2YmYwZjRlZTVjNmFkZWJmYTdhZGNiMDU1MjA0MTVlMzFjY2M=

data/app/controllers/caboose/block_types_controller.rb

@@ -125,6 +125,7 @@ module Caboose
           when 'options_function'                then bt.options_function               = v
           when 'options_url'                     then bt.options_url                    = v
           when 'default_constrain'               then bt.default_constrain              = v
+          when 'default_full_width'              then bt.default_full_width             = v
           when 'site_id'                         then bt.toggle_site(v[0], v[1])
         end
       end

data/app/controllers/caboose/blocks_controller.rb

@@ -266,6 +266,7 @@ module Caboose
           when 'block_type_id' then b.block_type_id = v
           when 'sort_order'    then b.sort_order    = v
           when 'constrain'     then b.constrain     = v
+          when 'full_width'    then b.full_width    = v
           when 'name'          then b.name          = v
           when 'value'         then
             

data/app/models/caboose/block.rb

@@ -27,6 +27,7 @@ class Caboose::Block < ActiveRecord::Base
     :block_type_id,
     :sort_order,
     :constrain,
+    :full_width,
     :name,
     :value        
     
@@ -403,5 +404,12 @@ class Caboose::Block < ActiveRecord::Base
     end
     return changed            
   end
+  
+  def constrain_all         
+    self.children.each do |b|
+      return false if b.full_width == true
+    end
+    return true
+  end
 
 end

data/app/models/caboose/schema.rb

@@ -145,6 +145,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :block_type_id         , :integer ],
         [ :sort_order            , :integer , { :default => 0 }],
         [ :constrain             , :boolean , { :default => false }],
+        [ :full_width            , :boolean , { :default => false }],
         [ :name                  , :string  ],
         [ :value                 , :text    ],
         [ :file                  , :attachment ],
@@ -171,6 +172,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :options_function                , :text    ],
         [ :options_url                     , :string  ],
         [ :default_constrain               , :boolean , { :default => false }],
+        [ :default_full_width              , :boolean , { :default => false }],
         [ :share                           , :boolean , { :default => true  }],
         [ :downloaded                      , :boolean , { :default => false }]
       ],

data/app/views/caboose/block_types/admin_edit.html.erb

@@ -31,6 +31,7 @@ bt = @block_type
 <p><div id='blocktype_<%= bt.id %>_allow_child_blocks'              ></div></p>
 <p><div id='blocktype_<%= bt.id %>_default_child_block_type_id'     ></div></p>
 <p><div id='blocktype_<%= bt.id %>_default_constrain'               ></div></p>
+<p><div id='blocktype_<%= bt.id %>_default_full_width'              ></div></p>
 <p><div id='blocktype_<%= bt.id %>_render_function'                 ></div></p>
 <p><div id='blocktype_<%= bt.id %>_options_function'                ></div></p>
 
@@ -101,8 +102,9 @@ $(document).ready(function() {
       { name: 'default'                        , sort: 'default'                        , show: false , bulk_edit: false, nice_name: 'Default value'                  , type: 'text'              , value: function(bt) { return bt.default;                         }, width: 400 },
       { name: 'width'                          , sort: 'width'                          , show: false , bulk_edit: false, nice_name: 'Width'                          , type: 'text'              , value: function(bt) { return bt.width;                           }, width: 400 },
       { name: 'height'                         , sort: 'height'                         , show: false , bulk_edit: false, nice_name: 'Height'                         , type: 'text'              , value: function(bt) { return bt.height;                          }, width: 400 },
-      { name: 'fixed_placeholder'              , sort: 'fixed_placeholder'              , show: false , bulk_edit: false, nice_name: 'Fixed placeholder'              , type: 'checkbox'          , value: function(bt) { return bt.fixed_placeholder;               }, text: function(bt) { return bt.fixed_placeholder ? 'Yes' : 'No' }, width: 400 },
-      { name: 'default_constrain'              , sort: 'default_constrain'              , show: false , bulk_edit: false, nice_name: 'Constrain by Default'           , type: 'checkbox'          , value: function(bt) { return bt.default_constrain;               }, text: function(bt) { return bt.default_constrain ? 'Yes' : 'No' }, width: 400 },
+      { name: 'fixed_placeholder'              , sort: 'fixed_placeholder'              , show: false , bulk_edit: false, nice_name: 'Fixed placeholder'              , type: 'checkbox'          , value: function(bt) { return bt.fixed_placeholder;               }, text: function(bt) { return bt.fixed_placeholder  ? 'Yes' : 'No' }, width: 400 },
+      { name: 'default_constrain'              , sort: 'default_constrain'              , show: false , bulk_edit: false, nice_name: 'Constrain by Default'           , type: 'checkbox'          , value: function(bt) { return bt.default_constrain;               }, text: function(bt) { return bt.default_constrain  ? 'Yes' : 'No' }, width: 400 },
+      { name: 'default_full_width'             , sort: 'default_full_width'             , show: false , bulk_edit: false, nice_name: 'Full Width by Default'          , type: 'checkbox'          , value: function(bt) { return bt.default_full_width;              }, text: function(bt) { return bt.default_full_width ? 'Yes' : 'No' }, width: 400 },
       { name: 'options_url'                    , sort: 'options_url'                    , show: false , bulk_edit: false, nice_name: 'Options URL'                    , type: 'text'              , value: function(bt) { return bt.options_url;                     }, width: 400 },
       { name: 'options_function'               , sort: 'options_function'               , show: false , bulk_edit: false, nice_name: 'Options Function'               , type: 'textarea'          , value: function(bt) { return bt.options_function;                }, width: 400, height: 100 },
       { name: 'options'                        , sort: 'options'                        , show: false , bulk_edit: false, nice_name: 'Options'                        , type: 'textarea'          , value: function(bt) { return bt.options;                         }, width: 400, height: 100 }            

data/app/views/caboose/blocks/admin_edit.html.erb

@@ -44,7 +44,7 @@ end
   <p><div id='block_<%= @block.id %>_value'></div></p>
 <% else %>  
   <% if @block.children.count > 0 %>  
-    <% @block.children.order(:id).each do |b| %>
+    <% @block.children.order(:sort_order).each do |b| %>
       <% if b.block_type.field_type != 'block' && b.block_type.field_type != 'richtext' %>
         <div style='margin-bottom: 10px;'><div id='block_<%= b.id %>_value'></div></div>
       <% else %>

data/app/views/caboose/blocks/admin_edit_advanced.html.erb

@@ -21,6 +21,7 @@ end
   <p><div id='block_<%= @block.id %>_block_type_id' ></div></p>
   <p><div id='block_<%= @block.id %>_parent_id'     ></div></p>
   <p><div id='block_<%= @block.id %>_constrain'     ></div></p>
+  <p><div id='block_<%= @block.id %>_full_width'    ></div></p>
 </div>
 <div id='message'></div>
 <p>
@@ -81,6 +82,16 @@ $(document).ready(function() {
       after_update: function() { parent.controller.render_blocks(); },
       after_cancel: function() { parent.controller.render_blocks(); },
       on_load: function() { that.modal.autosize(); }
+    },{ 
+      name: 'full_width', 
+      nice_name: 'Full Width', 
+      type: 'checkbox', 
+      value: <%= raw Caboose.json(b.full_width ? 1 : 0) %>, 
+      width: 400, 
+      fixed_placeholder: true, 
+      after_update: function() { parent.controller.render_blocks(); },
+      after_cancel: function() { parent.controller.render_blocks(); },
+      on_load: function() { that.modal.autosize(); }
     }]
   });
 });    

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.112'
+  VERSION = '0.5.113'
 end

metadata

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