caboose-cms 0.8.46 → 0.8.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11fff3e4ef21a888dc85709e4d34de0d6caa10b2
-  data.tar.gz: a03b51904117697b3ceeb5eaf149ae0883351bad
+  metadata.gz: 9f920fab1834790a362b160a140c8448ac5448be
+  data.tar.gz: 535fa4f54964d526d706bbf642c1cb96f8871216
 SHA512:
-  metadata.gz: 6bc6b3e324ff849f371e4e4c9d2847000d927f4077ac8ccee091c8bf2638dea19683544f9c05776f6cd7ea01a7c672d6af68b3258d67f8655a8bbe6529c1d115
-  data.tar.gz: 3f7cb52684efdae651bab1860592796ade3e2ba92d649b0439ad66ae0cbd212a5e7e0dd335f28643defccd0e44a5459259c0121cc7efa1240970e8032db862a3
+  metadata.gz: bb8ff41a4f2f43a42e2a0c179cf1edae14152eb187fd27e66a0ebeaccbc25c26e1b99bf2b3cb74c9156128290fdc3e6bc24f46889ecb11330d4b283cb3ad84ea
+  data.tar.gz: 7b00612ffe51ab6cfeec1f4a09bd6ab0126c907904410d4dcc70c43cc5b480d02c39f9e6d008dac1e86fa04733e732c1888977385708146bdafa886dadd91b5c

data/app/controllers/caboose/pages_controller.rb

@@ -435,7 +435,7 @@ module Caboose
             resp.attributes['parent_id'] = { 'text' => page.parent.title }
           end
 
-        when 'custom_css', 'custom_js'
+        when 'custom_css', 'custom_css_files', 'custom_js', 'custom_js_files'
           value.strip!
           page[name.to_sym] = value
 

data/app/models/caboose/page.rb

@@ -22,7 +22,9 @@ class Caboose::Page < ActiveRecord::Base
     :hide                  ,
     :content_format        ,
     :custom_css            ,
+    :custom_css_files      ,
     :custom_js             ,
+    :custom_js_files       ,
     :linked_resources      ,
     :layout                ,
     :sort_order            ,

data/app/models/caboose/schema.rb

@@ -479,7 +479,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :hide                  , :boolean , { :default => false }],
         [ :content_format        , :integer , { :default => Caboose::Page::CONTENT_FORMAT_HTML }],
         [ :custom_css            , :text    ],
+        [ :custom_css_files      , :text    ],
         [ :custom_js             , :text    ],
+        [ :custom_js_files       , :text    ],
         [ :linked_resources      , :text    ],
         [ :layout                , :string  ],
         [ :sort_order            , :integer , { :default => 0                }],

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

@@ -1,6 +1,10 @@
 
 <%= render :partial => 'caboose/pages/admin_header' %>
 
+<h2>Custom CSS URLs</h2>
+<p>One URL per line</p>
+<p><div id='page_<%= @page.id %>_custom_css_files'></div></p>
+<h2>Custom CSS</h2>
 <p><div id='page_<%= @page.id %>_custom_css'></div></p>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
@@ -19,7 +23,8 @@ $(document).ready(function() {
     update_url: '/admin/pages/<%= @page.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'custom_css', nice_name: 'Custom CSS', type: 'textarea', value: <%= raw Caboose.json(@page.custom_css) %>, width: 800, height: 400 }             
+      { name: 'custom_css_files' , nice_name: 'Custom CSS URLs' , type: 'textarea', value: <%= raw Caboose.json(@page.custom_css_files ) %>, width: 800, height: 200, fixed_placeholder: false },
+      { name: 'custom_css'       , nice_name: 'Custom CSS'      , type: 'textarea', value: <%= raw Caboose.json(@page.custom_css       ) %>, width: 800, height: 400, fixed_placeholder: false }             
     ]
   });
 });

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

@@ -1,6 +1,10 @@
 
 <%= render :partial => 'caboose/pages/admin_header' %>
 
+<h2>Custom Javascript URLs</h2>
+<p>One URL per line</p>
+<p><div id='page_<%= @page.id %>_custom_js_files'></div></p>
+<h2>Custom Javascript</h2>
 <p><div id='page_<%= @page.id %>_custom_js'></div></p>
 
 <%= render :partial => 'caboose/pages/admin_footer' %>
@@ -19,7 +23,8 @@ $(document).ready(function() {
     update_url: '/admin/pages/<%= @page.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'custom_js', nice_name: 'Custom Javascript', type: 'textarea', value: <%= raw Caboose.json(@page.custom_js) %>, width: 800, height: 400 }             
+      { name: 'custom_js_files', nice_name: 'Custom Javascript URLs' , type: 'textarea', value: <%= raw Caboose.json(@page.custom_js_files ) %>, width: 800, height: 200, fixed_placeholder: false },
+      { name: 'custom_js'      , nice_name: 'Custom Javascript'      , type: 'textarea', value: <%= raw Caboose.json(@page.custom_js       ) %>, width: 800, height: 400, fixed_placeholder: false }             
     ]
   });
 });

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

@@ -6,6 +6,9 @@
 <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
 <% @page.linked_resources_map[:js].each do |r| %><%= gzip_javascript_include_tag r %><% end %>
 <% if @site.date_js_updated %><script type='text/javascript' src="<%= raw @site.custom_js_url %>"></script><% end %>
+<% if @page.custom_js_files && @page.custom_js_files.strip.length > 0 %>
+  <% @page.custom_js_files.split("\n").each do |url| %><script type='text/javascript' src="<%= raw url %>"></script><% end %>
+<% end %>
 <% if @page.custom_js && @page.custom_js.strip.length > 0 %><script type='text/javascript'><%= raw @page.custom_js %></script><% end %>
 <%= yield :caboose_js %>
 <% end %>
@@ -15,6 +18,9 @@
 <% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
 <% @page.linked_resources_map[:css].each do |r| %><%= gzip_stylesheet_link_tag r %><% end %>
 <% if @site.date_css_updated %><link rel='stylesheet' type='text/css' url="<%= raw @site.custom_css_url %>" /><% end %>
+<% if @page.custom_css_files && @page.custom_css_files.strip.length > 0 %>
+  <% @page.custom_css_files.split("\n").each do |url| %><link rel="stylesheet" type='text/css' href="<%= raw url %>" /><% end %>
+<% end %>
 <% if @page.custom_css && @page.custom_css.strip.length > 0 %><style><%= raw @page.custom_css %></style><% end %>
 <%= yield :caboose_css %>
 <% end %>

data/lib/caboose/engine.rb

@@ -114,7 +114,7 @@ module Caboose
         'jquery-ui.css',                
         '*/css/application.css', # Site CSS
         
-        # PLUpload        
+        # PLUpload 
         'plupload/i18n/*.js',
         'plupload/jquery.plupload.queue/css/*.css',
         'plupload/jquery.plupload.queue/img/*.gif',

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.46'
+  VERSION = '0.8.47'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.46
+  version: 0.8.47
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -524,7 +524,6 @@ files:
 - app/assets/javascripts/caboose/application.js
 - app/assets/javascripts/caboose/authorize.net.js
 - app/assets/javascripts/caboose/block_media_controller.js
-- app/assets/javascripts/caboose/block_modal_controllers/#Untitled-1#
 - app/assets/javascripts/caboose/block_modal_controllers/block_modal_controller.js
 - app/assets/javascripts/caboose/block_modal_controllers/button_modal_controller.js
 - app/assets/javascripts/caboose/block_modal_controllers/default_block_modal_controller.js

data/app/assets/javascripts/caboose/block_modal_controllers/#Untitled-1#

@@ -1,3 +0,0 @@
-<textarea id="block_119227_value" class="tinymce" placeholder="empty" style="width: 800px; height: 300px;"></textarea>
-
-removeEditorFromList