caboose-cms 0.9.79 → 0.9.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f3eaff5231a8427c3a7aded0962b8235f691469
-  data.tar.gz: 236c9aa46e964d9bebda96b2a327dfb82a3a0504
+  metadata.gz: 77db39e6da1711c696ce60c146e98c421f3c4b95
+  data.tar.gz: e5c1d403697d8247bf95451bb9cf3a4b01f93b47
 SHA512:
-  metadata.gz: 4d41728c2a73aacfc41bc3bc003be46dcf39162a3500afd6452173283bcd58331fc420856903edf62ada192fa8e58f60f336095f28d4ca0ee3a93d2f0f5bdfe9
-  data.tar.gz: 4cad9ad3fd7c2dba703f19160aef157fb785d7fd9c570c34e87b6d57d463b62b2b3f70d4496238e106ade965fc4764104a100e9b31cb5aae3e489cac023c9604
+  metadata.gz: 340b5403884ed7f802d6611400e9a2201e7b0aad62606f77c4f69542c261d8a8d674ab9fb667047982d52dd85957060301e4a1b729b6495ed6d2b9ca389d0e09
+  data.tar.gz: d5a4e1582466182eb78380154a61576da2f8fa93ec960a3d44e9d15491064deb2c128181565830b595bfab548532ae0b3d40f87fe8db4a863e32b293bc4bf1f5

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

@@ -283,6 +283,23 @@ var BlockModalController = ModalController.extend({
       attributes: [h]            
     });
   },
+
+  remove_media: function(block) {
+    var that = this;
+
+    $.ajax({          
+      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 div#block_' + block.id + ' p').html('Empty file.');
+        $('#the_modal #block_' + block.id).parent().find('.caboose-btn').remove();
+        that.parent_controller.render_blocks();
+        that.autosize();
+      },            
+    });
+
+  },
   
   set_clickable: function(b)
   {        
@@ -299,7 +316,28 @@ var BlockModalController = ModalController.extend({
     $('#the_modal #block_' + b.id).click(function(e) {      
       e.stopPropagation();
       that.parent_controller.edit_block(b.id); 
-    });     
+    });
+
+    if ( b.block_type && b.block_type.field_type == 'image' && b.rendered_value.indexOf('placehold') < 0 ) {
+      btn = $('<a href="#" class="caboose-btn">Remove</a>');
+      btn.css('position','relative').css('left','10px').css('bottom','10px').css('font-size','13px');
+      btn.on('click', function(e) {
+        e.preventDefault();
+        that.remove_media(b);
+      });
+      $('#the_modal #block_' + b.id).after(btn);
+    }
+
+    if ( b.block_type && b.block_type.field_type == 'file' && b.rendered_value.indexOf('Empty file') < 0 ) {
+      btn = $('<a href="#" class="caboose-btn">Remove</a>');
+      btn.css('margin-bottom','10px').css('font-size','13px');
+      btn.on('click', function(e) {
+        e.preventDefault();
+        that.remove_media(b);
+      });
+      $('#the_modal #block_' + b.id).after(btn);
+    }
+
     // var show_mouseover = true;
     // if (b.children && b.children.length > 0)
     // {

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

@@ -308,12 +308,12 @@ var BlockModalController = ModalController.extend({
           show_mouseover = false;
         that.set_clickable(b2);
       });
-    }    
-    if (false && show_mouseover)
-    {
-      $('#the_modal #block_' + b.id).mouseover(function(el) { $('#the_modal #block_' + b.id).addClass(   'block_over'); });
-      $('#the_modal #block_' + b.id).mouseout(function(el)  { $('#the_modal #block_' + b.id).removeClass('block_over'); }); 
-    }    
+    }
+    // if (false && show_mouseover)
+    // {
+    //   $('#the_modal #block_' + b.id).mouseover(function(el) { $('#the_modal #block_' + b.id).addClass(   'block_over'); });
+    //   $('#the_modal #block_' + b.id).mouseout(function(el)  { $('#the_modal #block_' + b.id).removeClass('block_over'); }); 
+    // }    
   },
 
   /*****************************************************************************

data/app/controllers/caboose/blocks_controller.rb

@@ -158,7 +158,18 @@ module Caboose
         }
       end
       return arr
-    end      
+    end     
+
+    # @route PUT /admin/pages/:page_id/blocks/:id/remove-media
+    # @route PUT /admin/posts/:post_id/blocks/:id/remove-media
+    def admin_remove_media
+      return unless user_is_allowed('pages', 'edit')
+      resp = Caboose::StdClass.new   
+      b = Block.find(params[:id])      
+      b.media = nil
+      resp.success = b.save
+      render :json => resp      
+    end 
       
     # @route GET /admin/pages/:page_id/blocks/:id/render
     # @route GET /admin/posts/:post_id/blocks/:id/render

data/app/models/caboose/core_plugin.rb

@@ -7,22 +7,22 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     nav << { 'id' => 'my-account'   , 'text' => 'My Account' , 'href' => '/my-account' , 'modal' => true }
     
     item = { 'id' => 'core', 'text' => 'Settings', 'children' => [] }                        
-    item['children'] << { 'id' => 'blocktypes'        , 'text' => 'AB Test Variants'    , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'        , 'view')    
-    item['children'] << { 'id' => 'blocktypes'        , 'text' => 'Block Types'         , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'        , 'view') if site.is_master == true
-    item['children'] << { 'id' => 'fonts'             , 'text' => 'Fonts'               , 'href' => '/admin/fonts'              , 'modal' => false } if user.is_allowed('fonts'             , 'view') if site.use_fonts == true
+ #   item['children'] << { 'id' => 'blocktypes'        , 'text' => 'AB Test Variants'    , 'href' => '/admin/ab-variants'        , 'modal' => false } if user.is_allowed('abvariants'        , 'view')    
+    item['children'] << { 'id' => 'blocktypes'        , 'text' => 'Block Types'         , 'href' => '/admin/block-types'        , 'modal' => false } if user.is_allowed('blocktypes'        , 'view') && site.is_master == true
+    item['children'] << { 'id' => 'fonts'             , 'text' => 'Fonts'               , 'href' => '/admin/fonts'              , 'modal' => false } if user.is_allowed('fonts'             , 'view') && site.use_fonts == true
     item['children'] << { 'id' => 'redirects'         , 'text' => 'Permanent Redirects' , 'href' => '/admin/redirects'          , 'modal' => false } if user.is_allowed('redirects'         , 'view')
     item['children'] << { 'id' => 'permissions'       , 'text' => 'Permissions'         , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'       , 'view')
     item['children'] << { 'id' => 'pagecustomfields'  , 'text' => 'Page Custom Fields'  , 'href' => '/admin/page-custom-fields' , 'modal' => false } if user.is_allowed('pagecustomfields'  , 'view')
     item['children'] << { 'id' => 'post_categories'   , 'text' => 'Post Categories'     , 'href' => '/admin/post-categories'    , 'modal' => false } if user.is_allowed('post_categories'   , 'view')
     item['children'] << { 'id' => 'postcustomfields'  , 'text' => 'Post Custom Fields'  , 'href' => '/admin/post-custom-fields' , 'modal' => false } if user.is_allowed('postcustomfields'  , 'view')
     item['children'] << { 'id' => 'roles'             , 'text' => 'Roles'               , 'href' => '/admin/roles'              , 'modal' => false } if user.is_allowed('roles'             , 'view')
-    item['children'] << { 'id' => 'sites'             , 'text' => 'Sites'               , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'             , 'view') if site.is_master == true        
+    item['children'] << { 'id' => 'sites'             , 'text' => 'Sites'               , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'             , 'view') && site.is_master == true        
     item['children'] << { 'id' => 'smtp'              , 'text' => 'SMTP (Mail)'         , 'href' => '/admin/smtp'               , 'modal' => false } if user.is_allowed('smtp'              , 'view')
     item['children'] << { 'id' => 'social'            , 'text' => 'Social Media'        , 'href' => '/admin/social'             , 'modal' => false } if user.is_allowed('social'            , 'view')
-    item['children'] << { 'id' => 'store'             , 'text' => 'Store'               , 'href' => '/admin/store'              , 'modal' => false } if user.is_allowed('store'             , 'view') if site.use_store == true
+    item['children'] << { 'id' => 'store'             , 'text' => 'Store'               , 'href' => '/admin/store'              , 'modal' => false } if user.is_allowed('store'             , 'view') && site.use_store == true
     item['children'] << { 'id' => 'users'             , 'text' => 'Users'               , 'href' => '/admin/users'              , 'modal' => false } if user.is_allowed('users'             , 'view')    
-    item['children'] << { 'id' => 'subscriptions'     , 'text' => 'Subscriptions'       , 'href' => '/admin/subscriptions'      , 'modal' => false } if user.is_allowed('subscriptions'     , 'view')
-    item['children'] << { 'id' => 'variables'         , 'text' => 'Variables'           , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'          , 'view')    
+    item['children'] << { 'id' => 'subscriptions'     , 'text' => 'Subscriptions'       , 'href' => '/admin/subscriptions'      , 'modal' => false } if user.is_allowed('subscriptions'     , 'view') && site.use_store == true
+   # item['children'] << { 'id' => 'variables'         , 'text' => 'Variables'           , 'href' => '/admin/settings'           , 'modal' => false } if user.is_allowed('settings'          , 'view')    
     nav << item if item['children'].count > 0
     
     item = { 'id' => 'content', 'text' => 'Content', 'children' => [] }    

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.79'
+  VERSION = '0.9.80'
 end

metadata

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