caboose-cms 0.8.43 → 0.8.44

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

@@ -45,9 +45,29 @@ $(document).ready(function() {
   //caboose_modal('caboose_login');
   //caboose_modal('caboose_register');
   //caboose_modal('caboose_station');    
-  $('a.caboose_modal').each(function(i, a) { caboose_modal($(a)); });  
+  $('a.caboose_modal').each(function(i, a) { caboose_modal_iframe($(a)); });  
 });
 
+function caboose_modal_iframe(el)
+{
+  var options = {
+    iframe: true,
+    initialWidth: 400, 
+    initialHeight: 200, 
+    innerWidth: 400, 
+    innerHeight: 200, 
+    scrolling: false, 
+    transition: 'fade', 
+    closeButton: false, 
+    onComplete: caboose_fix_colorbox, 
+    opacity: 0.50 
+  };  
+  if (typeof(el) == 'string')
+    $('#'+el).colorbox(options);
+  else
+    el.colorbox(options);  
+}
+
 function caboose_modal(el)
 {
   var options = {      

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

@@ -26,11 +26,11 @@ BoundCheckbox = BoundControl.extend({
     );
     $('#'+this.el+'_container').empty();
     if (this.attribute.fixed_placeholder)
-    {
+    {            
       $('#'+this.el+'_container').append($('<div/>')
         .attr('id', this.placeholder)
         .addClass('mb_placeholder')
-        .append($('<span/>').html(this.attribute.nice_name + ': '))
+        .append($('<span/>').html(this.attribute.nice_name + (this.attribute.nice_name[this.attribute.nice_name.length-1] == '?' ? '' : ':') + ' '))
       );
     }
     var cb = $('<input/>')
@@ -48,10 +48,8 @@ BoundCheckbox = BoundControl.extend({
       $('#'+this.el).css('left', Math.floor($('#'+this.el+'_container').outerWidth()/2))
     else // left
     {
-      //alert(this.placeholder);
-      //alert($('#'+this.placeholder).html());
-      //alert($('#'+this.placeholder).outerWidth());
-      $('#'+this.el).css('left', $('#'+this.placeholder).outerWidth(true) + 10);
+      this.set_placeholder_padding();
+      //$('#'+this.el).css('left', $('#'+this.placeholder).outerWidth(true) + 10);
     }
     
     $('#'+this.el+'_container').append($('<input/>')
@@ -65,6 +63,15 @@ BoundCheckbox = BoundControl.extend({
       $('#'+this.el+'_background').css('width' , this.attribute.width);
   },
   
+  set_placeholder_padding: function() {
+    var that = this;
+    var w = $('#'+that.placeholder).outerWidth(true);
+    if (w > 0)
+      $('#'+that.el).css('left', w + 10);                
+    else            
+      setTimeout(function() { that.set_placeholder_padding(); }, 200);                    
+  },
+  
   view: function() {
     
   },

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

@@ -10,11 +10,10 @@ BoundSelect = BoundControl.extend({
   placeholder: false,
  
   init: function(params) {
-    //console.log('control.model.id = ' + this.model.id);
+    var that = this;
     for (var thing in params)
       this[thing] = params[thing];
-    //console.log('control.model.id = ' + this.model.id);
-    
+        
     this.el = this.el ? this.el : this.model.name.toLowerCase() + '_' + this.model.id + '_' + this.attribute.name;
     this.message = this.el + '_message';
     this.placeholder = this.el + '_placeholder';
@@ -48,10 +47,11 @@ BoundSelect = BoundControl.extend({
     
     if (this.attribute.fixed_placeholder)
     {
-      var w = $('#'+this.placeholder).outerWidth();
-      $('#'+this.el)
-        .css('padding-left', '+=' + w)
-        .css('width', '-=' + w);
+      that.set_placeholder_padding();
+      //setTimeout(function() {
+      //  var w = $('#'+that.placeholder).outerWidth(true);        
+      //  $('#'+that.el).css('padding-left', '+=' + w);//.css('width', '-=' + w);
+      //  }, 200);
     }
     
     //this.update_options();
@@ -136,6 +136,15 @@ BoundSelect = BoundControl.extend({
       $('#'+this2.el+'_select').css('width', $('#'+this2.el).outerWidth());            
     });
   },
+  
+  set_placeholder_padding: function() {
+    var that = this;        
+    var w = $('#'+that.placeholder).outerWidth(true);
+    if (w > 0)
+      $('#'+that.el).css('padding-left', '+=' + w);
+    else            
+      setTimeout(function() { that.set_placeholder_padding(); }, 200);                    
+  },
              
   //update_options: function() {    
   //  var that = this;

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

@@ -10,6 +10,7 @@ BoundText = BoundControl.extend({
   save_attempts: 0,
  
   init: function(params) {
+    var that = this;
     for (var thing in params)
       this[thing] = params[thing];
     
@@ -35,8 +36,11 @@ BoundText = BoundControl.extend({
     if (this.attribute.width)  $('#'+this.el).css('width' , this.attribute.width);    
     if (this.attribute.fixed_placeholder && this.attribute.align != 'right')
     {
-      var w = $('#'+this.el+'_placeholder').outerWidth();
-      $('#'+this.el).attr('placeholder', 'empty').css('padding-left', '+=' + w).css('width', '-=' + w);      
+      that.set_placeholder_padding();
+      //setTimeout(function() {
+      //  var w = $('#'+that.el+'_placeholder').outerWidth();
+      //  $('#'+that.el).attr('placeholder', 'empty').css('padding-left', '+=' + w);//.css('width', '-=' + w);
+      //  }, 200);            
     }
         
     var this2 = this;
@@ -58,6 +62,15 @@ BoundText = BoundControl.extend({
     });
   },
   
+  set_placeholder_padding: function() {
+    var that = this;
+    var w = $('#'+that.el+'_placeholder').outerWidth();    
+    if (w > 0)
+      $('#'+that.el).css('padding-left', '+=' + w);
+    else    
+      setTimeout(function() { that.set_placeholder_padding(); }, 200);                    
+  },
+  
   save: function() {
     this.attribute.value = $('#'+this.el).val();
     if (this.attribute.value == this.attribute.value_clean)

data/app/assets/stylesheets/caboose/admin_block_edit_image.css.scss

@@ -1,4 +1,10 @@
 
+#detail_image {
+  float: right;
+  margin: 0;  
+  width: 370px;
+}
+  
 #left_content {
   width: 200px;
   float: left; 
@@ -36,7 +42,7 @@
       }
       
       &.selected {
-        a {
+        & > a {
           font-weight: bold;
           background-color: #90dbf9;
         }
@@ -149,3 +155,12 @@
     }
   }  
 }
+
+#the_modal div.icons { height: 400px; overflow-y: scroll; }
+#the_modal div.icons h2 { clear: both; padding: 20px 0px 10px 0; text-align: center; }
+#the_modal div.icons a { display: block; float: left; margin: 4px; border: #fff 0px solid; width: 120px; height: 100px; text-align: center; vertical-align: middle; border: #666 4px solid; }
+#the_modal div.icons a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #fff; }
+#the_modal div.icons a span.name { display: block; }               
+#the_modal div.icons a:hover { background: #fff69f; color: #000; border: #666 0px solid; border: #666 4px solid; }
+#the_modal div.icons a:hover span.icon { color: #000; }
+#the_modal div.icons a:hover span.name { color: #000; }

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

@@ -0,0 +1,9 @@
+
+#modal_content div.icons { height: 400px; overflow-y: scroll; }
+#modal_content div.icons h2 { clear: both; padding: 20px 0px 10px 0; text-align: center; }
+#modal_content div.icons a { display: block; float: left; margin: 4px; border: #fff 0px solid; width: 120px; height: 100px; text-align: center; vertical-align: middle; border: #666 4px solid; }
+#modal_content div.icons a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #fff; }
+#modal_content div.icons a span.name { display: block; }               
+#modal_content div.icons a:hover { background: #fff69f; color: #000; border: #666 0px solid; border: #666 4px solid; }
+#modal_content div.icons a:hover span.icon { color: #000; }
+#modal_content div.icons a:hover span.name { color: #000; }

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

@@ -25,4 +25,5 @@
 #cboxMiddleRight,
 #cboxTopCenter,
 #cboxBottomCenter,
-#cboxClose { background: #111 !important; }
+#cboxClose { background: #111; }
+#cboxWrapper { border-radius: 7px !important; }

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

@@ -1,17 +1,10 @@
 
-#the_modal {
-  box-sizing: content-box; /* border-box */  
-}
-
-#modal_content p { margin-bottom: 10px; }
-
-#modal_content .mb_container input { border: #ccc 1px solid; }
-                                                          
-#modal_content div.mb_container div.mb_placeholder { top: 9px; }
-#modal_content div.mb_container div.mb_placeholder span { font-size: 16px; }
-                                                         
-#modal_content div.mb_container select { border: #ccc 1px solid; height: 36px; }
-#modal_content div.mb_container select option { font-size: 16px; }
-
-#modal_content div.mb_container input[type=checkbox] { top: 12px; }
+#the_modal { box-sizing: border-box; }   
+#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; }
+#the_modal div.mb_container div.mb_placeholder span { font-size: 16px; }                                                         
+#the_modal div.mb_container select { border: #ccc 1px solid; height: 36px; }
+#the_modal div.mb_container select option { font-size: 16px; }
+#the_modal div.mb_container input[type=checkbox] { top: 12px; }
 

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

@@ -0,0 +1,178 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans');
+
+$font-card:          	normal 1em "Open Sans", sans-serif;
+$color-main: 					#5f5f5f;
+$color-light: 				#ececec;
+
+@mixin small() { @media all and (max-width: 800px) { @content }}
+@mixin big()   { @media all and (min-width: 800px) { @content }}
+
+#caboose-my-account {
+	padding: 30px 2% 50px 2%;
+	& > h2 {
+		text-align: center;
+		font-size: 1.5em;
+		margin-bottom: 30px;
+		color: #3c3c3c;
+	}
+	& > .grid-row {
+		max-width: 900px;
+		margin: 0 auto;
+		.unit1of2 {
+			@include big {
+				width: 49%;
+			}
+			&.right {
+				@include big {
+					float: right;
+				}
+			}
+		}
+		#card-wrapper {
+			height: 200px;
+		}
+		#stripe_form {
+			display: none;
+		}
+		.card-form-wrapper {
+			background: $color-light;
+			border-radius: 12px;
+			padding: 12px 4% 24px 4%;
+			border: 1px solid $color-main;
+			max-width: 400px;
+			margin: 0 auto;
+			text-align: center;
+			font: $font-card;
+			.title {
+				font-size: 1.1em;
+				text-align: center;
+				margin-bottom: 17px;
+				color: #3c3c3c;
+			}
+			#card_details {
+				.edit-card {
+					color: #4c94ff;
+    			text-decoration: none;
+    			margin-left: 4px;
+    			&:hover {
+    				color: #c24cff;
+    			}
+				}
+			}
+			.jp-card .jp-card-front .jp-card-lower .jp-card-number {
+				font-size: 22px;
+			}
+			.jp-card .jp-card-front .jp-card-lower .jp-card-name {
+				font-size: 16px;
+			}
+			.jp-card .jp-card-front .jp-card-lower {
+				left: 8%;
+				width: 84%;
+			}
+			&.address {
+				@include small {
+					margin-bottom: 40px;
+				}
+				.title {
+					margin-bottom: 20px;
+				}
+				.input-holder {
+					margin-bottom: 10px;
+					input {
+						&.mb_dirty {
+							background: #fff799 !important
+						}
+					}
+					.mb_bound_input_check {
+						a {
+							color: #fff;
+							background: #6fb96f;
+							font-size: 21px;
+							text-decoration: none;
+						}
+					}
+					.mb_placeholder {
+						top: 7px;
+						left: 7px;
+						span {
+							font-size: 16px;
+						}
+					}
+				}
+			}
+			.buttons {
+				margin-top: 20px;
+				.btn {
+					font-size: 15px;
+					margin-right: 5px;
+					margin-bottom: 5px;
+					&:last-of-type {
+						margin-right: 0;
+					}
+				}
+			}
+		}
+		form {
+			width: 90%;
+			margin: 0 auto;
+			text-align: left;
+			.row {
+				margin-bottom: 10px;
+			}
+			.field {
+				&.col-2 {
+					width: 50%;
+					float: left;
+					&:first-of-type {
+						padding-right: 1.5%;
+					}
+					&:last-of-type {
+						padding-left: 1.5%;
+					}
+				}
+				&.col-3 {
+					width: 33.33333%;
+					float: left;
+					&:nth-of-type(1) { padding-right: 1.5%; }
+					&:nth-of-type(2) { padding-right: 0.75%; padding-left: 0.75%; }
+					&:nth-of-type(3) { padding-left: 1.5%; }
+				}
+			}
+			.payment_controls {
+				text-align: right;
+				margin-top: 10px;
+				.btn {
+					font-size: 15px;
+					&.disabled {
+						cursor: default;
+						background: gray;
+					}
+				}
+			}
+		}
+		label {
+			display: block;
+			font-size: 12px;
+			margin-bottom: 2px;
+		}
+		input {
+			background-color: #fff !important;
+			display: block;
+			width: 100% !important;
+			font: $font-card;
+			line-height: 1em;
+			padding: 6px 6px 6px 6px;
+			border: 1px solid #dadada;
+			border-radius: 3px;
+			color: #2d2d2d;
+			&.placeholder_js {
+				color: #adadad;
+			}
+		}
+	}
+	.reset-password {
+		.btn.alternate {
+			margin-top: 10px;
+		}
+	}
+}

data/app/controllers/caboose/block_types_controller.rb

@@ -113,6 +113,7 @@ module Caboose
           when 'render_function'                 then bt.render_function                = v
           when 'use_render_function'             then bt.use_render_function            = v
           when 'use_render_function_for_layout'  then bt.use_render_function_for_layout = v
+          when 'use_js_for_modal'                then bt.use_js_for_modal               = v
           when 'allow_child_blocks'              then bt.allow_child_blocks             = v
           when 'default_child_block_type_id'     then bt.default_child_block_type_id    = v
           when 'name'                            then bt.name                           = v
@@ -150,6 +151,25 @@ module Caboose
     end
         
     # @route_priority 1
+    # @route GET /admin/block-types/new-options    
+    def admin_options_for_new_block
+      return unless user_is_allowed('blocktypes', 'edit')
+      #cats = BlockTypeCategory.where("parent_id is not null and name != ?", 'Layouts').all.collect{ |cat| {
+      #  :block_type_category => cat,
+      #  :block_types => Caboose::BlockType.includes(:block_type_site_memberships).where(:parent_id => nil, :block_type_category_id => cat.id).where("block_type_site_memberships.site_id = ?", @site.id).reorder(:description).all
+      #}}
+      
+      cats = BlockTypeCategory.where("name != ?", 'Layouts').all.collect{ |cat| {
+        :block_type_category => cat,
+        :block_types => Caboose::BlockType.includes(:block_type_site_memberships)
+          .where(:parent_id => nil, :block_type_category_id => cat.id)
+          .where("block_type_site_memberships.site_id = ?", @site.id)
+          .reorder(:description).all
+      }}
+      render :json => cats
+    end
+    
+    # @route_priority 2
     # @route GET /admin/block-types/:field-options
     # @route GET /admin/block-types/options
     # @route GET /admin/block-types/:id/options