caboose-cms 0.9.99 → 0.9.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb43ee42297f6edac0105f9f046c8566dfbb194
-  data.tar.gz: e88484b1ef1c225c7dc7f40f9ec01d59e260cf5d
+  metadata.gz: 1679adede6e539a9e7e39e9c3c339a6eb536a25c
+  data.tar.gz: 75b38ec8f5e7ae4f8453b0c4e76f3f266c17c36a
 SHA512:
-  metadata.gz: fdc595faed0cd1db2c3be9669ef730d155554b7f555b356aa50d6f5328a6bb56d2f5217d87457e531ce741137ef786722023d35939e64f59c268e44241b941da
-  data.tar.gz: 0b8f1b5033f6c20cfe782f8a2eb72e697bb09276d54c2efee3d13df0029fe69b8f2a30c541084f799eb3877353b19805b7b70c3d61cadf6ab464bd460a5d2532
+  metadata.gz: d7de69fa6d419f72f8d2611efc426f530eee6dd6817fe74b5ef5e420f1661448689426ddce4f4864524fa75f3e9aeded294a2b893a30d3dc3cdc7e9fd95d8929
+  data.tar.gz: b22afc388a84540611f3c4cf5a9ddde26babb33d51ebb7231c329fa89ea95432128f89039926f09c05b5105d68b3a0d9de720031dd43d48dd4583ced6be29a49

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

@@ -19,3 +19,14 @@ function add_to_crumbtrail(href, text)
     c.append(' > ');
   c.append($('<a/>').attr('href', href).html(text));
 }
+
+$(window).load(function() {
+  $("#top_nav ul.quick > li").mouseenter(function() {
+    $(this).find("ul").show();
+    $(this).children('a, span').addClass('hovered');
+  });
+  $("#top_nav ul.quick > li").mouseleave(function() {
+    $(this).find("ul").hide();
+    $(this).children('a, span').removeClass('hovered');
+  });
+});

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

@@ -386,7 +386,7 @@ BlockContentController.prototype = {
   add_handles_to_block: function(block_id) {
     var that = this;
     var el = $('#block_' + block_id);
-    if (el.length > 0) {
+    if (el.length > 0 && block_id.indexOf('constrain') < 0 && block_id.indexOf('full_width') < 0 && block_id.indexOf('_value_') < 0) {
       if ( el.attr('id').indexOf('_value') >= 0 || el.children('.drag_handle').length > 0 )
         return true;
       if ( el.parents('.content_body').length > 0 ) {

data/app/assets/javascripts/caboose/block_modal_controllers/block_dd_modal_controller.js

@@ -163,8 +163,8 @@ var BlockModalController = ModalController.extend({
     
     var b = that.block;    
     $('#modal_content').empty()      
-      .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_block_type_id' )))
-      .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_parent_id'     )))
+ //     .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_block_type_id' )))
+ //     .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_parent_id'     )))
       .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_constrain'     )))
       .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_full_width'    )))      
     $('#modal_controls').empty()
@@ -185,8 +185,8 @@ var BlockModalController = ModalController.extend({
       update_url: that.block_url(b),      
       authenticity_token: that.authenticity_token,
       attributes: [
-        { name: 'block_type_id' , nice_name: 'Block type' , type: 'select'   , value: b.block_type.id         , text: b.block_type.name              , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.block_type.id = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/block-types/options' },
-        { name: 'parent_id'     , nice_name: 'Parent ID'  , type: 'select'   , value: b.parent_id             , text: b.parent ? b.parent.title : '' , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.parent_id     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/' + (that.page_id ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/block-options' },
+//        { name: 'block_type_id' , nice_name: 'Block type' , type: 'select'   , value: b.block_type.id         , text: b.block_type.name              , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.block_type.id = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/block-types/options' },
+//        { name: 'parent_id'     , nice_name: 'Parent ID'  , type: 'select'   , value: b.parent_id             , text: b.parent ? b.parent.title : '' , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.parent_id     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/' + (that.page_id ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/parentblock-options?block_id=' + b.id },
         { name: 'constrain'     , nice_name: 'Constrain'  , type: 'checkbox' , value: b.constrain     ? 1 : 0 ,                                        width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.constrain     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
         { name: 'full_width'    , nice_name: 'Full Width' , type: 'checkbox' , value: b.full_width    ? 1 : 0 ,                                        width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.full_width    = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }}
       ]

data/app/assets/javascripts/caboose/block_modal_controllers/block_modal_controller.js

@@ -163,7 +163,7 @@ var BlockModalController = ModalController.extend({
     
     var b = that.block;    
     $('#modal_content').empty()      
-      .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_block_type_id' )))
+ //     .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_block_type_id' )))
       .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_parent_id'     )))
       .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_constrain'     )))
       .append($('<p/>').append($('<div/>').attr('id', 'block_' + b.id + '_full_width'    )))      
@@ -185,8 +185,8 @@ var BlockModalController = ModalController.extend({
       update_url: that.block_url(b),      
       authenticity_token: that.authenticity_token,
       attributes: [
-        { name: 'block_type_id' , nice_name: 'Block type' , type: 'select'   , value: b.block_type.id         , text: b.block_type.name              , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.block_type.id = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/block-types/options' },
-        { name: 'parent_id'     , nice_name: 'Parent ID'  , type: 'select'   , value: b.parent_id             , text: b.parent ? b.parent.title : '' , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.parent_id     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/' + (that.page_id ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/block-options' },
+ //       { name: 'block_type_id' , nice_name: 'Block type' , type: 'select'   , value: b.block_type.id         , text: b.block_type.name              , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.block_type.id = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/block-types/options' },
+        { name: 'parent_id'     , nice_name: 'Parent ID'  , type: 'select'   , value: b.parent_id             , text: b.parent ? b.parent.title : '' , width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.parent_id     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }, options_url: '/admin/' + (that.page_id ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/parentblock-options?block_id=' + b.id },
         { name: 'constrain'     , nice_name: 'Constrain'  , type: 'checkbox' , value: b.constrain     ? 1 : 0 ,                                        width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.constrain     = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }},
         { name: 'full_width'    , nice_name: 'Full Width' , type: 'checkbox' , value: b.full_width    ? 1 : 0 ,                                        width: 400, fixed_placeholder: true, after_update: function() { that.parent_controller.render_blocks(); that.block.full_width    = this.value; }, after_cancel: function() { that.parent_controller.render_blocks(); }, on_load: function() { that.modal.autosize(); }}
       ]

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

@@ -36,7 +36,7 @@ BoundCheckbox = BoundControl.extend({
     var cb = $('<input/>')
       .attr('id', this.el)
       .attr('type', 'checkbox')      
-      .attr('checked', this.attribute.value == 1)
+      .attr('checked', (this.attribute.value == 1 || this.attribute.value == true || this.attribute.value == 'true' || this.attribute.value == '1'))
       .on('change', function() {        
         this2.save(); 
       });    

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

@@ -25,7 +25,7 @@ BoundTextarea = BoundControl.extend({
       $('#'+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();
+    var h = $('#'+this.el+'_placeholder').outerHeight() + 6;
     $('#'+this.el).attr('placeholder', 'empty').css('padding-top', '+=' + h).css('height', '-=' + h);
     
     var this2 = this;

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

@@ -8,70 +8,74 @@ $current-text-color: #ccc;
   
 ul#crumbtrail {
   position: absolute;
-  top: -42px;
-  left: 54px;
+  top: -50px;
+  left: 50px;
   color: #fff;
-  
-  margin: 0 0 20px 0;
+  margin: 0;
   padding: 0;
   list-style: none;
   text-align: center;
-  
+  height: 50px;
   li {      
-    margin: 0 5px;
+    margin: 0;
     padding: 0; 
     list-style: none;
     display: inline;
-    
     a {
       white-space: nowrap;
       display: inline-block;
       margin: 0;        
-      position: relative;      
-      height: 32px;
+      position: relative;    
+      padding: 0 5px;  
+      height: 50px;
+      line-height: 50px;
       background: $off-bg-color;
       color: $off-text-color;
       z-index: 20;
-      text-decoration: none !important;              
-      span { display: block; padding: 7px 4px 0 5px; font-size: 10pt;  }
+      text-decoration: none !important;
+      span {
+      	display: block;
+      	padding: 0;
+      	font-size: 12px;
+      }
     }
     a:hover { background: $hover-bg-color; color: $hover-text-color; }
   
-    a:before {
-	    content: ' ';
-	    height: 0;
-	    position: absolute;
-	    top: 0;
-	    left: -6px;
-	    width: 0;
-	    border: 16px solid transparent;
-	    border-width: 16px 6px;
-	    border-top-color:    $off-bg-color;
-	    border-right-color:  transparent;
-	    border-bottom-color: $off-bg-color;
-	    border-left-color:   transparent;
-	    z-index: 19;	    
-	  }	   
-	  a:hover:before { 
-	    border-top-color:    $hover-bg-color; 
-	    border-bottom-color: $hover-bg-color; 
-	  }
+   //  a:before {
+	  //   content: ' ';
+	  //   height: 0;
+	  //   position: absolute;
+	  //   top: 0;
+	  //   left: -6px;
+	  //   width: 0;
+	  //   border: 16px solid transparent;
+	  //   border-width: 16px 6px;
+	  //   border-top-color:    $off-bg-color;
+	  //   border-right-color:  transparent;
+	  //   border-bottom-color: $off-bg-color;
+	  //   border-left-color:   transparent;
+	  //   z-index: 19;	    
+	  // }	   
+	  // a:hover:before { 
+	  //   border-top-color:    $hover-bg-color; 
+	  //   border-bottom-color: $hover-bg-color; 
+	  // }
 
-    a:after {
-	    content: ' ';
-	    height: 0;
-	    position: absolute;
-	    top: 0;
-	    right: -12px;
-	    width: 0;
-	    border: 16px solid transparent;
-	    border-width: 16px 6px;
-	    border-left-color: $off-bg-color;
-	    z-index: 19;
-	  }
-	  a:hover:after { 
-	    border-left-color: $hover-bg-color; 	     
-	  }
+   //  a:after {
+	  //   content: ' ';
+	  //   height: 0;
+	  //   position: absolute;
+	  //   top: 0;
+	  //   right: -12px;
+	  //   width: 0;
+	  //   border: 16px solid transparent;
+	  //   border-width: 16px 6px;
+	  //   border-left-color: $off-bg-color;
+	  //   z-index: 19;
+	  // }
+	  // a:hover:after { 
+	  //   border-left-color: $hover-bg-color; 	     
+	  // }
 	  	  
 	  &.current {                
 	    a { background: $current-bg-color; color: $current-text-color; }    

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

@@ -85,6 +85,10 @@
     font-weight: 300 !important;
     font-size: 15px !important;
     padding: 8px 6px 6px 6px;
+    &:focus {
+      outline-width: 0;
+      border-color: #28acc1;
+    }
   }
   label {
     font-family: 'Roboto' !important;

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

@@ -4,7 +4,8 @@
 body {
   margin: 0;
   padding: 0;  
-  font-family: "Avenir", serif;
+  font-family: "Roboto", serif;
+  font-weight: 400;
 }
 
 #cboxOverlay {
@@ -19,10 +20,10 @@ body {
 }
 
 #top_nav {
-  background: #000;
-  border-bottom: #333 1px solid;
+  background: #2d2d2d;
   height: 50px;
   position: relative;
+  text-align: center;
 }
 
 #top_nav .caboose_logo {
@@ -31,7 +32,12 @@ body {
   left: 0;
   width: 50px;
   height: 50px;
-  background: url(/assets/caboose/caboose_logo_small.png);
+  display: block;
+  text-decoration: none;
+  background: url(/assets/caboose/caboose_logo.png);
+  background-size: 25px;
+  background-position: center center;
+  background-repeat: no-repeat;
 }
 
 #top_nav ul {
@@ -39,6 +45,18 @@ body {
   padding: 0 8px 0 0;
   list-style: none;
   text-align: right;
+  position: absolute;
+  right: 0;
+  top: 0;
+  height: 50px;
+}
+
+#top_nav ul.quick {
+  margin: 0;
+  list-style-type: none;
+  text-align: center;
+  position: static;
+  padding: 0;
 }
 
 #top_nav ul li {
@@ -46,19 +64,76 @@ body {
   padding: 0;
   list-style: none;
   display: inline-block;
+  position: relative;
 }
 
-#top_nav ul li a {
+#top_nav ul li:hover, #top_nav ul li.hovered {
+  background: #000;
+}
+
+#top_nav ul li a, #top_nav ul li span {
   display: block;
-  margin: 8px 4px;
-  padding: 0 16px;
-  border: #333 1px solid;
+  margin: 0;
+  padding: 0 20px;
+  color: #fff;
   text-decoration: none;
+  line-height: 51px;
+  border: 0;
+  font-family: "Roboto";
+  font-weight: 400;
+  background-color: transparent;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+#top_nav ul li a > span {
+  padding: 0;
+}
+
+#colorbox:focus {
+  outline-width: 0 !important;
+}
+
+#top_nav ul li a:hover {
+  background: #000;
+}
+
+#top_nav ul li.hovered > a {
+  background: #000;
 }
 
-#top_nav ul li a        { color: #ccc; border: #333 1px solid; background: #000; }
-#top_nav ul li a:hover  { color: #fff; border: #444 1px solid; background: #000; }
-#top_nav ul li a:active { color: #fff; border: #666 1px solid; background: #333; }
+#top_nav ul li ul {
+  position: absolute;
+  top: 50px;
+  left: 0;
+  width: 200px;
+  z-index: 999;
+  background: #2d2d2d;
+  height: auto;
+  text-align: left;
+  padding: 0;
+  display: none;
+}
+
+#top_nav ul li ul li {
+  display: block;
+}
+
+#top_nav ul li ul li a {
+  display: block;
+  line-height: 36px;
+  padding: 0 15px;
+  font-size: 14px;
+}
+
+@media all and (max-width: 900px) {
+  #top_nav ul li#nav_item_logout, li#nav_item_my-account {
+    display: none;
+  }
+  #top_nav ul li a, #top_nav ul li span {
+    padding: 0 10px;
+  }
+}
 
 #content_wrapper {
   position: relative;
@@ -68,14 +143,20 @@ body {
   padding: 0 0 0 30px;
 }
 
+h1,h2,h3,h4,h5,h6 {
+  font-weight: 400;
+}
+
 #content h1 {
   margin: 0 0 20px -30px;
-  padding: 40px 0 0 30px;
-  height: 80px;  
-  background: #e1e1e1;
+  padding: 0 2% 0 50px;
+  height: 53px;  
+  background: #dcdcdc;
   border-bottom: #aaa 1px solid;
-  font-size: 36pt;
+  font-size: 25px;
+  line-height: 56px;
   overflow: hidden;
+  color: #2d2d2d;
 }
 
 #content h1.model_attribute_h1 {
@@ -141,20 +222,23 @@ div.model_attribute_text {
 }
 
 input, select, textarea {
-  font-family: Helvetica, arial;
+  font-family: 'Roboto', arial;
+  font-weight: 400;
   border: 1px solid #ccc;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px;
   padding: 6px 4px 4px 8px;
   height: 36px;
-  font-size: 20px;
+  font-size: 15px;
   z-index: 20;
 }
 
+input:focus, textarea:focus {
+  outline-width: 0;
+  border-color: #28acc1;
+}
+
 input.dirty,
 textarea.dirty {
-  background: #fff799;  
+  background: #fffac5;  
 }
 
 select {
@@ -274,11 +358,13 @@ select.fake option {
 }
   
 #content table.data th {
-  background: #333;
-  border: #333 1px solid;  
+  background: #2d2d2d;
+  border: #2d2d2d 1px solid;  
   color: #fff;
   margin: 0;
   padding: 0;
+  font-size: 14px;
+  font-weight: 400;
 }
 
 #content table.data th a {
@@ -298,9 +384,12 @@ select.fake option {
   background: #fff;
   border: #bdbdbd 1px solid;
   margin: 0;
-  padding: 4px 10px 2px 10px;
+  padding: 7px 10px 6px 10px;
   font-size: 15px;
 }
+#content table.data td table.checkbox_multiple td {
+  padding: 2px 8px 0 8px;
+}
 
 #content table.data td.edit_button {
   
@@ -357,17 +446,15 @@ Page Bar Generator
 
 .page_links a {
   display: inline-block;
-  margin: 0 2px;
-  padding: 5px 8px 3px 8px;
-  
-  border: #333 1px solid;
-  background: #333;
+  margin: 0 3px;
+  padding: 8px 10px;
+  background: #2d2d2d;
   color: #fff;
   text-decoration: none;
 }
 
 .page_links a:hover {
-  background: #505050;
+  background: #000;
   color: #fff;
 }
 
@@ -377,11 +464,10 @@ Page Bar Generator
 
 .page_links span.current_page {
   display: inline-block;
-  padding: 5px 8px 3px 8px;
-  
-  border: #333 1px solid;
+  padding: 8px 10px;
+  margin: 0 3px;
   background: #ccc;
-  color: #000;
+  color: #2d2d2d;
   text-decoration: none;
 }
 
@@ -411,7 +497,7 @@ Page Bar Generator
 #htabs a {
   display: block;
   margin: 0;
-  padding: 16px 12px 12px 12px;
+  padding: 14px 12px 12px 12px;
   text-decoration: none;
   background: #efefef;
   border-bottom: #ccc 1px solid;  
@@ -499,7 +585,9 @@ Page Bar Generator
   background: #141516; 
   color: #f7f7f7;
   text-align: center; 
-  padding: 0 15px;
+  font-family: "Roboto", Arial;
+  font-weight: 400;
+  padding: 1px 15px 0 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;
@@ -520,7 +608,9 @@ Page Bar Generator
   border: 1px solid #fff;
   color: #141516;
   text-align: center; 
-  padding: 0 15px;
+  font-family: "Roboto", Arial;
+  font-weight: 400;
+  padding: 1px 15px 0 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;

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

@@ -21,7 +21,8 @@
 }
 
 #checkout {
-  font-family: 'Avenir';
+  font-family: 'Roboto';
+  font-weight: 400;
   min-height: 400px;
   > header {
     border-bottom: 1px solid #d0d0d0;

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

@@ -1,16 +1 @@
-
-@font-face {
-	font-family: 'BigNoodleTitling';
-	src: local('Big Noodle Titling'), url('/assets/caboose/fonts/big_noodle_titling.ttf') format('truetype');
-}
-
-@font-face {
-  font-family: 'Avenir';
-  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot');
-  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot') format('embedded-opentype'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.woff')       format('woff'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.ttf')        format('truetype'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.svg')        format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
+@import url('https://fonts.googleapis.com/css?family=Roboto:400,400i,700,700i');

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

@@ -4,16 +4,7 @@
  
 html { width: 100%; }
 
-@font-face {
-  font-family: 'Avenir';
-  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot');
-  src: url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.eot') format('embedded-opentype'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.woff')       format('woff'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.ttf')        format('truetype'),
-       url('//d1ygukj37mahb2.cloudfront.net/assets/avenir-medium.svg')        format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
+@import url('https://fonts.googleapis.com/css?family=Roboto:400,400i,700,700i');
 
 body {
   background: #111111;
@@ -21,7 +12,8 @@ body {
   padding: 0;
   color: #fff;
   width: 100%;  
-  font-family: "Avenir", Arial;
+  font-family: "Roboto", Arial;
+  font-weight: 400;
 }
 
 #modal_wrapper {
@@ -93,7 +85,8 @@ div.model_attribute_text {
 }
 
 input, select, textarea {
-  font-family: "Avenir", Arial;
+  font-family: "Roboto", Arial;
+  font-weight: 400;
   border: 2px solid #ccc;
   background: #000;
   color: #fff;

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

@@ -21,12 +21,12 @@
 .mb_container select,
 .mb_container .mb_fake option,
 .mb_container option {
-  font-size: 16px !important;
+  font-size: 15px !important;
 }
 
 .mb_container input.mb_dirty,
 .mb_container textarea.mb_dirty {
-  background: #fff799 !important;
+  background: #fffac5 !important;
   color: #000 !important;  
 }
 
@@ -90,8 +90,8 @@ div.mb_container div.mb_placeholder {
   /*height: 34px;*/
   
   position: absolute;
-  top: 8px;
-  left: 10px;
+  top: 10px;
+  left: 9px;
   z-index: 19;  
 }
 
@@ -103,7 +103,9 @@ div.mb_container form.mb_file_form div.mb_placeholder {
 
 .mb_container .mb_placeholder span {
   display: block;
-  font-size: 16px;
+  font-family: "Roboto", Arial;
+  font-weight: 400;
+  font-size: 15px;
   color: #757575;
 }
 

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

@@ -18,7 +18,8 @@
   cursor: pointer;
   display: block;
   float: left;
-  font-family: 'Avenir';
+  font-family: 'Roboto';
+  font-weight: 400;
   padding: 6px 12px;
   margin: 0 6px 6px 0;
   &.selected {

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

@@ -19,7 +19,8 @@
   height: 100%;
   background: #e1e1e1;
   border: #aaa 1px solid;
-  font-family: BigNoodleTitling, Tahoma; 
+  font-family: 'Roboto', Arial; 
+  font-weight: 400;
 }
 
 #caboose_station .caboose_logo {
@@ -86,7 +87,8 @@
   white-space: nowrap;
   overflow: hidden;
   */
-  font-family: BigNoodleTitling, Tahoma;
+  font-family: 'Roboto', Arial;
+  font-weight: 400;
   font-size: 16px;
   color: #505050;
   background: #aaa;
@@ -154,7 +156,8 @@
   white-space: nowrap;
   overflow: hidden;
   */
-  font-family: BigNoodleTitling, Tahoma;
+  font-family: 'Roboto', Arial;
+  font-weight: 400;
   font-size: 16px;
 }
 
@@ -165,7 +168,8 @@
   height: 34px;
   background: #e1e1e1;
   vertical-align: middle;
-  font-family: BigNoodleTitling, Tahoma;
+  font-family: 'Roboto', Arial;
+  font-weight: 400;
   font-size: 16px;
 }
 #caboose_station ul.admin li a.top_level:hover  span { color: #941403; }
@@ -204,7 +208,8 @@
   background-position: 0 0;
   width: 208px;
   height: 50px;  
-  font-family: BigNoodleTitling, Tahoma;
+  font-family: 'Roboto', Arial;
+  font-weight: 400;
   text-decoration: none;
 }
 
@@ -214,7 +219,8 @@
   padding: 16px 0 0 0;
   height: 34px;
   
-  font-family: BigNoodleTitling, Tahoma;
+  font-family: 'Roboto', Arial;
+  font-weight: 400;
   font-size: 16px;
 }
 #caboose_station_wrapper a.close        span { background: #e1e1e1; color: #505050; }

data/app/controllers/caboose/application_controller.rb

@@ -6,7 +6,7 @@ module Caboose
     helper_method :logged_in?
     helper :all
     
-    @find_page = true    
+    @find_page = true
     
     def before_before_action
       
@@ -51,9 +51,13 @@ module Caboose
         @page = Page.page_with_uri(request.host_with_port, request.fullpath)
         @crumb_trail  = Caboose::Page.crumb_trail(@page)		    
       #end
+
+
       
       # Sets an instance variable of the logged in user
       @logged_in_user = logged_in_user  
+
+      @nav = Caboose.plugin_hook('admin_nav', [], @logged_in_user, @page, @site)
       
       # Initialize the card
       init_cart if @site && @site.use_store && !@domain.under_construction

data/app/controllers/caboose/pages_controller.rb

@@ -648,6 +648,12 @@ module Caboose
           Block.where("parent_id is null and page_id = ?", params[:id]).reorder(:sort_order).all.each do |b|
             admin_block_options_helper(options, b, "") 
           end
+        when 'parentblock'
+          options = []
+          this_block = Block.find(params[:block_id])
+          Block.where("parent_id is null and page_id = ?", params[:id]).reorder(:sort_order).all.each do |b|
+            admin_parent_block_options_helper(options, b, "", this_block) 
+          end
       end              
       render :json => options 		
     end
@@ -665,6 +671,15 @@ module Caboose
         admin_block_options_helper(options, b2, "#{prefix} - ")        
       end      
     end
+
+    def admin_parent_block_options_helper(options, b, prefix, this_block)
+      if b.block_type.allow_child_blocks && (b.block_type.default_child_block_type_id.blank? || b.block_type.default_child_block_type_id == this_block.block_type_id)
+        options << { 'value' => b.id, 'text' => "#{prefix}#{b.title}" }
+      end      
+      b.children.each do |b2|
+        admin_parent_block_options_helper(options, b2, "#{prefix} - ", this_block)        
+      end
+    end
 		
   end
 end

data/app/controllers/caboose/posts_controller.rb

@@ -53,6 +53,7 @@ module Caboose
           'sort'        => 'created_at',
           'desc'        => true,
           'base_url'    => '/admin/posts',
+          'items_per_page' => 50,
           'use_url_params' => false
       })
       render :json => {

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

@@ -18,8 +18,8 @@ end
 <!--<h2 style='margin-top: 0; padding-top: 0;'>Edit <%= @block.name ? @block.name : @block.block_type.description %></h2>-->
 <h2 style='margin-top: 0; padding-top: 0;'><%= raw crumbs.reverse.join(' > ') %></h2>
 <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 %>_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>
@@ -52,31 +52,34 @@ $(document).ready(function() {
     update_url: '/admin/pages/<%= b.page_id %>/blocks/<%= b.id %>',
   <% end %>
     authenticity_token: '<%= form_authenticity_token %>',
-    attributes: [{      
-      name: 'block_type_id',
-      nice_name: 'Block type',
-      type: 'select',
-      value: <%= raw Caboose.json(b.block_type_id) %>,             
-      text:  <%= raw Caboose.json(b.block_type.name) %>,                  
-      width: 400,
-      fixed_placeholder: true,
-      options_url: '/admin/block-types/options',
-      after_update: function() { parent.controller.render_blocks(); },
-      after_cancel: function() { parent.controller.render_blocks(); },
-      on_load: function() { that.modal.autosize(); }
-    },{      
-      name: 'parent_id',
-      nice_name: 'Parent ID',
-      type: 'select',
-      value: <%= raw Caboose.json(b.parent_id) %>,
-      text:  <%= raw Caboose.json(b.parent ? b.parent.title : '') %>,        
-      width: 400,
-      fixed_placeholder: true,        
-      options_url: '/admin/pages/<%= b.page_id %>/block-options',        
-      after_update: function() { parent.controller.render_blocks(); },
-      after_cancel: function() { parent.controller.render_blocks(); },
-      on_load: function() { that.modal.autosize(); }
-    },{ 
+    attributes: [
+    // {      
+    //   name: 'block_type_id',
+    //   nice_name: 'Block type',
+    //   type: 'select',
+    //   value: <%= raw Caboose.json(b.block_type_id) %>,             
+    //   text:  <%= raw Caboose.json(b.block_type.name) %>,                  
+    //   width: 400,
+    //   fixed_placeholder: true,
+    //   options_url: '/admin/block-types/options',
+    //   after_update: function() { parent.controller.render_blocks(); },
+    //   after_cancel: function() { parent.controller.render_blocks(); },
+    //   on_load: function() { that.modal.autosize(); }
+    // },
+    // {      
+    //   name: 'parent_id',
+    //   nice_name: 'Parent ID',
+    //   type: 'select',
+    //   value: <%= raw Caboose.json(b.parent_id) %>,
+    //   text:  <%= raw Caboose.json(b.parent ? b.parent.title : '') %>,        
+    //   width: 400,
+    //   fixed_placeholder: true,        
+    //   options_url: '/admin/pages/<%= b.page_id %>/parentblock-options?block_id=<%= b.id %>',        
+    //   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', 

data/app/views/caboose/pages/_admin_header.html.erb

@@ -6,9 +6,10 @@ p.uri {
   border: #999 1px solid;
   padding: 10px;
   position: absolute;
-  top: 67px;
-  left: 0;
-  height: 16px;
+  top: 8px;
+  left: 251px;
+  height: 17px;
+  margin: 0;
 }
 
 </style>

data/app/views/caboose/pages/admin_edit_general.html.erb

@@ -21,13 +21,14 @@
 <style type='text/css'>
 
 p.uri {
-  background: #efefef;
-  border: #999 1px solid;
-  padding: 10px;
-  position: absolute;
-  top: 67px;
-  left: 0;
-  height: 16px;
+background: #efefef;
+    border: #999 1px solid;
+    padding: 10px;
+    position: absolute;
+    top: 8px;
+    left: 251px;
+    height: 17px;
+    margin: 0;
 }
 
 div.field_with_explanation {

data/app/views/caboose/posts/admin_edit_categories.html.erb

@@ -22,6 +22,9 @@
     top: 10px;
     margin-right: 5px;
   }
+  #content2 > p {
+    margin: 0 0 5px 0;
+  }
 </style>
 <% end %>
 

data/app/views/caboose/posts/admin_index.html.erb

@@ -1,6 +1,12 @@
 <h1>Posts</h1>
 <div id='posts'></div>
 
+<% content_for :caboose_css do %>
+<style>
+  table.data {margin-right: 30px;}
+</style>
+<% end %>
+
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'caboose/model/all' %>
 <script type='text/javascript'>

data/app/views/layouts/caboose/admin.html.erb

@@ -50,10 +50,32 @@ end
 <body>
 <div id='header'>
   <div id='top_nav'>
-    <div class='caboose_logo'></div>
+    <a href="/admin" class='caboose_logo'></a>
+    <ul class="quick">
+      <% i = 0 %>
+      <% @nav.each do |item| %>
+        <% id = item['id'].nil? ? i.to_s : item['id'] %>
+        <% href = item['href'].nil? ? '#' : item['href'] %>
+        <% modal = item['modal'].nil? ? false : item['modal'] %>
+        <li id='nav_item_<%= id %>'>
+          <% if href != "#" %><a href='<%= href %>'<%= raw (modal ? " rel='modal'" : "") %>><% end %>
+            <span class='icon'></span><span class='text'><%= item['text'] %></span>
+          <% if href != "#" %></a><% end %>
+        <% if (!item['children'].nil? && item['children'].count > 0) %>
+          <ul>
+            <% item['children'].each do |item2| %>
+              <% modal = item2['modal'].nil? ? false : item2['modal'] %>
+              <li><a href='<%= item2['href'] %>'<%= raw (modal ? " rel='modal'" : "") %>><%= item2['text'] %></a></li>
+            <% end %>
+          </ul>
+        <% end %>
+        </li>
+        <% i + 1 %>
+      <% end %>
+    </ul>
     <ul>
-      <li class='back'    ><a href='/' class="caboose-btn"><span><< Back to Site</span></a></li>
-      <li class='cpanel'  ><a href='/station' id='caboose_station' class='caboose_modal caboose-btn'><span>Menu</span></a></li>
+      <li class='back'    ><a href='/' target="_blank" class="caboose-btn"><span>View Site</span></a></li>
+  <!--     <li class='cpanel'  ><a href='/station' id='caboose_station' class='caboose_modal caboose-btn'><span>Menu</span></a></li> -->
     </ul>
   </div>
 </div>

data/lib/caboose/engine.rb

@@ -129,10 +129,10 @@ module Caboose
         'plupload/*.xap',        
 
         # Fonts
-        'caboose/fonts/avenir-medium.eot',
-        'caboose/fonts/avenir-medium.ttf',
-        'caboose/fonts/big_noodle_titling_oblique.ttf',
-        'caboose/fonts/big_noodle_titling.ttf',               
+        # 'caboose/fonts/avenir-medium.eot',
+        # 'caboose/fonts/avenir-medium.ttf',
+        # 'caboose/fonts/big_noodle_titling_oblique.ttf',
+        # 'caboose/fonts/big_noodle_titling.ttf',               
         'caboose/icons.txt'
         
       ]      

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.99'
+  VERSION = '0.9.100'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.99
+  version: 0.9.100
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -483,8 +483,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/fonts/avenir-medium.eot
-- app/assets/fonts/avenir-medium.ttf
 - app/assets/fonts/icomoon.eot
 - app/assets/fonts/icomoon.svg
 - app/assets/fonts/icomoon.ttf