caboose-cms 0.5.111 → 0.5.112

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2E3NTQ0YTk2ZTM3YmEzMjllYzk0N2U3Y2FlMzBkYWE5MGQ2YTVlZQ==
+    MzNkMThkYWRmNGE4MDhjMDdlZjBjM2EyMGIzNGEyYjM3Y2M5MjcxMQ==
   data.tar.gz: !binary |-
-    ZjViMjY5YWU2MTE3MGE4MzdiMDM1MzM4ODZhOTM5YzBiOTlhYWQ3Zg==
+    MzI5ODQ2ODVjNjNmYTYyMDE5NGY2OTlmMjE1ZmFiMmRkOWM4NzUyMg==
 SHA512:
   metadata.gz: !binary |-
-    MjI4OGM4ODFkYTU3Y2U5MGU4ZjJjZDNiMWY5ZjUzZGIzNWMzMDljM2Y2MTMy
-    ZjRjNjMwNDc1YTYzMDk0OWRjMWE5Y2NmNzE2NTMwMDlmZDBkYjI5NjU3MWM1
-    YTRjNmM3ODJjYTIwMTZhOTkwYWE3NGJhNjFmYzEyNjAzODNkY2E=
+    ZmViYzYxMDVkMzc1Y2RmMGIzMjhkMDYyZDY0OTcyZTk0ZGE5NTgxZDY4OWJk
+    MDQ1ZWFjZTA0NzdiOTM1ZjkzMTU5YTc1ZWVkZGQwMjcwNGExZWZiNmM4M2Fm
+    MWY0YTA4YWMzNDIwMjFjNWJiY2E5MzQxNTVmYmEyMzRhNmExYTA=
   data.tar.gz: !binary |-
-    OWEyOTMwMmJkZmQxMTUzN2VhYzhjYTA4ODU1YTk0MDA5MGUzZDk3NzEyN2Iw
-    NTliZDAxYTQyMDIwYWJhMjBkMjIxYjE3NTAwNWFiNjQ3NTkyMzkxYTUzOTg1
-    ZWU3NWI3OWJiMThiOTk2NDg5MjA3NTA0MDZhOGE2Zjg0YmVjNzE=
+    N2U4MjFkN2E1YWRkODU2YjA0MjhiZWY0MjVhMzczMTcyMTg5Nzk2NTE2NTI2
+    Yjk1YjAzZDgxYjZlZWFiZjk3MjZjMDliNmQ2OTdiNTFkZTk1Y2I0ZGQ3Yjdl
+    NGU2ZTRlN2ViOWFmOWQ1YmRhYTRkZDNiYzRjZGQ5ZWE2YWFiY2Y=

data/app/controllers/caboose/block_types_controller.rb

@@ -124,6 +124,7 @@ module Caboose
           when 'options'                         then bt.options                        = v
           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 'site_id'                         then bt.toggle_site(v[0], v[1])
         end
       end

data/app/controllers/caboose/blocks_controller.rb

@@ -265,6 +265,7 @@ module Caboose
             b.sort_order = Block.where(:parent_id => v).count
           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 'name'          then b.name          = v
           when 'value'         then
             

data/app/models/caboose/block.rb

@@ -26,6 +26,7 @@ class Caboose::Block < ActiveRecord::Base
     :parent_id,
     :block_type_id,
     :sort_order,
+    :constrain,
     :name,
     :value        
     

data/app/models/caboose/block_type.rb

@@ -18,7 +18,7 @@ class Caboose::BlockType < ActiveRecord::Base
     :use_render_function_for_layout,
     :allow_child_blocks,
     :default_child_block_type_id,
-    :render_function,
+    :render_function,    
     :field_type, 
     :default, 
     :width,
@@ -28,6 +28,7 @@ class Caboose::BlockType < ActiveRecord::Base
     :options_function,
     :options_url,
     :icon,
+    :default_constrain,
     :share,      # Whether or not to share the block type in the existing block store.
     :downloaded  # Whether the full block type has been download or just the name and description.
     

data/app/models/caboose/schema.rb

@@ -144,6 +144,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :parent_id             , :integer ],
         [ :block_type_id         , :integer ],
         [ :sort_order            , :integer , { :default => 0 }],
+        [ :constrain             , :boolean , { :default => false }],
         [ :name                  , :string  ],
         [ :value                 , :text    ],
         [ :file                  , :attachment ],
@@ -169,6 +170,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :options                         , :text    ],
         [ :options_function                , :text    ],
         [ :options_url                     , :string  ],
+        [ :default_constrain               , :boolean , { :default => false }],
         [ :share                           , :boolean , { :default => true  }],
         [ :downloaded                      , :boolean , { :default => false }]
       ],

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

@@ -30,6 +30,7 @@ bt = @block_type
 <p><div id='blocktype_<%= bt.id %>_use_render_function_for_layout'  ></div></p>
 <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 %>_render_function'                 ></div></p>
 <p><div id='blocktype_<%= bt.id %>_options_function'                ></div></p>
 
@@ -101,6 +102,7 @@ $(document).ready(function() {
       { 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: '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_advanced.html.erb

@@ -20,6 +20,7 @@ end
 <div id='advanced'>
   <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>
 </div>
 <div id='message'></div>
 <p>
@@ -70,6 +71,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: 'constrain', 
+      nice_name: 'Constrain', 
+      type: 'checkbox', 
+      value: <%= raw Caboose.json(b.constrain ? 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.111'
+  VERSION = '0.5.112'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.111
+  version: 0.5.112
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg