caboose-cms 0.9.138 → 0.9.139

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2210b753a82c6e41b19c51b38ba9a32b8de33ee3
-  data.tar.gz: 800186525ae9abae5f3d057dbba73b0ad7e701bb
+  metadata.gz: fa2fe345ebd7b72fe8cc102bb36a8024b8adfc1c
+  data.tar.gz: 245f02764732266fab06044cdff4e8e37a4066ca
 SHA512:
-  metadata.gz: 0dfbc83db912192e67c4044168772a84c6fe8dafbceda8f543da3ddd39e3950084f5bad76a975d41237f0ba4591f6f0ce26cebcb8e77df95be86785e377ef996
-  data.tar.gz: 0b8fb8d10f4a4a39b16dcf711aa3a490a200ad5a328d104b0cbf617f495c669d96547749807dcff41ab1c25d3e5fe417b96f0213954308d5cf0fc9155b68034a
+  metadata.gz: 3e9527274edb975954ddbb4124c596bdcfb08484ad7f2008ad18ee9f766d9e78d14467396a6a6ea7e78e9d644b8c4144cd9f43348e00dea534b18f6f32bb3952
+  data.tar.gz: 48510782255453a40040dad5ebdeff9557d2e663b3b4f57f4ffccba10b3f36e35e84e1fffe8409142a97e91f0fda7b8d9e2e30d933ae0c76b32b77df4a43db2e

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

@@ -127,15 +127,15 @@ var BlockModalController = ModalController.extend({
   {    
     var that = this;
     var p = $('<p/>').css('clear', 'both')
-      .append($('<input/>').attr('type', 'button').addClass('btn').val('Close').click(function() { that.close(); that.parent_controller.render_blocks(); })).append(' ');
+      .append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Close').click(function() { that.close(); that.parent_controller.render_blocks(); })).append(' ');
     if (!that.block.name)                        
     {
-      p.append($('<input/>').attr('type', 'button').addClass('btn').val('Delete Block').click(function() { that.delete_block(); })).append(' ');
-      p.append($('<input/>').attr('type', 'button').addClass('btn').val('Duplicate Block').click(function() { that.duplicate_block(); })).append(' ');
+      p.append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Delete Block').click(function() { that.delete_block(); })).append(' ');
+      p.append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Duplicate Block').click(function() { that.duplicate_block(); })).append(' ');
     }
-    p.append($('<input/>').attr('type', 'button').addClass('btn').val('Move Up'   ).click(function() { that.move_up();         })).append(' ');
-    p.append($('<input/>').attr('type', 'button').addClass('btn').val('Move Down' ).click(function() { that.move_down();       })).append(' ');    
-    p.append($('<input/>').attr('type', 'button').addClass('btn').val('Advanced'  ).attr('id', 'btn_advanced').click(function() { that.print_advanced();  }));
+    p.append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Move Up'   ).click(function() { that.move_up();         })).append(' ');
+    p.append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Move Down' ).click(function() { that.move_down();       })).append(' ');    
+    p.append($('<input/>').attr('type', 'button').addClass('caboose-btn').val('Advanced'  ).attr('id', 'btn_advanced').click(function() { that.print_advanced();  }));
     $('#modal_controls').empty().append(p);    
   },
   
@@ -146,11 +146,16 @@ var BlockModalController = ModalController.extend({
     var crumbs = $('<h2/>').css('margin-top', '0').css('padding-top', '0');
     $.each(that.block.crumbtrail, function(i, h) {
       if (i > 0) crumbs.append(' > ');
-      crumbs.append($('<a/>').attr('href', '#').html(h['text']).data('block_id', h['block_id']).click(function(e) { 
-        e.preventDefault();
-        if (that.before_crumbtrail_click) that.before_crumbtrail_click();
-        that.parent_controller.edit_block(parseInt($(this).data('block_id')));
-      }));
+      if ( i == 0 || h['text'] == "Content" ) {
+        crumbs.append($('<span/>').html(h['text']).data('block_id', h['block_id']));
+      }
+      else {
+        crumbs.append($('<a/>').attr('href', '#').html(h['text']).data('block_id', h['block_id']).click(function(e) { 
+          e.preventDefault();
+          if (that.before_crumbtrail_click) that.before_crumbtrail_click();
+          that.parent_controller.edit_block(parseInt($(this).data('block_id')));
+        }));
+      }
     }); 
     $('#modal_crumbtrail').empty().append(crumbs);        
   },
@@ -203,8 +208,7 @@ var BlockModalController = ModalController.extend({
     var that = this;    
     if (that.block.block_type.field_type != 'block' && that.block.children.length == 0)
       return;
-    
-    $.each(that.block.children, function(i, b) { that.render_child_block(b); });        
+    $.each(that.block.children, function(i, b) { if ( b.name != null || that.block.block_type.default_child_block_type_id == b.block_type.id ) { that.render_child_block(b); } });        
   },
   
   render_child_block: function(b)

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

@@ -46,7 +46,7 @@ BoundText = BoundControl.extend({
     // var this2 = this;
     // $('#'+this.el).on('keyup', function(e) {
     //   if (e.keyCode == 27) this2.cancel(); // Escape 
-    //   if (e.keyCode == 13) this2.save();   // Enter
+    //   if (e.keyCode == 13) this2.save();   // E
 
     if (that.attribute.width)  $('#'+that.el).css('width', that.attribute.width);    
     if (that.attribute.fixed_placeholder && that.attribute.align != 'right')
@@ -68,11 +68,12 @@ 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);                    
+    var w = $('#'+that.el+'_placeholder').outerWidth() + 10; 
+    if (w > 10)
+      $('#'+that.el).css('padding-left', + w);
+    else {
+      setTimeout(function() { that.set_placeholder_padding(); }, 500);                    
+    }
   },
   
   save: function() 

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

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

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

@@ -216,12 +216,12 @@
   background: #141516; 
   color: #f7f7f7 !important;
   text-align: center; 
-  padding: 0 15px;
+  padding: 1px 15px 0 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;
   font-family: "Roboto", Arial;
-  font-weight: 400;
+  font-weight: 300;
   font-size: 15px;
   line-height: 32px;
   cursor: pointer;
@@ -241,6 +241,10 @@
   background: #4f4448;
 }
 
+#modal_controls p .caboose-btn {
+  margin-right: 3px;
+}
+
     
 #media {
   ul.thumbnail_view {

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

@@ -82,7 +82,7 @@
 }
 #the_modal {
   #modal_controls {
-    margin-top: 10px;
+    margin-top: 20px;
   }
 }
 
@@ -91,7 +91,7 @@
 }
 
 #the_modal #modal_content .mb_container {
-  input {
+  input, textarea {
     border: #ccc 1px solid;
     border-radius: 0 !important;
     font-family: 'Roboto' !important;
@@ -235,6 +235,12 @@ body > .container, body > .mm-page > .container {
   }
 }
 
+// #modal_content .mb_container textarea {
+//   font-family: 'Roboto';
+//   font-weight: 300;
+//   font-size: 15px;
+// }
+
 #tiny_header {
   display: block;  
   color: #fff;
@@ -242,7 +248,7 @@ body > .container, body > .mm-page > .container {
   position: fixed;
   top: 0;
   right: 0;
-  z-index: 100000;
+  z-index: 999;
   width: calc(100% - 200px);
   height: 40px;
   padding: 0 2%;

data/app/controllers/caboose/blocks_controller.rb

@@ -82,7 +82,6 @@ module Caboose
     # @route GET /admin/posts/:post_id/blocks/:id/tree    
     def admin_tree
       return unless user_is_allowed("#{page_or_post}s", 'edit')      
-      
       blocks = []
       if params[:id]
         b = Block.find(params[:id])
@@ -98,7 +97,7 @@ module Caboose
           'constrain'          => b.constrain,
           'full_width'         => b.full_width,
           'block_type'         => bt,
-          'children'           => admin_tree_helper(b),
+          'children'           => admin_tree_helper(b,1),
           'crumbtrail'         => self.crumbtrail(b)          
           #'block_type_id'      => bt.id,           
           #'field_type'         => bt.field_type,
@@ -106,7 +105,7 @@ module Caboose
           #'use_js_for_modal'   => bt.use_js_for_modal,                              
         }
       else
-        q = params[:page_id] ? ["parent_id is null and page_id = ?", params[:page_id]] : ["parent_id is null and post_id = ?", params[:post_id]] 
+        q = !params[:page_id].blank? ? ["parent_id is null and page_id = ?", params[:page_id]] : ["parent_id is null and post_id = ?", params[:post_id]] 
         Block.where(q).reorder(:new_sort_order).all.each do |b|
           bt = b.block_type
           blocks << { 
@@ -119,7 +118,7 @@ module Caboose
             'constrain'          => b.constrain,
             'full_width'         => b.full_width,
             'block_type'         => bt,
-            'children'           => admin_tree_helper(b)            
+            'children'           => admin_tree_helper(b,1)            
             #'block_type_id'      => bt.id,
             #'field_type'         => bt.field_type,
             #'allow_child_blocks' => bt.allow_child_blocks,
@@ -127,7 +126,6 @@ module Caboose
           }
         end        
       end
-     # Caboose.log(blocks)
       render :json => blocks
     end
     
@@ -139,33 +137,34 @@ module Caboose
         crumbs << {
           :block_id => b.id,
           :text => bt.description
-       #   :text => b.name && b.name.downcase != bt.description.downcase  ? "#{bt.description} (#{b.name})" : bt.description
         }        
         b = b.parent
       end
       return crumbs.reverse
     end
       
-    def admin_tree_helper(b)
+    def admin_tree_helper(b,level)
       arr = []
-      b.filtered_children(true,true).order(:block_type_id).each do |b2|
-        bt = b2.block_type
-        arr << {
-          'id'                 => b2.id,
-          'parent_id'          => (b2.new_parent_id.blank? ? b2.parent_id : b2.new_parent_id),
-          'page_id'            => b2.page_id,
-          'post_id'            => b2.post_id,
-          'name'               => b2.name,
-          'value'              => (b2.new_value.blank? ? b2.value : (b2.new_value == 'EMPTY' ? nil : b2.new_value)),
-          'constrain'          => b2.constrain,
-          'full_width'         => b2.full_width,
-          'block_type'         => bt,
-          'children'           => admin_tree_helper(b2)          
-          #'block_type_id'      => bt.id,          
-          #'field_type'         => bt.field_type,
-          #'allow_child_blocks' => bt.allow_child_blocks,
-          #'use_js_for_modal'   => bt.use_js_for_modal,          
-        }
+      if level < 3
+        b.filtered_children(true,true).each do |b2|
+          bt = b2.block_type
+          arr << {
+            'id'                 => b2.id,
+            'parent_id'          => (b2.new_parent_id.blank? ? b2.parent_id : b2.new_parent_id),
+            'page_id'            => b2.page_id,
+            'post_id'            => b2.post_id,
+            'name'               => b2.name,
+            'value'              => (b2.new_value.blank? ? b2.value : (b2.new_value == 'EMPTY' ? nil : b2.new_value)),
+            'constrain'          => b2.constrain,
+            'full_width'         => b2.full_width,
+            'block_type'         => bt,
+            'children'           => admin_tree_helper(b2,level+1)          
+            #'block_type_id'      => bt.id,          
+            #'field_type'         => bt.field_type,
+            #'allow_child_blocks' => bt.allow_child_blocks,
+            #'use_js_for_modal'   => bt.use_js_for_modal,          
+          }
+        end
       end
       return arr
     end     
@@ -585,7 +584,7 @@ module Caboose
       resp = StdClass.new
       b = Block.find(params[:id])
     #  sibs = b.siblings
-      parent_id = b.parent_id
+      parent_id = b.new_parent_id.blank? ? b.parent_id : b.new_parent_id
       if b.parent_id
         if params[:page_id]
           resp.redirect = "/admin/pages/#{b.page_id}/blocks/#{b.parent_id}/edit"
@@ -618,6 +617,7 @@ module Caboose
 
       
       if parent_id
+        # Caboose.log("reorganizing blocks under #{parent_id}")
         # i = 0
         # Block.where(:parent_id => parent_id).where('status != ?', 'deleted').order(:new_sort_order).all.each do |b2|
         #   b2.new_sort_order = i
@@ -707,7 +707,7 @@ module Caboose
         b.new_sort_order = (b2.new_sort_order.blank? ? b2.sort_order : b2.new_sort_order)
         i = 1
         sibs = b2.siblings(b.new_sort_order)
-    #    Caboose.log("updating #{sibs.count} siblings")
+        Caboose.log("updating #{sibs.count} siblings")
         sibs.each do |b3|
           b3.new_sort_order = b.new_sort_order + i
           b3.status = 'edited' if b3.status == 'published'
@@ -719,7 +719,7 @@ module Caboose
         b.new_sort_order = (b2.new_sort_order.blank? ? (b2.sort_order + 1) : (b2.new_sort_order + 1))
         i = 1
         sibs = b2.siblings(b.new_sort_order)
-    #    Caboose.log("updating #{sibs.count} siblings")
+        Caboose.log("updating #{sibs.count} siblings")
         sibs.each do |b3|
           b3.new_sort_order = b.new_sort_order + i
           b3.status = 'edited' if b3.status == 'published'

data/app/controllers/caboose/pages_controller.rb

@@ -226,9 +226,11 @@ module Caboose
       @preview = false
     end
 
-    # @route GET /admin/pages/:id/preview
-    def admin_preview
+    # @route GET /pages/preview/:id
+    def preview
       @page = Page.find(params[:id])
+<<<<<<< HEAD
+=======
       # redirect_to "/login?return_url=/admin/pages/#{@page.id}/preview" and return if @logged_in_user.nil?
       # condition = @logged_in_user && (@logged_in_user.is_super_admin? || (@logged_in_user.site_id == @page.site_id && ( @logged_in_user.is_allowed('all','all') || @logged_in_user.is_allowed('pages','edit') && Page.permissible_actions(@logged_in_user, @page.id).include?('edit'))))
       condition = @page.site_id == @site.id
@@ -237,8 +239,13 @@ module Caboose
       #   redirect_to "/admin/pages/#{@page.id}/layout"
       #   return
       # end
+>>>>>>> 97f4d33f3f6719b2f17156cf09d0883ee55a5c65
       @editing = true
       @preview = true
+      if @page.nil? || @page.site_id != @site.id
+        redirect_to "/"
+        return
+      end
     end
     
     # @route GET /admin/pages/:id/layout

data/app/models/caboose/block.rb

@@ -539,7 +539,7 @@ class Caboose::Block < ActiveRecord::Base
 
   # block siblings (in editing mode)
   def siblings(min_sort_order=0)
-    Caboose::Block.where(:name => nil).where('new_sort_order >= ?',min_sort_order).where("(new_parent_id is null and parent_id = ? and status != ?) OR (new_parent_id = ? and status != ?)",self.parent_id,'deleted',self.parent_id,'deleted').order(:new_sort_order, :id).all
+    Caboose::Block.where(:name => nil).where('new_sort_order >= ?',min_sort_order).where("(new_parent_id is null and parent_id = ? and status != ?) OR (new_parent_id = ? and status != ?)",(self.new_parent_id.blank? ? self.parent_id : self.new_parent_id),'deleted',(self.new_parent_id.blank? ? self.parent_id : self.new_parent_id),'deleted').order(:new_sort_order, :id).all
   end
   
   # Move a block up

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

@@ -50,7 +50,7 @@ $(document).ready(function() {
     .append("<span id='m-unpub'>unpublished changes</span>")
     .append($('<a/>').attr('href', '/admin/pages').html("< Back"))
     .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/revert').html("Revert"))
-    .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/preview').attr('target','_blank').html("Preview"))
+    .append($('<a/>').attr('href', '/pages/preview/<%= @page.id %>').attr('target','_blank').html("Preview"))
     .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/publish').html("Publish"))
   <% if @page.page_custom_field_values.count > 0 %>
     .append($('<a/>').attr('href', '#').html('Custom Fields').click(function(e) { e.preventDefault(); caboose_modal_url('/admin/pages/<%= @page.id %>/custom-fields'); }))

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

@@ -0,0 +1 @@
+  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.138'
+  VERSION = '0.9.139'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.138
+  version: 0.9.139
 platform: ruby
 authors:
 - William Barry
@@ -1072,8 +1072,8 @@ files:
 - app/views/caboose/pages/admin_edit_seo.html.erb
 - app/views/caboose/pages/admin_index.html.erb
 - app/views/caboose/pages/admin_new.html.erb
-- app/views/caboose/pages/admin_preview.html.erb
 - app/views/caboose/pages/admin_sitemap.html.erb
+- app/views/caboose/pages/preview.html.erb
 - app/views/caboose/pages/show.html.erb
 - app/views/caboose/pages/test.html.erb
 - app/views/caboose/pages/update_pic.html.erb
@@ -1252,7 +1252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: CMS built on rails.

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

@@ -1 +0,0 @@
-