caboose-cms 0.9.133 → 0.9.134

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c49393255c99312890af6baa442e9307cbf5584
-  data.tar.gz: 37cbad54d4235c51cbb2e568b55d9c1f25f81310
+  metadata.gz: fcfbf246d2536f0c9e4403a909f7555bc07c6cd7
+  data.tar.gz: 9c92cffdf2508586d117a4c9e7d3030739c81f77
 SHA512:
-  metadata.gz: 4c0376086673884780f837058ff6dfa6e055b860bb3e1b8304595b520a64139518f3d7a6d09d448714d6368d6347a907badb9dd9c48b2c4122d779269c5aadf9
-  data.tar.gz: 84e926333becfc8207b32d004092ca91a779110941a41cab87ff51176cba48c97f81b1415474eb4f3a9cf30fb91d29f81cac1b7dafee10fcd3fa488b837a5b7e
+  metadata.gz: ef97678358c46a955e4e1fe41dee59189ec855db8d84be5b3d56b32893a3515988583358c7d18a18e063087a3538c4abfd6fdb1b2e9e46ddbda7d76c2a569e6f
+  data.tar.gz: cbb48655938c647fbc0495d64ef73ef95e1570448d3359523c0753222cb22279b1ae30c3baca83516b73ac1f96fb3a7b42be776f4c82a56b7f7ce032549c4064

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

@@ -143,7 +143,7 @@ BlockController.prototype = {
     h['value'] = b.value
     if (bt.field_type == 'checkbox')       h['value'] = b.value ? 'true' : 'false';
     if (bt.field_type == 'image')          h['value'] = b.image.tiny_url;
-    if (bt.field_type == 'file')           h['value'] = b.image.url;                
+    if (bt.field_type == 'file')           h['value'] = b.image.url; 
     if (bt.field_type == 'select')         h['text'] = b.value;
     if (bt.height)                         h['height'] = bt.height;
     if (bt.fixed_placeholder)              h['fixed_placeholder'] = bt.fixed_placeholder;      

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

@@ -35,6 +35,10 @@ BlockContentController.prototype = {
       }
     });    
   },
+
+  is_modified: function() {
+    $("#tiny_header").removeClass('published').addClass('unpublished');
+  },
     
   edit_block: function(block_id)
   {
@@ -142,6 +146,7 @@ BlockContentController.prototype = {
         success: function(resp) {}
       });
     }
+    that.is_modified();
     that.render_blocks();
   },
   
@@ -153,7 +158,8 @@ BlockContentController.prototype = {
       url: that.base_url() + '/' + block_id + '/move-up',
       type: 'put',      
       success: function(resp) {        
-        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
+        if (resp.success) that.render_blocks(function() { that.stop_loadify(); }); 
+        that.is_modified();     
       }
     });    
   },
@@ -166,7 +172,8 @@ BlockContentController.prototype = {
       url: that.base_url() + '/' + block_id + '/move-down',
       type: 'put',      
       success: function(resp) {        
-        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
+        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });
+        that.is_modified();      
       }
     });    
   },
@@ -179,7 +186,8 @@ BlockContentController.prototype = {
       url: that.base_url() + '/' + block_id + '/duplicate',
       type: 'put',
       success: function(resp) {        
-        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
+        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });    
+        that.is_modified();  
       }
     });    
   },

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

@@ -12,6 +12,7 @@ BlockContentController.prototype = {
   included_assets: false,
   mc: false,
   editing_block: false,
+  inline_classes: ['rtedit'],
   
   init: function(params)
   {
@@ -20,6 +21,9 @@ BlockContentController.prototype = {
       that[i] = params[i];
     that.add_dropzones();
     that.mc = new ModalController({ parent_controller: this, assets_path: that.assets_path });
+    CKEDITOR.disableAutoInline = true;
+    that.init_inline_editor();
+ //   that.add_all_new_child_blocks();
   },
 
   edit_block: function(block_id) {
@@ -35,6 +39,35 @@ BlockContentController.prototype = {
     });
   },
 
+  is_modified: function() {
+    $("#tiny_header").removeClass('published').addClass('unpublished');
+  },
+
+  init_inline_editor: function() {
+    var that = this;
+    $.each(that.inline_classes, function(k1, c) {
+      $.each($('.' + c), function(k2, b) {
+       // var el = $(b).find('.value').first();
+        if ( !$(b).hasClass('cke_editable') ) {
+          $(b).attr('contenteditable','true');
+          var target_id = $(b).data('rtid');
+     //     var block_id = $(b).attr('id').replace('block_','');
+          var editor = CKEDITOR.inline( $(b).attr('id') );
+          editor.on('change', function(ev) {
+            that.is_modified();
+            var html = $(b).html();
+            $.ajax({
+              url: that.base_url() + '/' + target_id + '/value',
+              type: 'put',
+              data: { value: html },
+              success: function(resp) { }
+            });
+          });
+        }
+      });
+    });
+  },
+
   show_edit_modal: function(block_id, use_js_for_modal, field_type, bname, btname) {
     var that = this;
     var ft = field_type;
@@ -80,7 +113,9 @@ BlockContentController.prototype = {
 
   render_block: function(block_id) {
     var that = this;
+  //  console.log("rendering block " + block_id + "...");
     var url = that.base_url() + '/' + block_id + '/render';
+    that.is_modified();
     $.ajax({
       url: url,
       type: 'get',
@@ -88,6 +123,7 @@ BlockContentController.prototype = {
         $('#block_' + block_id).replaceWith(html);
         that.is_loading(false, 'Loading...');
         that.add_dropzones();
+        that.init_inline_editor();
       }
     });
   },
@@ -115,6 +151,7 @@ BlockContentController.prototype = {
   create_block: function(block_type_id, parent_id, before_block_id, after_block_id, child_block_count) {
     var that = this;
     that.is_loading(true, 'Creating block...');
+    that.is_modified();
     var h = {                      
       authenticity_token: that.authenticity_token,
       block_type_id: block_type_id,
@@ -143,6 +180,7 @@ BlockContentController.prototype = {
   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);
       original.draggable('destroy');
@@ -228,6 +266,7 @@ BlockContentController.prototype = {
       }
       that.selected_block_ids = [];
       that.add_dropzones();
+      that.is_modified();
     }
   },
 
@@ -249,6 +288,7 @@ BlockContentController.prototype = {
     var fake_id = 'db' + Math.floor((Math.random() * 1000) + 1);
     el.attr('id','new_block_' + fake_id).addClass('duplicated-block');
     $('#block_' + block_id).after(el);
+    that.is_modified();
     that.duplicate_block_save(block_id, fake_id);
   },
 
@@ -271,10 +311,12 @@ BlockContentController.prototype = {
   
   render_parent_blocks: function(block_id) {
     var that = this;
+ //   console.log("rendering parent blocks for " + block_id + "...");
     $.ajax({
       url: that.base_url() + '/' + block_id + '/parent-block',
       type: 'get',
-      success: function(resp) {        
+      success: function(resp) {
+   //     console.log(resp);
         if ( resp && resp.parent_id ) { that.render_block(resp.parent_id) };
         if ( resp && resp.grandparent_id ) { that.render_block(resp.grandparent_id) };
       }
@@ -285,6 +327,7 @@ BlockContentController.prototype = {
   {
     var that = this;
     if ( that.editing_block ) {
+ //     console.log("rendering blocks for " + that.editing_block + "...");
       that.render_block( that.editing_block );
       that.render_parent_blocks( that.editing_block );
     }
@@ -383,6 +426,59 @@ BlockContentController.prototype = {
 
   },
 
+  // add_all_new_child_blocks: function() {
+  //   var that = this;
+  //   $.each( $('.content_body'), function(k,v) {
+  //     var el = $(v).parents("[id^='block_']").first();
+  //     that.add_new_child_blocks(el.attr('id').replace('block_',''));
+  //   });
+  // },
+
+  // get NEW child blocks of this block
+ //  add_new_child_blocks: function(block_id) {
+ // //   console.log('adding new child blocks for ' + block_id);
+ //    var that = this;
+ //    $.ajax({
+ //      url: that.base_url() + '/' + block_id + '/new-child-blocks',
+ //      type: 'get',
+ //      success: function(resp) {        
+ //        if ( resp && resp.blocks && resp.blocks.length > 0 ) {
+
+ //          $.each(resp.blocks, function(k,v) {
+
+ //        //    console.dir(v);
+
+ //            // render each of them
+ //            var url = that.base_url() + '/' + v.id + '/render';
+ //            $.ajax({
+ //              url: url,
+ //              data: {
+ //                is_new: 'yes'
+ //              },
+ //              type: 'get',
+ //              success: function(html) {
+ //            //    console.log(html);
+
+ //                if ( $('#block_' + block_id).find('.content_body').first().find('.new_block_link.np').length > 0 ) {
+ //                  $('#block_' + block_id).find('.content_body').first().html('');
+ //                }
+
+ //                $('#block_' + block_id).find('.content_body').first().append(html);
+
+ //                that.add_handles_to_block(v.id);
+ //              }
+ //            });
+
+ //          });
+
+ //          that.add_dropzones();
+ //          that.init_inline_editor();
+
+ //        }
+ //      }
+ //    });
+ //  },
+
   add_handles_to_block: function(block_id) {
     var that = this;
     var el = $('#block_' + block_id);
@@ -397,14 +493,38 @@ BlockContentController.prototype = {
           .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_delete'    ).addClass('delete_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-close'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(block_id);    }));
         el.mouseover(function(el) { $('#block_' + block_id).addClass(   'block_over'); });
         el.mouseout(function(el)  { $('#block_' + block_id).removeClass('block_over'); });
+        if ( el.hasClass('hasrt') )
+          el.prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_settings'    ).addClass('settings_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-gear'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.edit_block(block_id);    }));
       }
       el.attr('onclick','').unbind('click');
-      el.click(function(e) {      
-        e.preventDefault();
-        e.stopPropagation();      
-        that.edit_block(block_id);
-      });
+      if ( el.hasClass('footer-wrapper') && el.prev('.content_wrapper.subpage').length > 0 ) {
+        el.css('position','relative');
+        var over = $('<div />').attr('id','footer-msg').text('The footer must be edited on the homepage.').css('position','absolute').css('left','0').css('top','0').css('background','rgba(43, 43, 43, 0.9)').css('color','white').css('width','100%').css('height','100%').css('z-index','14').css('padding','40px 3% 40px 3%').css('text-align','center');
+        if ( el.find('#footer-msg').length == 0 ) { el.append(over); }
+      }
+      else if ( !el.hasClass('container') ) { 
+        el.click(function(e) {      
+          e.preventDefault();
+          e.stopPropagation();
+          if ( el.hasClass('rtedit') || $(e.target).closest(".rtedit").length > 0 || el.hasClass('content_wrapper') )
+            return;
+          else
+            that.edit_block(block_id);
+        });
+      }
     }
+
+
+    // el.attr('onclick','').unbind('click');
+    // el.click(function(e) {      
+    //   e.preventDefault();
+    //   e.stopPropagation();
+    //   if ( el.hasClass('rtedit') )
+    //     return;
+    //   else
+    //     that.edit_block(block_id);
+    // });
+
   },
   
   /*****************************************************************************

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

@@ -247,11 +247,11 @@ var BlockModalController = ModalController.extend({
       type: bt.field_type,      
       nice_name: bt.description ? bt.description : bt.name,
       width: bt.width ? bt.width : 780,      
-      after_update: function() { that.parent_controller.render_blocks(); },
-      after_cancel: function() { that.parent_controller.render_blocks(); }
-    };     
-    h['value'] = b.value
-    if (bt.field_type == 'checkbox')       h['value'] = b.value ? 'true' : 'false';
+      after_update: function() { setTimeout(function(){ that.parent_controller.render_blocks(); }, 800); },
+      after_cancel: function() { setTimeout(function(){ that.parent_controller.render_blocks(); }, 800); }
+    };
+    h['value'] = b.value;
+    if (bt.field_type == 'checkbox')       h['value'] = (b.value == '1' || b.value == 1 || b.value == true || b.value == 'true') ? 'true' : 'false';
     //if (bt.field_type == 'image')          h['value'] = b.image.tiny_url;
     //if (bt.field_type == 'file')           h['value'] = b.file.url;                
     if (bt.field_type == 'select')         h['text'] = b.value;

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

@@ -256,8 +256,8 @@ var BlockModalController = ModalController.extend({
       type: bt.field_type,      
       nice_name: bt.description ? bt.description : bt.name,
       width: bt.width ? bt.width : 780,      
-      after_update: function() { that.parent_controller.render_blocks(); },
-      after_cancel: function() { that.parent_controller.render_blocks(); }
+      after_update: function() { that.parent_controller.render_blocks(); that.parent_controller.is_modified(); },
+      after_cancel: function() { that.parent_controller.render_blocks(); that.parent_controller.is_modified(); }
     };     
     h['value'] = b.value
     if (bt.field_type == 'checkbox')       h['value'] = b.value ? 'true' : 'false';
@@ -408,7 +408,8 @@ var BlockModalController = ModalController.extend({
         {                    
           that.parent_controller.refresh_blocks(function() {
             that.parent_controller.edit_block(resp.new_id);
-            that.parent_controller.render_blocks();            
+            that.parent_controller.render_blocks();         
+            that.parent_controller.is_modified();   
           });
         }
       }
@@ -437,7 +438,8 @@ var BlockModalController = ModalController.extend({
         if (resp.redirect) 
         {
           that.close();
-          that.parent_controller.render_blocks();          
+          that.parent_controller.render_blocks();  
+          that.parent_controller.is_modified();        
         }
       }
     });
@@ -454,6 +456,7 @@ var BlockModalController = ModalController.extend({
         if (resp.success) {
           that.autosize("<p class='note success'>Duplicated block.</p>");          
           that.parent_controller.render_blocks();
+          that.parent_controller.is_modified();
         }   
       }
     });    
@@ -472,6 +475,7 @@ var BlockModalController = ModalController.extend({
         {
           that.autosize("<p class='note success'>" + resp.success + "</p>");          
           that.parent_controller.render_blocks();
+          that.parent_controller.is_modified();
         }
       }
     });    
@@ -490,6 +494,7 @@ var BlockModalController = ModalController.extend({
         {
           that.autosize("<p class='note success'>" + resp.success + "</p>");          
           that.parent_controller.render_blocks();
+          that.parent_controller.is_modified();
         }
       }
     });    

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

@@ -54,7 +54,7 @@ Attribute.prototype = {
 				  this2.value_clean = this2.value;
 				}				
 				if (after) after(resp);        				
-				//if (this2.after_update) this2.after_update(this2);				
+	//			if (this2.after_update) this2.after_update(this2);				
 			},
 			error: function() { 
 			  if (after) after(false);

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

@@ -222,7 +222,9 @@ ModelBinder.prototype = {
       attrib.update_url = this.model.update_url;
     if (attrib.before_update) attrib.before_update(this);
     attrib.save(after);      
-    if (attrib.after_update) attrib.after_update(this);
+    if (attrib.after_update) {
+      attrib.after_update(this);
+    }
   },
 
   repopulate_options_for_control: function(attribute_name) 

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

@@ -2,23 +2,78 @@
 #tiny_header {
   display: block;  
   color: #fff;
-  background-image: url(/assets/caboose/caboose_logo_small.png);
-  background-color: #000;  
-  background-repeat: no-repeat;
-  background-position: right 0;
-  padding: 0 50px 0 10px;
-  position: absolute;
-  top: 0px;
-  right: 0px;
+  background-color: #353535;  
+  position: fixed;
+  top: 0;
+  right: 0;
   z-index: 100000;
-  border-left: #fff 1px solid;
-  border-bottom: #fff 1px solid;  
+  width: 100%;
+  height: 40px;
+  padding: 0 2%;
+  line-height: 37px;
+  text-align: right;
+  transition: background-color 300ms ease;
+  #m-pub, #m-unpub {
+    float: left;
+    font-family: 'Roboto';
+    font-weight: 300;
+    font-size: 13px;
+    position: relative;
+    top: 1px;
+    font-style: italic;
+    color: #9e9e9e;
+  }
+  #m-unpub {
+    color: #fff;
+  }
+  a {
+    display: inline-block;
+    color: #fff;
+    padding: 0 10px;
+    font-family: 'Roboto';
+    font-weight: 300;
+    font-size: 12px;
+    text-decoration: none;
+    background: #5a5a5a;
+    margin-left: 8px;
+    text-transform: uppercase;
+    border-radius: 3px;
+    line-height: 24px;
+    &[href*="revert"] {
+      background: #903b3b;
+    }
+    &[href*="preview"] {
+      background: #404088;
+    }
+    &[href*="publish"] {
+      background: #3b753b;
+    }
+    &:hover {
+      background: #c3c3c3;
+      color: #353535;
+    }
+    &:focus {
+      outline-width: 0;
+    }
+  }
+  &.published {
+    background-color: #353535;
+    #m-unpub { display: none; }
+    a[href*="revert"], a[href*="publish"] {
+      display: none;
+    }
+  }
+  &.unpublished {
+    background-color: #7da4a9;
+    #m-pub { display: none; }
+  }
 }
-#tiny_header a {
-  display: inline-block;
-  color: #fff;
-  padding: 16px 10px;  
+
+body > .container, body > .mm-page > .container {
+  position: relative;
+  top: 40px;
 }
+
 .block_over { background: #e3e3e3; }
 .select_handle    { display: none; }
 .move_up_handle   { display: none; }