caboose-cms 0.9.153 → 0.9.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41658663bbedf9b3ff201d188590a5d03d2ecfe
-  data.tar.gz: 5ffb004d2f5a410410f4dae6e928593880a7485c
+  metadata.gz: b5362ac8198ce6669568e531ca0957fedb682877
+  data.tar.gz: 43dfc3ce1767eed54ef1522048dceffb4a46c6bf
 SHA512:
-  metadata.gz: 88a9a689d6b2067d1b420b2a55bc98c8ddb4f55562b83c812ac9d8b5f4dccd94dd4263221469e371b9455fe3370e68e7e15a0af03b510cd92d1d874c54e1667e
-  data.tar.gz: b914bf469984ab9677ae05d521ff25c58095894f2883b27e77ca796efe0e5f5781894a462dafaa9d932ed2e1a7beb0d7927504a839d3392bdd8fdf702077ddb8
+  metadata.gz: 4eeecffc4dff2e9a5df29f6803ab3ff2ce1f02549af7befac779ba8b7388ff630c253cbee328c437110e98f14c1211fca4017374a952b7c0393a2a5d344b8019
+  data.tar.gz: c9efc6e17eacb86639b27bd1cb1be4493949d4a79ae877435054a7abe2155b0d65760ed11e0e1d08a64d0c85d79d33bc873cc0f1c0732af1da7f7bb62c6a04be

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

@@ -17,6 +17,7 @@ MediaController.prototype = {
   allow_edit: false,
   feather_editor: false,  
   last_upload_processed: false,
+  assets_path: false,
   ajax_count: 0,
   ajax_limit: 20,
   
@@ -343,7 +344,7 @@ MediaController.prototype = {
           var ext = m.original_name.match(/\.[0-9a-z]+$/i);
           li.addClass('empty');
           if (ext && ext.length > 0)
-            li.append($('<img/>').attr('src', '//assets.caboosecms.com/assets/caboose/file_types/' + ext[0].replace(".","").toLowerCase() + '.png').addClass('file-icon').attr("width","80").attr("height","80"));
+            li.append($('<img/>').attr('src', that.assets_path + 'caboose/file_types/' + ext[0].replace(".","").toLowerCase() + '.png').addClass('file-icon').attr("width","80").attr("height","80"));
         }                                  
         if (that.selected_media.indexOf(m.id) > -1)
           li.addClass('selected ui-selected');

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

@@ -13,6 +13,7 @@ var MediaModalController = BlockModalController.extend({
 	refresh_unprocessed_images: false,		               
 	selected_media: false,
 	uploader: false,  
+  assets_path: false,
   upload_extensions: "jpg,jpeg,png,gif,tif,tiff,pdf,doc,docx,odt,odp,ods,ppt,pptx,xls,xlsx,zip,tgz,csv,txt",
   file_view: 'thumbnail',
   
@@ -204,7 +205,7 @@ var MediaModalController = BlockModalController.extend({
           var ext = m.original_name.match(/\.[0-9a-z]+$/i);
           li.addClass('empty');
           if (ext && ext.length > 0)
-            li.append($('<img/>').attr('src', '//assets.caboosecms.com/assets/caboose/file_types/' + ext[0].replace(".","").toLowerCase() + '.png').addClass('file-icon').attr("width","80").attr("height","80"));
+            li.append($('<img/>').attr('src', that.assets_path + 'caboose/file_types/' + ext[0].replace(".","").toLowerCase() + '.png').addClass('file-icon').attr("width","80").attr("height","80"));
         }   
 
         //if (that.selected_media.indexOf(m.id) > -1)

data/app/views/caboose/blocks/admin_edit_file.html.erb

@@ -85,7 +85,8 @@ $(document).ready(function() {
 	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
 	  policy: '<%= raw @policy %>',
 	  signature: '<%= raw @signature %>',
-	  refresh_unprocessed_images: false	          
+	  refresh_unprocessed_images: false,
+    assets_path: "<%= Rails.env.production? ? ('https://' + Caboose::cdn_domain + '/assets/') : '/assets/' %>"
   });    
 });    
 

data/app/views/caboose/blocks/admin_edit_image.html.erb

@@ -85,7 +85,8 @@ $(document).ready(function() {
 	  aws_access_key_id: '<%= raw @aws_access_key_id %>',		
 	  policy: '<%= raw @policy %>',
 	  signature: '<%= raw @signature %>',
-	  refresh_unprocessed_images: false
+	  refresh_unprocessed_images: false,
+    assets_path: "<%= Rails.env.production? ? ('https://' + Caboose::cdn_domain + '/assets/') : '/assets/' %>"
   });	
 });
 

data/app/views/caboose/media/admin_index.html.erb

@@ -35,7 +35,8 @@ $(document).ready(function() {
 	  policy: '<%= raw @policy %>',
 	  signature: '<%= raw @signature %>',
 	  refresh_unprocessed_images: true,
-    allow_edit: true
+    allow_edit: true,
+    assets_path: "<%= Rails.env.production? ? ('https://' + Caboose::cdn_domain + '/assets/') : '/assets/' %>"
   });
 });
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.153'
+  VERSION = '0.9.154'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.153
+  version: 0.9.154
 platform: ruby
 authors:
 - William Barry