caboose-cms 0.9.84 → 0.9.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f831cb9d3346c2e26e41cb2f0e675ad78fb5556
-  data.tar.gz: bf90f758fdb232711a4d434cf4270bb370c02d3b
+  metadata.gz: cea68206352e34bf1da4d5ed4d55c9f71f01a8df
+  data.tar.gz: 70393baf679e3e4f75785c3362ca0f143cf1ebda
 SHA512:
-  metadata.gz: c1caeb8fc47bba7cca8325107c0d719139a9016c324722af723fba9560f0806fe5af1dfc08877b255b77cee4465b1da7492a65bb849ea190772ab8e97579eb1d
-  data.tar.gz: fca7945fd23aaae888b3c2a36f2c1b38665325aa9e92bafa452c47c34409567b1dd66b9352c74033347ce142c2ef31beadf85adc91267334ba3e924de8fec552
+  metadata.gz: 9cc4c2defa8b401b663a79591c6eab65c26ee38daf3de0807ae55ff0003878907b80fed66e1224af31aae8980c382f92a7452b521aaf66a2d21789ea086f1f87
+  data.tar.gz: 436adc06f4efb0e2271c42d1cc25b237a3c9a9dda5cccb8f9d4416af864f6659c04e7a135cb17c0bfdae68a9c4f0fbb3f6d26a26403b4a4498a89411cdd96cab

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

@@ -235,15 +235,6 @@ var BlockModalController = ModalController.extend({
   },
   
   /****************************************************************************/
-
-  //set_editable: function()
-  //{
-  //  var that = this;
-  //  that.set_block_value_editable(that.block);        
-  //  $.each(that.block.children, function(i, b) {
-  //    that.set_block_value_editable(b);                         
-  //  });        
-  //},
   
   set_block_value_editable: function(b)
   {    
@@ -291,7 +282,7 @@ var BlockModalController = ModalController.extend({
       url: that.block_url(block) + '/remove-media',
       type: 'put',
       success: function(html) {
-        $('#the_modal img#block_' + block.id).attr('src','//placehold.it/150x150');
+        $('#the_modal img#block_' + block.id).attr('src','//d9hjv462jiw15.cloudfront.net/assets/blank.png').css('width','200px').css('height','120px');
         $('#the_modal div#block_' + block.id + ' p').html('Empty file.');
         $('#the_modal #block_' + block.id).parent().find('.caboose-btn').remove();
         that.parent_controller.render_blocks();
@@ -328,7 +319,7 @@ var BlockModalController = ModalController.extend({
       $('#the_modal #block_' + b.id).after(btn);
     }
 
-    if ( b.block_type && b.block_type.field_type == 'file' && b.rendered_value.indexOf('Empty file') < 0 ) {
+    if ( b.block_type && b.block_type.field_type == 'file' && b.rendered_value.indexOf('Click to select a file') < 0 ) {
       btn = $('<a href="#" class="caboose-btn">Remove</a>');
       btn.css('margin-bottom','10px').css('font-size','13px');
       btn.on('click', function(e) {

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

@@ -392,7 +392,6 @@ var BlockModalController = ModalController.extend({
     });
     if (bt.use_js_for_modal)    
       that.include_assets('caboose/block_modal_controllers/' + bt.name + '_modal_controller.js');
-    
     var h = {                      
       authenticity_token: that.authenticity_token,
       block_type_id: block_type_id

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

@@ -1,6 +1,6 @@
 @import url('https://fonts.googleapis.com/css?family=Roboto:300,300i');
 
-#block_sidebar {
+#cb_block_sidebar {
   position: fixed;
   top: 0;
   left: 0;
@@ -294,6 +294,9 @@ body > .container, body > .mm-page > .container {
       font-size: 14px;
       p {
         color: #1d1d1d;
+        font-family: 'Roboto';
+        font-weight: 300;
+        font-size: 14px;
       }
       &.dropzone {
         background: #dbeff7;

data/app/controllers/caboose/pages_controller.rb

@@ -584,7 +584,7 @@ module Caboose
           else
             p = parent_id ? Page.find(parent_id) : Page.index_page(@site.id)
           end
-          options = []
+          options = [{ 'value' => ' '      , 'text' => ' '     }]
           if p
             sitemap_helper(p, options)
      	    end

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

@@ -12,7 +12,7 @@ end
 
 if editing
   if url.nil? || url.starts_with?('http://placehold.it') || url.include?('missing')  
-    %><div id='block_<%= block.id %>'><p>Empty file: <%= block.name %></p></div><%
+    %><div id='block_<%= block.id %>'><p>Click to select a file.</p></div><%
   else
     %><div id='block_<%= block.id %>'><p><span><%= name %></span></p></div><%
   end

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

@@ -11,7 +11,6 @@
 <% end %>
 
 <% content_for :caboose_js do %>
-
 <%= javascript_include_tag 'jquery-ui' %>
 <%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
@@ -32,11 +31,11 @@ $(document).ready(function() {
   controller = new BlockContentController({
     page_id: <%= @page.id %>,
     assets_path: <%= raw Caboose.json(asset_path('loading.gif').gsub('loading.gif', '')) %>,
-  <% if @site && @site.use_dragdrop %>
-    included_assets: ['caboose/block_modal_controllers/block_dd_modal_controller.js']
-  <% else %>
-    included_assets: ['caboose/block_modal_controllers/block_modal_controller.js']
-  <% end %>
+    <% if @site && @site.use_dragdrop %>
+      included_assets: ['caboose/block_modal_controllers/block_dd_modal_controller.js']
+    <% else %>
+      included_assets: ['caboose/block_modal_controllers/block_modal_controller.js']
+    <% end %>
   });
 
   $('body').append($('<div/>')        
@@ -50,7 +49,7 @@ $(document).ready(function() {
 <% if @site && @site.use_dragdrop %>
   var html = "<%== (render :partial => 'caboose/pages/new_block_header').gsub( / *\n+/, '' ) %> ";
   $('body').append($('<div/>')
-    .attr('id', 'block_sidebar')
+    .attr('id', 'cb_block_sidebar')
     .append(html)
   );
   $("#new_blocks li.blocktype").draggable({ revert: true, helper: 'clone', appendTo: 'body', zIndex: 999999, scroll: false, start: function(event, ui) {

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

@@ -48,11 +48,11 @@ $(document).ready(function() {
 <% if @site && @site.use_dragdrop %>
   var html = "<%== (render :partial => 'caboose/pages/new_block_header').gsub( / *\n+/, '' ) %> ";
   $('body').append($('<div/>')
-    .attr('id', 'block_sidebar')
+    .attr('id', 'cb_block_sidebar')
     .append(html)
   );
   $("#new_blocks li.blocktype").draggable({ revert: true, helper: 'clone', appendTo: 'body', zIndex: 999999, scroll: false, start: function(event, ui) {
-    $(".line.ui-droppable").addClass('dropzone'); }, stop: function(event, ui) { $(".line.ui-droppable").removeClass('dropzone'); } });
+    $(".regular-dropper .line.ui-droppable").addClass('dropzone'); }, stop: function(event, ui) { $(".regular-dropper .line.ui-droppable").removeClass('dropzone'); } });
   $('body').addClass('icons');
   $('body').append($('<div/>').attr('id','caboose-loading').append( $('<div/>').addClass('table').append($('<div/>').addClass('table-cell').append('<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg id="loader" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="60px" height="60px" viewBox="0 0 128 128" xml:space="preserve"><g><path d="M64 0L40.08 21.9a10.98 10.98 0 0 0-5.05 8.75C34.37 44.85 64 60.63 64 60.63V0z" fill="#ffb118"/><path d="M128 64l-21.88-23.9a10.97 10.97 0 0 0-8.75-5.05C83.17 34.4 67.4 64 67.4 64H128z" fill="#80c141"/><path d="M63.7 69.73a110.97 110.97 0 0 1-5.04-20.54c-1.16-8.7.68-14.17.68-14.17h38.03s-4.3-.86-14.47 10.1c-3.06 3.3-19.2 24.58-19.2 24.58z" fill="#cadc28"/><path d="M64 128l23.9-21.88a10.97 10.97 0 0 0 5.05-8.75C93.6 83.17 64 67.4 64 67.4V128z" fill="#cf171f"/><path d="M58.27 63.7a110.97 110.97 0 0 1 20.54-5.04c8.7-1.16 14.17.68 14.17.68v38.03s.86-4.3-10.1-14.47c-3.3-3.06-24.58-19.2-24.58-19.2z" fill="#ec1b21"/><path d="M0 64l21.88 23.9a10.97 10.97 0 0 0 8.75 5.05C44.83 93.6 60.6 64 60.6 64H0z" fill="#018ed5"/><path d="M64.3 58.27a110.97 110.97 0 0 1 5.04 20.54c1.16 8.7-.68 14.17-.68 14.17H30.63s4.3.86 14.47-10.1c3.06-3.3 19.2-24.58 19.2-24.58z" fill="#00bbf2"/><path d="M69.73 64.34a111.02 111.02 0 0 1-20.55 5.05c-8.7 1.14-14.15-.7-14.15-.7V30.65s-.86 4.3 10.1 14.5c3.3 3.05 24.6 19.2 24.6 19.2z" fill="#f8f400"/><circle cx="64" cy="64" r="2.03"/><animateTransform attributeName="transform" type="rotate" from="0 64 64" to="-360 64 64" dur="2100ms" repeatCount="indefinite"></animateTransform></g></svg>').append('<h4>Loading...</h4>') )  ));
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.84'
+  VERSION = '0.9.85'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.84
+  version: 0.9.85
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg