caboose-cms 0.9.228 → 0.9.229

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

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

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

@@ -4,7 +4,8 @@ var BlockContentController = function(params) { this.init(params); };
 BlockContentController.prototype = {
 
   post_id: false,
-  page_id: false,    
+  page_id: false,
+  is_publishing: false,
   new_block_type_id: false,
   selected_block_ids: [],
   blocks: false,
@@ -12,6 +13,8 @@ BlockContentController.prototype = {
   included_assets: false,
   mc: false,
   editing_block: false,
+  ajax_limit: 20,
+  ajax_count: 0,
   inline_classes: ['rtedit'],
   
   init: function(params)
@@ -40,6 +43,7 @@ BlockContentController.prototype = {
   },
 
   is_modified: function() {
+    var that = this;
     $("#tiny_header").removeClass('published').addClass('unpublished');
   },
 
@@ -127,7 +131,51 @@ 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 = '';
@@ -152,7 +200,8 @@ BlockContentController.prototype = {
       type: 'get',
       success: function(html) {
         $('body .container #block_' + block_id).replaceWith(html);
-        that.is_loading(false, 'Loading...');
+        if ( !that.is_publishing )
+          that.is_loading(false, 'Loading...');
         that.add_dropzones();
         that.init_inline_editor();
       }
@@ -208,13 +257,20 @@ 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);
-      if ( original.data('ui-draggable') ) { original.draggable('destroy'); }
+      // console.dir(original);
+      // console.dir( original.data('draggable') );
+      // 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,7 +295,8 @@ 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 div#block_' + block.id + ' p').html('Empty file.');
+        $("#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 #block_' + block.id).parent().find('.caboose-btn').remove();
         that.parent_controller.render_blocks();
         that.autosize();
@@ -330,7 +331,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 a file') < 0 ) {
+    if ( b.block_type && b.block_type.field_type == 'file' && b.rendered_value.indexOf('Click to select 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 + ' (' + cat.media_count + ')');      
+      .append(prefix + cat.name);      
     if (cat.id == that.cat_id)
       opt.attr('selected', 'true');
     select.append(opt);        
@@ -240,7 +240,6 @@ 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();
@@ -252,11 +251,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;                                                        
@@ -288,9 +287,21 @@ var MediaModalController = BlockModalController.extend({
     // }
     
     $('#top_controls').empty();
-    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) );
+    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>";
+    }
     $('#the_modal #media').empty()
-      .append( $("<div />").addClass("img-wrap").append(img_tag) );
+      .append( $("<div />").addClass("img-wrap").append(img_html) );
       // .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,4 +1,3 @@
-//= require caboose/spectrum
 //= require caboose/model/class
 //= require caboose/model/model
 //= require caboose/model/s3
@@ -19,3 +18,8 @@
 //= 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_block_edit_image.css.scss

@@ -1,7 +1,8 @@
 #media .img-wrap {
   background-image: url("/assets/caboose/grid.png");
   background-size: 15px;
-  display: inline-block;
+  display: block;
+  width: 100%;
 }
 
 #detail_image {

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

@@ -155,6 +155,29 @@ body.editing .footer-wrapper #footer-msg {
         }
       }
     }
+    .file-select {
+      p {
+        font-size: 13px;
+        border: 1px solid gainsboro;
+        display: block;
+        background: #dff4fb;
+        padding: 5px;
+        cursor: pointer;
+        overflow: hidden;
+        span {
+          display: block;
+          margin-top: 3px;
+          font-family: monospace;
+          font-size: 12px;
+          overflow: hidden;
+          color: #292929;
+          font-weight: normal;
+        }
+      }
+      &:hover p {
+        background: #fbf6df;
+      }
+    }
     #modal_crumbtrail {
       margin-bottom: 15px;
       padding-top: 4px;
@@ -214,7 +237,34 @@ body.editing .footer-wrapper #footer-msg {
           }
         }
       }
+      .caboose-btn.remove {
+        background-size: 11px;
+        background-repeat: no-repeat;
+        background-position: 8px 7px;
+        background-image: url('/assets/caboose/icons/delete.png');
+        background-color: #6f3030;
+        &:hover { background-color: shade(#6f3030, 20%);  }
+      }
       .img-wrap {
+        display: block;
+        width: 100%;
+        & > span {
+          font-family: monospace;
+          font-size: 11px;
+          border: 1px solid gainsboro;
+          border-bottom: 0;
+          display: block;
+          background: #dff4fb;
+          margin: 0;
+          padding: 4px;
+          color: #292929;
+          font-weight: normal;
+          overflow: hidden;
+        }
+        embed {
+          display: block;
+          margin-bottom: 5px;
+        }
         .img-holder {
           cursor: pointer;
           span.select {
@@ -239,24 +289,22 @@ body.editing .footer-wrapper #footer-msg {
             }
           }
         }
-        .caboose-btn.remove {
-          background-size: 11px;
-          background-repeat: no-repeat;
-          background-position: 8px 7px;
-          background-image: url('/assets/caboose/icons/delete.png');
-          background-color: #6f3030;
-          &:hover { background-color: shade(#6f3030, 20%);  }
-        }
         .filename {
-          background: #ecebe8;
-          margin: 0;
-          padding: 5px;
-          width: 190px;
+          font-family: monospace;
+          font-size: 12px;
+          border: 1px solid gainsboro;
           display: block;
+          background: #dff4fb;
+          margin: 0;
+          padding: 4px;
+          color: #292929;
+          font-weight: normal;
+          overflow: hidden;
         }
       }
       .mb_container {
         padding-top: 18px;
+        width: 100% !important;
         input, textarea {
           display: block;
           border-radius: 0 !important;
@@ -284,6 +332,13 @@ body.editing .footer-wrapper #footer-msg {
             background: #fffac5 !important;
           }
         }
+        table.data.checkbox_multiple {
+          label {
+            font-size: 12px;
+            position: relative;
+            top: 2px;
+          }
+        }
         textarea {
           min-height: 80px;
         }
@@ -646,6 +701,7 @@ p.caboose_note.delete {
     font-weight: 300;
     font-size: 1.2em;
     margin-bottom: 0;
+    color: #2b2b2b;
   }
   // opacity: 0;
   // transition: opacity 300ms ease;
@@ -732,7 +788,7 @@ body > .container, body > .mm-page > .container {
     &[href*="preview"] {
       background: #404088;
     }
-    &[href*="publish"] {
+    &.pub {
       background: #3b753b;
     }
     &:hover {
@@ -746,12 +802,12 @@ body > .container, body > .mm-page > .container {
   &.published {
     background-color: #353535;
     #m-unpub { display: none; }
-    a[href*="revert"], a[href*="publish"], a[href*="preview"] {
+    a[href*="revert"], a.pub, a[href*="preview"] {
       display: none;
     }
   }
   &.unpublished {
-    background-color: #7da4a9;
+    background-color: #73a8af;
     #m-pub { display: none; }
   }
 }

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

@@ -144,6 +144,10 @@ body * {
   display: none;
 }
 
+#top_nav ul li:hover ul {
+  display: block;
+}
+
 #top_nav ul li ul li {
   display: block;
 }
@@ -497,40 +501,32 @@ Page Bar Generator
 *******************************************************************************/
 
 .page_links {
-  
-}
-
-.page_links a {
-  display: inline-block;
-  margin: 0 3px;
-  padding: 8px 10px;
-  background: #2d2d2d;
-  color: #fff;
-  text-decoration: none;
-}
-
-.page_links a:hover {
-  background: #000;
-  color: #fff;
-}
-
-.page_links .middle_links a {
-  
-}
-
-.page_links span.current_page {
-  display: inline-block;
-  padding: 8px 10px;
-  margin: 0 3px;
-  background: #ccc;
-  color: #2d2d2d;
-  text-decoration: none;
+  a {
+    display: inline-block;
+    margin: 0 3px;
+    padding: 8px 10px;
+    background: #2d2d2d;
+    color: #fff;
+    text-decoration: none;
+    cursor: pointer;
+    &:hover {
+      background: #000;
+      color: #fff;
+    }
+  }
+  span.current_page {
+    display: inline-block;
+    padding: 8px 10px;
+    margin: 0 3px;
+    background: #ccc;
+    color: #2d2d2d;
+    text-decoration: none;
+  }
 }
 
 #search_form input[type='text']   { padding: 6px 12px; }
 #search_form input[type='submit'] { height: 35px; padding: 0 12px; }
 
-
 .new-page-form-wrapper {
   max-width: 950px;
   margin: 0 auto;

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

@@ -18,7 +18,27 @@
 
 #uploader {
   .caboose-btn {
-    margin-right: 6px;
+    margin-right: 5px;
+    font-size: 14px;
+    line-height: 25px;
+    &.red {
+      background: #bc5252;
+      &:hover {
+        background: shade(#bc5252, 15%);
+      }
+    }
+    &.green {
+      background: #51bd63;
+      &:hover {
+        background: shade(#51bd63, 15%);
+      }
+    }
+    &.blue {
+      background: #516dbb;
+      &:hover {
+        background: shade(#516dbb, 15%);
+      }
+    }
   }
 }
 
@@ -102,6 +122,7 @@
 }
     
 #media {
+  margin-top: 10px;
   padding-right: 2%;
   ul {
     list-style: none; 
@@ -174,7 +195,7 @@
         font-size: 12px;
         text-align: center;        
         background: rgba(0,0,0,0.7);
-        padding: 3px;
+        padding: 3px 5px 4px 5px;
         color: #fff; 
         text-decoration: none !important;                                   
       }
@@ -206,7 +227,7 @@
         text-align: center;
         color: #000;
         border-radius: 4px;
-        padding: 4px;
+        padding: 3px 5px 4px 5px;
         &:focus {
           outline-width: 0;
         }
@@ -215,7 +236,7 @@
           color: #fff;
           float: left;
           &:hover {
-            background: shade(#516dbb, 10%);
+            background: shade(#516dbb, 15%);
           }
         }
         &.dl {
@@ -226,7 +247,7 @@
           color: #fff;
           // width: 100%;
           &:hover {
-            background: shade(#51bd63, 10%);
+            background: shade(#51bd63, 15%);
           }
           &.i {
             width: auto;