caboose-cms 0.9.229 → 1.0.1

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

@@ -3,11 +3,10 @@
 //
 //= require jquery
 //= require jquery_ujs
-
-// removed:
-// require caboose/jquery.placeholder
-// require caboose/jquery.detect
-// require caboose/main
-// require colorbox-rails
-// require caboose/modal_integration
-// require_tree ../../templates
+//= require colorbox-rails
+//= require underscore
+//= require caboose/jquery.detect
+//= require caboose/jquery.placeholder
+//= require caboose/modal_integration
+//= require caboose/main
+//= require_tree ../../templates

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

@@ -4,8 +4,7 @@ var BlockContentController = function(params) { this.init(params); };
 BlockContentController.prototype = {
 
   post_id: false,
-  page_id: false,
-  is_publishing: false,
+  page_id: false,    
   new_block_type_id: false,
   selected_block_ids: [],
   blocks: false,
@@ -13,8 +12,6 @@ BlockContentController.prototype = {
   included_assets: false,
   mc: false,
   editing_block: false,
-  ajax_limit: 20,
-  ajax_count: 0,
   inline_classes: ['rtedit'],
   
   init: function(params)
@@ -43,7 +40,6 @@ BlockContentController.prototype = {
   },
 
   is_modified: function() {
-    var that = this;
     $("#tiny_header").removeClass('published').addClass('unpublished');
   },
 
@@ -131,51 +127,7 @@ BlockContentController.prototype = {
       that.modal = eval(new_modal_eval_string);
     }
   },
-
-
-  publish_page: function() {
-    var that = this;
-    var url = that.base_url().replace("/blocks","/publish");
-    that.is_publishing = true;
-    that.is_loading(true, 'Publishing changes...');
-    $.ajax({
-      url: url,
-      type: 'put',
-      success: function(resp) {
-        if (resp.success) {
-          that.check_publish_status();
-        }
-      }
-    });
-  },
-
-  check_publish_status: function() {
-    var that = this;
-    if ( that.ajax_count < that.ajax_limit ) {
-      var url = that.base_url().replace("/blocks","/status");
-      $.ajax({
-        url: url,
-        type: 'get',            
-        success: function(resp) {
-          // console.log("status: " + resp.status);
-          that.ajax_count += 1;
-          if ( resp.status == 'published' ) {
-            $("#tiny_header").removeClass("unpublished").addClass("published");
-            that.is_loading(false, 'Page published!');
-            that.is_publishing = false;
-            that.ajax_limit = 20;
-          }
-          else {
-            setTimeout(function() { that.check_publish_status(); }, 1500);    
-          }                                        
-        }
-      });
-    }
-    else {
-      that.show_error("Sorry, the page could not be published. Your changes have been saved. Please try refreshing the page.")
-    }
-  },
-
+  
   underscores_to_camelcase: function(str)
   {
     var str2 = '';
@@ -200,8 +152,7 @@ BlockContentController.prototype = {
       type: 'get',
       success: function(html) {
         $('body .container #block_' + block_id).replaceWith(html);
-        if ( !that.is_publishing )
-          that.is_loading(false, 'Loading...');
+        that.is_loading(false, 'Loading...');
         that.add_dropzones();
         that.init_inline_editor();
       }
@@ -257,20 +208,13 @@ BlockContentController.prototype = {
       $("#caboose-loading").fadeOut();
   },
 
-  show_error: function(message) {
-    $("#caboose-loading").find("#loader").hide();
-    $("#caboose-loading").fadeIn().find('h4').text(message).css('font-size','1em').css('text-transform','none');
-  },
-
   move_block: function(block_id, parent_id, before_block_id, after_block_id) {
     var that = this;
     var block_id = block_id.replace('block_','');
     that.is_modified();
     if ( before_block_id != block_id && after_block_id != block_id && parent_id != block_id ) {
       var original = $('#block_' + block_id);
-      // console.dir(original);
-      // console.dir( original.data('draggable') );
-      // if ( original.data('ui-draggable') ) { original.draggable('destroy'); }
+      if ( original.data('ui-draggable') ) { original.draggable('destroy'); }
       var el = original.detach();
       el.removeClass('ui-draggable-dragging, block_over');
       el.css({'left':'auto','right':'auto','bottom':'auto','top':'auto','height':'auto','width':'auto'});

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

@@ -295,8 +295,7 @@ var BlockModalController = ModalController.extend({
       type: 'put',
       success: function(html) {
         $('#the_modal .img-holder#block_' + block.id).find("img").attr('src','https://cabooseit.s3.amazonaws.com/assets/select_image.png');
-        $("#the_modal .img-wrap > span").remove();
-        $('#the_modal div#block_' + block.id + ' p').html("Click to select file for " + block.block_type.description + ".");
+        $('#the_modal div#block_' + block.id + ' p').html('Empty file.');
         $('#the_modal #block_' + block.id).parent().find('.caboose-btn').remove();
         that.parent_controller.render_blocks();
         that.autosize();
@@ -331,7 +330,7 @@ var BlockModalController = ModalController.extend({
       $('#the_modal #block_' + b.id).closest(".img-wrap").append(btn);
     }
 
-    if ( b.block_type && b.block_type.field_type == 'file' && b.rendered_value.indexOf('Click to select file') < 0 ) {
+    if ( b.block_type && b.block_type.field_type == 'file' && b.rendered_value.indexOf('Click to select a file') < 0 ) {
       btn = $('<a href="#" class="caboose-btn remove">Remove File</a>');
       //btn.css('margin-bottom','10px').css('font-size','13px');
       btn.on('click', function(e) {

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

@@ -159,7 +159,7 @@ var MediaModalController = BlockModalController.extend({
     var opt = $('<option/>')
       .data('media_category_id', cat.id)
       .val(cat.id)
-      .append(prefix + cat.name);      
+      .append(prefix + cat.name + ' (' + cat.media_count + ')');      
     if (cat.id == that.cat_id)
       opt.attr('selected', 'true');
     select.append(opt);        
@@ -240,6 +240,7 @@ var MediaModalController = BlockModalController.extend({
 
   check_processing_status: function() 
   {     
+    console.log("checking processing status");
     var that = this;
     if (!that.last_upload_processed)
       that.last_upload_processed = new Date();
@@ -251,11 +252,11 @@ var MediaModalController = BlockModalController.extend({
           that.ajax_count += 1;
           var d = Date.parse(resp['last_upload_processed']);        
           if (d > that.last_upload_processed) {
-     //       console.log("new processed image, refreshing");
+            console.log("new processed image, refreshing");
             that.refresh_media(function() { that.print_media(); });          
           }      
           else {
-     //       console.log("no new processed images, waiting");
+            console.log("no new processed images, waiting");
             setTimeout(function() { that.check_processing_status(); }, 3000);          
           }
           that.last_upload_processed = d;                                                        
@@ -287,21 +288,9 @@ var MediaModalController = BlockModalController.extend({
     // }
     
     $('#top_controls').empty();
-    var img_html = "";
-    if (m.media_type == 'image') {
-      var img_src = m.image_urls ? m.image_urls.thumb_url : 'https://cabooseit.s3.amazonaws.com/assets/select_image.png';
-      img_html += "<img id='detail_image' src='" + img_src + "' />";
-      img_html += "<p class='filename'>" + m.original_name + "</p>";
-    }
-    else if (m.original_name.indexOf('.pdf') >= 0 || m.original_name.indexOf('.PDF') >= 0) {
-      img_html += "<embed id='detail_file' width='190' height='200' src='" + m.file_url + "' />";
-      img_html += "<p class='filename'>" + m.original_name + "</p>";
-    }
-    else {
-      img_html += "<p class='filename'>" + m.original_name + "</p>";
-    }
+    var img_tag = m.media_type == 'image' ? ($('<img/>').attr('id', 'detail_image').attr('src', m.image_urls ? m.image_urls.thumb_url : 'https://cabooseit.s3.amazonaws.com/assets/select_image.png')) : ( $('<p/>').addClass("filename").text(m.original_name) );
     $('#the_modal #media').empty()
-      .append( $("<div />").addClass("img-wrap").append(img_html) );
+      .append( $("<div />").addClass("img-wrap").append(img_tag) );
       // .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_media_category_id' ))) 
       // .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_name'              )))
       // .append($('<p/>').append($('<div/>').attr('id', 'media_' + media_id + '_description'       )))      

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

@@ -1,3 +1,4 @@
+//= require caboose/spectrum
 //= require caboose/model/class
 //= require caboose/model/model
 //= require caboose/model/s3
@@ -18,8 +19,3 @@
 //= require caboose/model/bound_text
 //= require caboose/model/bound_textarea
 //= require caboose/model/bound_richtext
-
-
-
-// removed:
-// require caboose/spectrum

data/app/assets/stylesheets/caboose/admin/_config.scss

@@ -0,0 +1,102 @@
+// Color
+$color-main:          #2475A5;
+$color-alt:           #24A55E;
+
+$color-light:         #E4E4E4;
+$color-dark:          #505050;
+
+// Size
+$max-width:           1000px;
+$body-bg-color:       #fff;
+
+$break-small:         550px;
+$break-medium:        800px;
+$break-large:         1100px;
+
+// Typography
+$font-size:           16px;
+
+$font-main:          	normal 1em "body-font", sans-serif;
+$font-alt:           	normal 1em "heading-font", sans-serif;
+$font-btn:            normal 1em "button-font", sans-serif;
+
+// Headings
+$heading-font:        $font-alt;
+
+// Header
+$header-height:       64px;
+$header-bg-color:     $color-light;
+$header-font-color:   $color-dark;
+$dropdown-color: 			$color-main;
+
+// Sidebar 
+$sidebar-bg-color:    	$color-dark;
+$sidebar-font-color:  	#fff;
+$sidebar-border-color:  rgba(255, 255, 255, 0.3);
+$sidebar-icon-color:  	$color-dark;
+
+// Footer
+$footer-height:       auto;
+$footer-bg-color:     $color-dark;
+$footer-font-color:   #fff;
+
+// Buttons
+$btn-border-radius:   5px;
+$btn-border-width:    0;    // 0 for no border
+$btn-border-color:    #999; // shade(#d0d0d0, 20%);
+$btn-bg-color:        #d0d0d0;
+$btn-font-color:      #000;
+$btn-font:            $font-btn;
+$btn-font-size:       14px;
+$btn-font-weight:     normal; // bold || normal
+$btn-font-case:       uppercase;   // none || uppercase || lowercase || capitalize
+$btn-border-side:     "all"; // "all" || "bottom"
+
+// Inputs
+$input-border-radius:   2px;
+$input-bg-color:        #fff;
+$input-border-color:    $color-main;
+$input-border-width:    1px; // 0 for no border
+$input-font:            $font-main;
+$input-font-color:      $color-dark;
+$input-font-size:       1em;
+
+@mixin mini() { @media all and (max-width: $break-small) { @content }}
+@mixin small() { @media all and (max-width: $break-medium) { @content }}
+@mixin medium() { @media all and (min-width: $break-medium) and (max-width: $break-large) { @content }}
+@mixin big()   { @media all and (min-width: $break-medium) { @content }}
+@mixin breakpx( $min, $max ) {
+  @media all and (min-width: $min) and (max-width: $max) { @content }
+}
+
+@mixin bgcover( $url ) {
+  background-image: url('#{$url}');
+  -ms-behavior: url('/bg.htc');
+  background-size: cover;
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
+@mixin flexbox() {
+  display: -webkit-box;
+  display: -moz-box;
+  display: -ms-flexbox;
+  display: -webkit-flex;
+  display: flex;
+}
+
+@mixin flex($values) {
+  -webkit-box-flex: $values;
+  -moz-box-flex:  $values;
+  -webkit-flex:  $values;
+  -ms-flex:  $values;
+  flex:  $values;
+}
+
+@mixin order($val) {
+  -webkit-box-ordinal-group: $val;  
+  -moz-box-ordinal-group: $val;     
+  -ms-flex-order: $val;     
+  -webkit-order: $val;  
+  order: $val;
+}

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

@@ -0,0 +1,11 @@
+/*
+ * /app/assets/stylsheets/caboose/admin/application.css
+ *
+ *= require_self 
+ *= require colorbox-rails
+ *= require jquery-ui
+ *= require caboose/jquery.datetimepicker
+ *= require caboose/admin/jquery-ui-subnav-theme.min
+ *= require caboose/admin/main
+ *= require caboose/admin/component 
+ */

data/app/assets/stylesheets/caboose/admin/component.css

@@ -0,0 +1,183 @@
+/* General styles for all menus */
+.cbp-spmenu {
+	background: #47a3da;
+	position: fixed;
+}
+
+.cbp-spmenu h3 {
+	color: #afdefa;
+	font-size: 1.9em;
+	padding: 20px;
+	margin: 0;
+	font-weight: 300;
+	background: #0d77b6;
+}
+
+.cbp-spmenu a {
+	display: block;
+	color: #fff;
+	font-size: 0.9em;
+	font-weight: 300;
+    height: 40px !important;
+    text-decoration: none;
+    cursor: pointer;
+}
+.cbp-spmenu a.close {
+	color: #fff;
+	font-size: 0.9em;
+	font-weight: 300;
+    height: 25px !important;
+    text-align: right;
+    border-bottom: 0px;
+    cursor: pointer;
+}
+.cbp-spmenu-vertical a.close{
+    padding: 0.3em;
+}
+
+.cbp-spmenu a:hover {
+	background: #258ecd;
+}
+
+.cbp-spmenu a:active {
+	background: #afdefa;
+	color: #47a3da;
+}
+
+/* Orientation-dependent styles for the content of the menu */
+
+.cbp-spmenu-vertical {
+	width: 240px;
+	height: 100%;
+	top: 54px;
+}
+
+.cbp-spmenu-vertical a {
+	border-bottom: 1px solid #258ecd;
+	padding: 0.6em;
+}
+
+.cbp-spmenu-horizontal {
+	width: 100%;
+	height: 150px;
+	left: 0;
+	z-index: 1000;
+	overflow: hidden;
+}
+
+.cbp-spmenu-horizontal h3 {
+	height: 100%;
+	width: 20%;
+	float: left;
+}
+
+.cbp-spmenu-horizontal a {
+	float: left;
+	width: 20%;
+	padding: 0.8em;
+	border-left: 1px solid #258ecd;
+}
+
+/* Vertical menu that slides from the left or right */
+
+.cbp-spmenu-left {
+	left: -240px;
+    z-index: 999;
+}
+
+.cbp-spmenu-right {
+	right: -240px;
+}
+
+.cbp-spmenu-left.cbp-spmenu-open {
+	left: 80px;
+    top: 54px;
+    width: 270px;
+    z-index: 999;
+}
+
+.cbp-spmenu-right.cbp-spmenu-open {
+	right: 0px;
+}
+
+/* Horizontal menu that slides from the top or bottom */
+
+.cbp-spmenu-top {
+	top: -150px;
+}
+
+.cbp-spmenu-bottom {
+	bottom: -150px;
+}
+
+.cbp-spmenu-top.cbp-spmenu-open {
+	top: 0px;
+}
+
+.cbp-spmenu-bottom.cbp-spmenu-open {
+	bottom: 0px;
+}
+
+/* Push classes applied to the body */
+
+.cbp-spmenu-push {
+	overflow-x: hidden;
+	position: relative;
+}
+
+.cbp-spmenu-push-toright {
+	left: 240px;
+}
+
+.cbp-spmenu-push-toleft {
+	left: -240px;
+}
+
+/* Transitions */
+
+.cbp-spmenu,
+.cbp-spmenu-push {
+	-webkit-transition: all 0.3s ease;
+	-moz-transition: all 0.3s ease;
+	transition: all 0.3s ease;
+}
+
+/* Example media queries */
+
+@media screen and (max-width: 55.1875em){
+
+	.cbp-spmenu-horizontal {
+		font-size: 75%;
+		height: 110px;
+	}
+
+	.cbp-spmenu-top {
+		top: -110px;
+	}
+
+	.cbp-spmenu-bottom {
+		bottom: -110px;
+	}
+
+}
+
+@media screen and (max-height: 26.375em){
+
+	.cbp-spmenu-vertical {
+		font-size: 90%;
+		width: 190px;
+	}
+
+	.cbp-spmenu-left,
+	.cbp-spmenu-push-toleft {
+		left: -190px;
+	}
+
+	.cbp-spmenu-right {
+		right: -190px;
+	}
+
+	.cbp-spmenu-push-toright {
+		left: 190px;
+	}
+}