caboose-cms 0.3.62 → 0.3.63

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFlM2FmNzJlZDJmN2MxZDdmMjM1NWVjMjdlYmRhYzRhZDNkY2I4ZA==
+    NGM1NjlmZmU1NWZjYTU1MjMzZTllZTBjZTMzMDI1ZTkxNmE3ODE4Yg==
   data.tar.gz: !binary |-
-    MmQ2MTc1YjRlMzZmMzQ5NzIxYTY3YjhiNTQ5YjI3ZGVjMzA1Yzk3Mg==
+    OGQ5OWUwZGQxZjUxZTNkZWY5ZjRlZTBiNWYxNTlkOTcxM2NmMzQ1Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjQ3NjgwMDlhMmNlZDM4MWRlZDEzNWM0ZmJiMzRkZjExNDMwMTE1NjNiMjhk
-    NTVmYzdjNTdlNDExZWEzY2QzZDc5MjU0YzdhMzhmY2FmYjU2N2YzYjhiNjU1
-    MmM5NTU3ZTNlZjNjNDA2NGViMGVhZjU1ZjNjNDFjMzgxOTdkOTg=
+    NWNmZWJhYTk2NjZkOTgzZGVjNWYxZGI2MWMzMjA5ODRjMzNiNzBiZDdkZWY3
+    YmJmNmQ4NDM5NzlkMzE3ZDE3OTEyOTMxNzE4MjdkYzkxY2JmMWI1MDlkMTEz
+    ZWY5NTc5YmZhNmIxMzc1YjYzNzQzZTUyOWQxNWU4ZjQzNGNiNjU=
   data.tar.gz: !binary |-
-    ZGMwYTBjOWFjMzliM2VlNTc0ZDZhNTZlYmQ3MDI1MjNhZDE3NjdmYTk2MDY3
-    OWNlOGJlZDAyZjQ4ODNmY2NkMDNhZjFmZmIzY2I1ZWYyNjdjMjRhZTEyYmE3
-    ZDQwZjcwNjQxMzEwZjU2MDdlMDY4Y2M4YWRhZjMwYjBlYWQyMTQ=
+    MzkzYzVmODM4MTNhYzllZDY4OGQyZjhjYWUyYzdhODZkOGExMWFmZjg0MzU5
+    MmFkZjQwZTg0NDhhZjJiZDBmZTA1MGQwMTNiZTRhZjVhNTY1MGE1OGI1ZTE4
+    MTZiMThmMTFmOTQxYjA4ODYzYmExYzlmYTI0Zjc0YjYwYTFhZDA=

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

@@ -21,6 +21,7 @@ BoundCheckbox = BoundControl.extend({
     var this2 = this;
     $('#'+this.el).wrap($('<div/>')
       .attr('id', this.el + '_container')
+      .addClass('mb_container')
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty();
@@ -28,7 +29,7 @@ BoundCheckbox = BoundControl.extend({
     {
       $('#'+this.el+'_container').append($('<div/>')
         .attr('id', this.placeholder)
-        .addClass('placeholder')
+        .addClass('mb_placeholder')
         .append($('<span/>').html(this.attribute.nice_name + ': '))
       );
     }
@@ -58,7 +59,7 @@ BoundCheckbox = BoundControl.extend({
       .attr('id', this.el + '_background')
       .attr('disabled', true)
       //.css('background', '#fff')
-      .addClass('checkbox_background')
+      .addClass('mb_checkbox_background')
     );
     if (this.attribute.width)
       $('#'+this.el+'_background').css('width' , this.attribute.width);

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

@@ -22,12 +22,13 @@ BoundCheckboxMultiple = BoundControl.extend({
     var this2 = this;
     $('#'+this.el).wrap($('<div/>')
       .attr('id', this.el + '_container')
+      .addClass('mb_container')
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty();
     $('#'+this.el+'_container').append($('<div/>')
       .attr('id', this.placeholder)
-      .addClass('placeholder')
+      .addClass('mb_placeholder')
       .append($('<span/>').html(this.attribute.nice_name + ': '))
     );
     $('#'+this.el+'_container').append($('<input/>')

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

@@ -22,7 +22,7 @@ BoundControl = Class.extend({
     {      
       $('#'+this.el+'_container').prepend($('<div/>')
         .attr('id', this.el + '_check')
-        .addClass('bound_input_check')
+        .addClass('mb_bound_input_check')
         .css('position', 'absolute')
         .css('top', 0)
         .css('left', w-h-1)
@@ -39,7 +39,7 @@ BoundControl = Class.extend({
       );
     }    
     $('#'+this.el+'_check a')
-      .addClass('loading')
+      .addClass('mb_loading')
       .css('margin-left', h);
     $('#'+this.el+'_check a').animate({ 'margin-left': 0 }, 300); 
   },

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

@@ -16,7 +16,11 @@ BoundFile = BoundControl.extend({
     this.placeholder = this.el + '_placeholder';
          
     var this2 = this;
-    $('#'+this.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
     $('#'+this.el+'_container').empty();
         
     var tr = $('<tr/>');
@@ -25,7 +29,7 @@ BoundFile = BoundControl.extend({
     {
       tr.append($('<td/>')
         .attr('id', this.placeholder)
-        .addClass('placeholder')
+        .addClass('mb_placeholder')
         .css('position', 'relative')
         .append($('<span/>').html(this.attribute.nice_name + ': '))
       );

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

@@ -20,7 +20,11 @@ BoundImage = BoundControl.extend({
       this.attribute.update_url = this.model.update_url;
          
     var this2 = this;
-    $('#'+this.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
     $('#'+this.el+'_container').empty();
     
     $('#'+this.el+'_container').append($('<img/>')

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

@@ -14,7 +14,11 @@ BoundRichText = BoundControl.extend({
     
     this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
 
-    $('#'+this.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
     $('#'+this.el+'_container').empty();
     $('#'+this.el+'_container').append($('<textarea/>').attr('id', this.el).attr('class', 'tinymce').attr('placeholder', 'empty').val(this.attribute.value));
     //$('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));

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

@@ -19,6 +19,7 @@ BoundSelect = BoundControl.extend({
          
     $('#'+this.el).wrap($('<div/>')
       .attr('id', this.el + '_container')
+      .addClass('mb_container')
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty();
@@ -26,16 +27,19 @@ BoundSelect = BoundControl.extend({
     {
       $('#'+this.el+'_container').append($('<div/>')
         .attr('id', this.placeholder)
-        .addClass('placeholder')
+        .addClass('mb_placeholder')
         .append($('<span/>')
           .html(this.attribute.nice_name + ': ')
         )
       );
     }
+    var this2 = this;
     $('#'+this.el+'_container').append($('<input/>')
+      .attr('type', 'text')
       .attr('id', this.el)
+      .addClass('mb_fake_option')
       .attr('placeholder', this.attribute.empty_text)
-      .on('focus', function() { this2.edit(); })
+      .click(function() { this2.edit(); })
       .val(this.attribute.text.length > 0 ? this.attribute.text : this.attribute.empty_text)
     );
     if (this.attribute.width)
@@ -55,17 +59,16 @@ BoundSelect = BoundControl.extend({
     //this.attribute.populate_options(function() {
     //  this2.print_options(this2);
     //});    
-    
-    var this2 = this;
+        
     this.attribute.populate_options(function() {
       var select = $('<select/>')
         .attr('id', this2.el + '_select')
-        .addClass('fake')
-        .css('width', $('#'+this2.el).outerWidth())
+        .addClass('mb_fake')
+        .css('width', $('#'+this2.el).outerWidth())        
         .on('change', function() {
           $('#'+this2.el).val($('#'+this2.el+'_select').val());
           this2.save();                     
-        });
+        });        
       // Make sure the existing value is in the list of options
       var exists = false;
       $.each(this2.attribute.options, function(i, option) {
@@ -127,8 +130,7 @@ BoundSelect = BoundControl.extend({
     
   },
     
-  edit: function() {
-    
+  edit: function() {        
   },
   
   save: function() {

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

@@ -14,7 +14,11 @@ BoundText = BoundControl.extend({
       this[thing] = params[thing];
     
     this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;    
-    $('#'+this.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
     $('#'+this.el+'_container').empty();
     $('#'+this.el+'_container').append($('<input/>')
       .attr('id', this.el)
@@ -25,7 +29,7 @@ BoundText = BoundControl.extend({
     );
     
     if (this.attribute.fixed_placeholder)      
-      $('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));
+      $('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('mb_placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));    
     if (this.attribute.width)  $('#'+this.el).css('width' , this.attribute.width);
     if (this.attribute.fixed_placeholder)
     {
@@ -39,9 +43,9 @@ BoundText = BoundControl.extend({
       if (e.keyCode == 13) this2.save();   // Enter
       
       if ($('#'+this2.el).val() != this2.attribute.value_clean)
-        $('#'+this2.el).addClass('dirty');
+        $('#'+this2.el).addClass('mb_dirty');
       else
-        $('#'+this2.el).removeClass('dirty');
+        $('#'+this2.el).removeClass('mb_dirty');
     });                             
     $('#'+this.el).on('blur', function() {
       if (this2.save_attempts < 1)

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

@@ -14,10 +14,14 @@ BoundTextarea = BoundControl.extend({
     
     this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
          
-    $('#'+this.el).wrap($('<div/>').attr('id', this.el + '_container').css('position', 'relative'));
+    $('#'+this.el).wrap($('<div/>')
+      .attr('id', this.el + '_container')
+      .addClass('mb_container')
+      .css('position', 'relative')
+    );
     $('#'+this.el+'_container').empty();
     $('#'+this.el+'_container').append($('<textarea/>').attr('id', this.el).attr('placeholder', 'empty').val(this.attribute.value));
-    $('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));
+    $('#'+this.el+'_container').append($('<div/>').attr('id', this.el + '_placeholder').addClass('mb_placeholder').append($('<span/>').html(this.attribute.nice_name + ': ')));
     if (this.attribute.width)  $('#'+this.el).css('width'  , this.attribute.width);
     if (this.attribute.height) $('#'+this.el).css('height' , this.attribute.height);
     var h = $('#'+this.el+'_placeholder').outerHeight();
@@ -31,10 +35,10 @@ BoundTextarea = BoundControl.extend({
       if ($('#'+this2.el).val() != this2.attribute.value_clean)
       {
         this2.show_controls();
-        $('#'+this2.el).addClass('dirty');
+        $('#'+this2.el).addClass('mb_dirty');
       }
       else
-        $('#'+this2.el).removeClass('dirty');
+        $('#'+this2.el).removeClass('mb_dirty');
     });                             
     $('#'+this.el).on('blur', function() { this2.save(); });
   },
@@ -46,7 +50,7 @@ BoundTextarea = BoundControl.extend({
     var this2 = this;
     $('#'+this.el+'_container').prepend($('<div/>')
       .attr('id', this.el + '_controls')
-      .addClass('bound_textarea_controls')
+      .addClass('mb_bound_textarea_controls')
       .css('position', 'absolute')
       .css('top', 0)
       .css('left', w-148)
@@ -55,8 +59,8 @@ BoundTextarea = BoundControl.extend({
       .append($('<div/>')
         .css('width', 148)
         .css('margin-left', 148)
-        .append($('<a/>').html('Save'   ).addClass('save'   ).css('width', 60).attr('href', '#').click(function(event) { event.preventDefault(); this2.save();   }))
-        .append($('<a/>').html('Discard').addClass('discard').css('width', 80).attr('href', '#').click(function(event) { event.preventDefault(); this2.cancel(); }))
+        .append($('<a/>').html('Save'   ).addClass('mb_save'   ).css('width', 60).attr('href', '#').click(function(event) { event.preventDefault(); this2.save();   }))
+        .append($('<a/>').html('Discard').addClass('mb_discard').css('width', 80).attr('href', '#').click(function(event) { event.preventDefault(); this2.cancel(); }))
       )
     );  
     $('#'+this.el+'_controls div').animate({ 'margin-left': 0 }, 300); 

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

@@ -11,7 +11,8 @@
  *= require colorbox-rails 
  *= require caboose/fonts
  *= require caboose/page_bar_generator
- *= require caboose/caboose 
+ *= require caboose/caboose
+ *= require caboose/model_binder 
  *= require application
  */
 

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

@@ -0,0 +1,118 @@
+
+.mb_container {
+  width: 100%;  
+}
+
+.mb_container div.mb_model_attribute_text {
+  color: #000;
+}
+
+.mb_container input[type=text],
+.mb_container select,
+.mb_container .mb_fake option,
+.mb_container option {
+  font-size: 16px !important;
+}
+
+.mb_container input.mb_dirty,
+.mb_container textarea.mb_dirty {
+  background: #fff799;  
+}
+
+.mb_container select.mb_fake {
+  background: transparent;
+  position: absolute;
+  top: 0;
+  left: 0;
+  color: transparent;
+  background: transparent;
+  height: 50px !important;
+}
+
+.mb_container select.mb_fake option {
+  background: #fff;
+  color: #000;
+}
+
+.mb_container .mb_bound_input_check a,
+.mb_container .mb_bound_input_cancel a {
+  border: 1px solid #ccc;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  
+  font-size: 28px;
+  text-align: center;
+  background: #00cc00;
+  color: #fff;
+  
+  display: block;
+  padding: 4px 0;
+  height: 34px;
+}
+
+.mb_container .mb_bound_input_check a.loading {
+  background-image: url(/assets/caboose/loading_green.gif);
+  background-color: #00cc00;
+  background-repeat: no-repeat;
+  background-position: 6px 5px;
+  color: rgba(255, 255, 255, 0.0);
+}
+
+.mb_container .mb_bound_textarea_controls a {
+  display: inline-block;
+  margin: 3px 0 0 1px;
+  padding: 8px 0 6px 0;
+  background: #ccc;
+  color: #000;
+  text-align: center;
+  border: #666 1px solid;
+}
+
+.mb_container .mb_bound_textarea_controls a.save    { width: 60px; }
+.mb_container .mb_bound_textarea_controls a.discard { width: 80px; }
+  
+div.mb_container div.mb_placeholder {
+  display: block;
+  margin: 0;
+  padding: 0 5px 0 0;
+  /*height: 34px;*/
+  
+  position: absolute;
+  top: 12px;
+  left: 10px;
+  z-index: 19;  
+}
+
+.mb_container .mb_placeholder span {
+  display: block;
+  font-size: 20px;
+  color: #757575;
+}
+
+.mb_container input[type='checkbox'] {
+  /*position: absolute;*/
+  top: 4px;
+  left: 0;
+  z-index: 19;
+  
+  margin: 0;
+  padding: 0;
+  width: 20px;
+}
+
+.mb_container div.model_attribute_text {
+  color: #fff;
+}
+
+.mb_container .mb_model_attribute {
+  background: none repeat scroll 0 0 transparent;
+  display: block;
+  padding: 2px 4px;
+  text-decoration: none;
+}
+
+.mb_container .mb_clear {
+  clear: both;
+  line-height: 0;  
+}

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.62'
+  VERSION = '0.3.63'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.62
+  version: 0.3.63
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,6 +193,7 @@ files:
 - app/assets/stylesheets/caboose/fonts.css
 - app/assets/stylesheets/caboose/login.css
 - app/assets/stylesheets/caboose/modal.css
+- app/assets/stylesheets/caboose/model_binder.css
 - app/assets/stylesheets/caboose/page_bar_generator.css
 - app/assets/stylesheets/caboose/register.css
 - app/assets/stylesheets/caboose/station_modal.css