caboose-cms 0.3.24 → 0.3.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTVlMDBhZjQ0MzU1OWEyMjUwNDcwZjNkMDE0MzJmMTU3NmQwYzcwZQ==
+    YmIzZmU0ZTNhYTRhNmQ5ODljZTc0ODk1NTk0MmQ0NTQ3MGRkNzdhYw==
   data.tar.gz: !binary |-
-    NTE0NTFlMTgxYjMwZDZhYjI5Yjk5ZTVhMzBiMmYwODcyOWQzYTZhMA==
+    ZDNmYjZlNGIwNzdkNjJiOWQ1MDc0MWE3MTJiZTM5NTFhM2QzZGE5OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2Q5ZTAxNzdkZDAwZDNhM2M4N2RkNGQxOWZlODlkZjIxM2VkZWM1YTE1YmI0
-    MTQ5MTVkOTZhYWE3NjFlZThhZTgxYjkyZWIwOGQ4MTNmOTQ2ZjBjYTFhZGRh
-    ZGFlNWM5ZTVlNWIyYjljYzA1OTcwYzMyM2I4NjRiYTdjMGIyNDQ=
+    Zjg0ODIyNjAxNzFmZGZmY2E4YTg0YTJiMmQxMWNhZWYxMTdkOTNhNTkyY2Zh
+    NDA5N2FhOTRmMDA4ZmJmNjZjZDM5YzE3M2U1YTk0MGRlNDEyMDI5Yjg0OWNi
+    YzFlMGQ1OGQ0Mjc2OTRmNGM1Yjc3Mjg5NmNkN2Q2NWM5MWM4OWU=
   data.tar.gz: !binary |-
-    NGZjYzdmZTliMTM4NDYwZDI3MTAyNTRjMzY3MWU5MTY4YTBhM2FmZjEzYTcw
-    YzcxZGZlNmUwODJlYTlkMWM5MDlhMjg5MDY1Njg2NTZiNTQzZDA3ODIxMWYy
-    ZTQ2MTI0ZDk4ODAyOGI0MWY5Mjg2MTU3ZjA2Y2JmNzk2YjQ0NTY=
+    MTgwMjUzZWZhYWM5NGZlMzljZGQwNDQzNjBkNTNjZGNmYjc1MDFjYmIzMGQ5
+    YzRmMDQwNzIxMjM0MjUwZmEyZWE3MWZhMzY4NGFiMzA5ZTU3YWE4NGIxNjYx
+    MzAwYTNiN2FmMzE5Y2E0ZDFhNGMzYzZjZDA2NGY0MGRhYTgxZGE=

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

@@ -48,11 +48,12 @@ $(document).ready(function() {
   //$('#caboose_login'    ).colorbox({ iframe: true, initialWidth: 400, initialHeight: 200, innerWidth: 400, innerHeight: 200, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 });
   //$('#caboose_register' ).colorbox({ iframe: true, initialWidth: 400, initialHeight: 324, innerWidth: 400, innerHeight: 324, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 });
   //$('#caboose_station'  ).colorbox({ iframe: true, initialWidth: 200, initialHeight: 50,  innerWidth: 200, innerHeight:  50, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 });
+  $('a.caboose_modal').each(function(i, a) { caboose_modal(a); });  
 });
 
 function caboose_modal(el)
 {
-  $('#'+el).colorbox({ 
+  $(typeof(el) == 'String' ? '#'+el : el).colorbox({ 
     iframe: true, 
     initialWidth: 400, 
     initialHeight: 200, 

data/app/assets/javascripts/caboose/model/bound_checkbox.js

@@ -35,17 +35,23 @@ BoundCheckbox = BoundControl.extend({
     var cb = $('<input/>')
       .attr('id', this.el)
       .attr('type', 'checkbox')      
-      .attr('checked', this.attribute.value)
+      .attr('checked', this.attribute.value == 1)
       .on('change', function() {        
         this2.save(); 
-      });
+      });    
+    $('#'+this.el+'_container').append(cb);
+    
     if (this.attribute.align == 'right')
-      cb.css('left', this.attribute.width - 10)
+      $('#'+this.el).css('left', this.attribute.width - 10)
     else if (this.attribute.align == 'center')
-      cb.css('left', Math.floor($('#'+this.el+'_container').outerWidth()/2))
+      $('#'+this.el).css('left', Math.floor($('#'+this.el+'_container').outerWidth()/2))
     else // left
-      cb.css('left', $('#'+this.placeholder).outerWidth() + 10)
-    $('#'+this.el+'_container').append(cb);
+    {
+      //alert(this.placeholder);
+      //alert($('#'+this.placeholder).html());
+      //alert($('#'+this.placeholder).outerWidth());
+      $('#'+this.el).css('left', $('#'+this.placeholder).outerWidth(true) + 10);
+    }
     
     $('#'+this.el+'_container').append($('<input/>')
       .attr('type', 'text')

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.24'
+  VERSION = '0.3.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.3.25
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails