caboose-cms 0.8.57 → 0.8.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46cad8ef370ab797b7f36acf01536f50c4194d33
-  data.tar.gz: 8f8db6b566034b216a86337aacf9aab8fdec23d7
+  metadata.gz: 440bc611b18b2f1eb2f0a621e820b72e6ececc79
+  data.tar.gz: e09a55fef27861960533f9c9d65b61c84d7ee055
 SHA512:
-  metadata.gz: f6b53ec696e54189d76d3726f100e194d86a5161b7c840f6a04a18d729814745ca7bc81381aacd2d1760962beb26eaf93e62d12684a4cb0aeb4e042dc46276a7
-  data.tar.gz: 10473972752dd1cd0f8aa7646aeff8501c72970ae4ca975613a8b689c5130b8cbe76592caecf289cc6c60d0bf45c8139cf060e926cc88454e94fb29f8742e47e
+  metadata.gz: f4b4168e893ce2587c56b7dfb4602d4115e769fbc6e5fb1d88fe238e3fb83456af91825214d6f2194317c80cf8fde4d564b088b6ce5f2e28c7c715e854b2ecdc
+  data.tar.gz: 3525e34ebdc132c1298bb0264d07f94304a1250535da8ee0c3c50d6f30639532eb870afceea4c98f1cb5144091c1f1cbabdd614630eb1b68005228bd69072753

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

@@ -45,6 +45,7 @@ PageContentController.prototype = {
     
   edit_block: function(block_id)
   {     
+    console.log('PageContentController.edit_block');
     var that = this;
     var b = that.block_with_id(block_id);
     var modal_controller = '';    
@@ -69,8 +70,8 @@ PageContentController.prototype = {
   
   new_block: function(parent_id, before_block_id, after_block_id)
   {
-    var that = this;        
-    //console.log(parent_id);
+    console.log('PageContentController.new_block');
+    var that = this;
     //caboose_modal_url('/admin/pages/' + this.page_id + '/blocks/' + parent_id + '/new');
     that.modal = new BlockModalController({ 
       page_id: that.page_id,
@@ -226,7 +227,7 @@ PageContentController.prototype = {
       
     if (parent_allows_child_blocks && (!b.name || b.name.length == 0))
     {            
-      $('#block_' + b.id).prepend($('<div/>')          
+      $('#block_' + b.id).before($('<div/>')          
         .addClass('new_block_link')
         .append($('<div/>').addClass('line'))
         .append($('<a/>')
@@ -234,7 +235,7 @@ PageContentController.prototype = {
           .html("New Block")
           .click(function(e) { 
             e.preventDefault(); e.stopPropagation();
-            //caboose_modal_url('/admin/pages/' + that.page_id + '/blocks/' + parent_id + '/new?before_id=' + b.id);
+            console.log('Adding new block...');
             that.new_block(parent_id, b.id);
           })
         )
@@ -243,7 +244,7 @@ PageContentController.prototype = {
       );
       if (is_last_child && is_last_child == true)
       {
-        $('#block_' + b.id).append($('<div/>')          
+        $('#block_' + b.id).after($('<div/>')          
           .addClass('new_block_link')
           .append($('<div/>').addClass('line'))
           .append($('<a/>')
@@ -251,7 +252,7 @@ PageContentController.prototype = {
             .html("New Block")
             .click(function(e) { 
               e.preventDefault(); e.stopPropagation();
-              //caboose_modal_url('/admin/pages/' + that.page_id + '/blocks/' + parent_id + '/new?after_id=' + b.id);
+              console.log('Adding new block...');
               that.new_block(parent_id, null, b.id);
             })
           )

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

@@ -385,16 +385,24 @@ var BlockModalController = ModalController.extend({
       );
       that.modal(div, 780);
       return;
-    }
+    }    
+    that.autosize("<p class='loading'>Adding block...</p>");
+    
+    bt = false;
+    $.ajax({      
+      url: '/admin/block-types/' + block_type_id + '/json',
+      type: 'get',      
+      success: function(resp) { bt = resp; },
+      async: false      
+    });        
+    that.include_assets('caboose/block_modal_controllers/' + bt.name + '_modal_controller.js');
     
-    that.autosize("<p class='loading'>Adding block...</p>");    
     var h = {                      
       authenticity_token: that.authenticity_token,
       block_type_id: block_type_id
     };
     if (that.before_id ) h['before_id'] = that.before_id;
     if (that.after_id  ) h['after_id' ] = that.after_id;
-
     $.ajax({
       url: '/admin/' + (that.page_id ? 'pages/' + that.page_id : 'posts/' + that.post_id) + '/blocks/' + that.block_id,
       type: 'post',
@@ -402,7 +410,7 @@ var BlockModalController = ModalController.extend({
       success: function(resp) {
         if (resp.error)   that.autosize("<p class='note error'>" + resp.error + "</p>");
         if (resp.success)
-        {
+        {                    
           that.parent_controller.refresh_blocks(function() {
             that.parent_controller.edit_block(resp.new_id);
             that.parent_controller.render_blocks();            

data/app/controllers/caboose/blocks_controller.rb

@@ -233,7 +233,7 @@ module Caboose
             :controller_view_content => nil,
             :modal => false,
             :editing => true,
-            :empty_text => params[:empty_text],            
+            :empty_text => params[:empty_text] ? params[:empy_text] : '[Empty, click to edit]',            
             :css => '|CABOOSE_CSS|',                     
             :js => '|CABOOSE_JAVASCRIPT|',
             :csrf_meta_tags => '|CABOOSE_CSRF|',

data/app/models/caboose/schema.rb

@@ -722,6 +722,10 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :date_css_updated        , :datetime   ],
         [ :default_layout_id       , :integer    ],
         [ :login_fail_lock_count   , :integer     , { :default => 5 }]
+        #[ :custom_css              , :text       ],
+        #[ :custom_css_files        , :text       ],
+        #[ :custom_js               , :text       ],
+        #[ :custom_js_files         , :text       ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],

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

@@ -1,13 +1,53 @@
-<!DOCTYPE html> 
+<%
+# See if we're using cloudflare
+protocol = 'http://'
+if request.env['HTTP_CF_VISITOR'] && request.env['HTTP_CF_VISITOR'].include?('https')
+  protocol = 'https://'
+  request.env['REQUEST_URI']     = "https://#{request.env['REQUEST_URI'][7..-1]}" if (request.env['REQUEST_URI'] =~ %r"http://") == 0    
+  request.env['SERVER_PORT']     = '443' if request.env['SERVER_PORT'] == '80'
+  request.env['HTTP_REFERER']    = "https://#{request.env['HTTP_REFERER'][7..-1]}" if (request.env['HTTP_REFERER'] =~ %r"http://") == 0    
+  request.env['rack.url_scheme'] = 'https'
+  request.env['HTTPS']           = 'on'
+end
+
+content_for :modal_css do
+  %><%= stylesheet_link_tag "caboose/modal", :media => "all" %><%
+  if File.exists?("#{Rails.root}/app/assets/stylesheets/modal.css")
+    %><%= stylesheet_link_tag "modal", :media => "all" %><%
+  end
+  %><%= yield :caboose_css %><%
+end
+
+css = yield(:modal_css)
+css.gsub!("<link href=\"//", "<link href=\"#{protocol}")
+css.gsub!("<link href='//" , "<link href='#{protocol}")
+if protocol == 'https://' 
+  css.gsub!("<link href=\"http://", "<link href=\"https://")
+  css.gsub!("<link href='http://" , "<link href='https://")
+end
+
+content_for :modal_js do
+  %><%= javascript_include_tag "caboose/modal" %><%
+  if File.exists?("#{Rails.root}/app/assets/javascripts/modal.js")
+    %><%= javascript_include_tag "modal" %><%
+  end  
+  %><%= yield :caboose_js %><%
+end
+
+js = yield(:modal_js)
+js.gsub!("<script src=\"//", "<script src=\"#{protocol}")
+js.gsub!("<script src='//" , "<script src='#{protocol}")
+if protocol == 'https://' 
+  js.gsub!("<script src=\"http://", "<script src=\"https://")
+  js.gsub!("<script src='http://" , "<script src='https://")
+end
+
+%><!DOCTYPE html> 
 <html class="no-js" lang="en">
 <head>
 <meta charset="utf-8" />
 <title>Modal Caboose</title>	
-<%= stylesheet_link_tag "caboose/modal", :media => "all" %>
-<% if File.exists?("#{Rails.root}/app/assets/stylesheets/modal.css") %>
-<%= stylesheet_link_tag "modal", :media => "all" %>
-<% end %>
-<%= yield :caboose_css %>
+<%= raw css %>
 <%= csrf_meta_tags %>
 <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
 </head>
@@ -19,10 +59,6 @@
 
   </div>
 </div>
-<%= javascript_include_tag "caboose/modal" %>
-<% if File.exists?("#{Rails.root}/app/assets/javascripts/modal.js") %>
-<%= javascript_include_tag "modal" %>
-<% end %>
-<%= yield :caboose_js %>
+<%= raw js %>
 </body>
 </html>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.57'
+  VERSION = '0.8.58'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.57
+  version: 0.8.58
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg