caboose-cms 0.9.60 → 0.9.61

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

@@ -219,7 +219,7 @@ body > .container, body > .mm-page > .container {
   }
 }
 
-.block_over { background: #e3e3e3; }
+// .block_over { background: #e3e3e3; }
 .select_handle    { display: none; }
 // .move_up_handle   { display: none; }
 // .move_down_handle { display: none; }
@@ -239,6 +239,18 @@ body > .container, body > .mm-page > .container {
 .block_over > .delete_handle    span { position: absolute; top: 0; right:  0px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 .block_over > .duplicate_handle    span { position: absolute; top: 0; right:  36px; width: 18px; height: 18px; background-color: #fff; border: #ccc 1px solid; }
 
+.flex-grid-unit.block_over > .delete_handle span { top: -10px; right: auto; left: 26px; background-color: #f1e9e9; }
+.flex-grid-unit.block_over > .duplicate_handle span { top: -10px; right: auto; left: -10px; background-color: #f1e9e9; }
+.flex-grid-unit.block_over > .select_handle span { top: -10px; right: auto; left: 8px; background-color: #f1e9e9; }
+.flex-grid-unit.block_over > .drag_handle span { display: none; }
+
+.unslider-block-wrapper > .delete_handle,
+.unslider-block-wrapper > .drag_handle,
+.unslider-block-wrapper > .select_handle,
+.unslider-block-wrapper > .duplicate_handle {
+  z-index: 20;
+}
+
 .selected { background: #fff799 !important;
   img {
     opacity: 0.6;

data/app/controllers/caboose/blocks_controller.rb

@@ -395,6 +395,7 @@ module Caboose
       #resp.block = b
       resp.success = true
       resp.new_id = b.id
+      resp.parent_id = b.parent_id
       resp.redirect = params[:page_id] ? "/admin/pages/#{b.page_id}/blocks/#{b.id}" : "/admin/posts/#{b.post_id}/blocks/#{b.id}"              
       render :json => resp
     end
@@ -541,8 +542,32 @@ module Caboose
       return unless user_is_allowed('pages', 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
-      b.duplicate_block(@site.id, params[:page_id], params[:post_id], b.block_type_id, b.parent_id)
-      resp.success = true
+      resp.new_id = b.duplicate_block(@site.id, params[:page_id], params[:post_id], b.block_type_id, b.parent_id)
+      render :json => resp
+    end
+
+    # @route GET /admin/pages/:page_id/blocks/:id/api-info
+    # @route GET /admin/posts/:post_id/blocks/:id/api-info
+    def admin_block_info
+      return unless user_is_allowed('pages', 'edit')
+      resp = StdClass.new
+      b = Block.find(params[:id])
+      bt = b.block_type if b
+      resp.block_name = b.name
+      resp.bt_name = bt.name
+      resp.use_js_for_modal = bt.use_js_for_modal
+      resp.field_type = bt.field_type
+      render :json => resp
+    end
+
+    # @route GET /admin/pages/:page_id/blocks/:id/parent-block
+    # @route GET /admin/posts/:post_id/blocks/:id/parent-block
+    def admin_parent_block
+      return unless user_is_allowed('pages', 'edit')
+      resp = StdClass.new
+      b = Block.find(params[:id])
+      resp.parent_id = b.parent_id if b && b.parent && b.parent.name.blank?
+      resp.grandparent_id = b.parent.parent_id if b && b.parent && b.parent.parent && b.parent.parent.name.blank?
       render :json => resp
     end
 

data/app/models/caboose/block.rb

@@ -645,7 +645,7 @@ class Caboose::Block < ActiveRecord::Base
         b2.duplicate_block(site_id, page_id, post_id, b2.block_type_id, b.id)
       end
     end
-    return true
+    return b.id
   end
   
   def modal_js_block_names

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

@@ -1,7 +1,3 @@
-<%
-# app/views/caboose/pages/admin_edit_content.html.erb
-%>
-
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'jquery-ui' %>
 <%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
@@ -20,14 +16,15 @@
 <%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
 <%= javascript_include_tag "caboose/clipboard" %>
+<%= javascript_include_tag "caboose/class" %>
+<%= javascript_include_tag "caboose/modal_controller" %>
 <% if @site && @site.use_dragdrop %>
 <%= javascript_include_tag 'caboose/block_content_controller_dragdrop' %>
+<%= javascript_include_tag "caboose/block_modal_controllers/block_dd_modal_controller" %>
 <% else %>
 <%= javascript_include_tag 'caboose/block_content_controller' %>
-<% end %>
-<%= javascript_include_tag "caboose/class" %>
-<%= javascript_include_tag "caboose/modal_controller" %>
 <%= javascript_include_tag "caboose/block_modal_controllers/block_modal_controller" %>
+<% end %>
 <script type='text/javascript'>
 
 var controller = false;
@@ -35,14 +32,17 @@ $(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 %>
   });
 
   $('body').append($('<div/>')        
     .attr('id', 'tiny_header')
     .append($('<a/>').attr('href', '/admin/pages').html("< Back"))
     .append($('<a/>').attr('href', '#').html('Custom Fields').click(function(e) { e.preventDefault(); caboose_modal_url('/admin/pages/<%= @page.id %>/custom-fields'); }))
-   // .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>/layout').html("Layout"))
     .append($('<a/>').attr('href', '/admin/pages/<%= @page.id %>').html("Page Settings"))
     .append($('<a/>').attr('href', '/<%= @page.uri %>').attr('target','_blank').text("View Page"))  
   );

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

@@ -1,7 +1,3 @@
-<%
-# app/views/caboose/posts/admin_edit_content.html.erb
-%>
-
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'jquery-ui' %>
 <%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
@@ -19,14 +15,15 @@
 <%= javascript_include_tag 'caboose/model/all' %>
 <%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
 <%= javascript_include_tag "caboose/clipboard" %>
+<%= javascript_include_tag "caboose/class" %>
+<%= javascript_include_tag "caboose/modal_controller" %>
 <% if @site && @site.use_dragdrop %>
 <%= javascript_include_tag 'caboose/block_content_controller_dragdrop' %>
+<%= javascript_include_tag "caboose/block_modal_controllers/block_dd_modal_controller" %>
 <% else %>
 <%= javascript_include_tag 'caboose/block_content_controller' %>
-<% end %>
-<%= javascript_include_tag "caboose/class" %>
-<%= javascript_include_tag "caboose/modal_controller" %>
 <%= javascript_include_tag "caboose/block_modal_controllers/block_modal_controller" %>
+<% end %>
 <script type='text/javascript'>
 
 var controller = false;
@@ -34,7 +31,11 @@ $(document).ready(function() {
   controller = new BlockContentController({
     post_id: <%= @post.id %>,
     assets_path: <%= raw Caboose.json(asset_path('loading.gif').gsub('loading.gif', '')) %>,
-    included_assets: ['caboose/block_modal_controllers/block_modal_controller.js']
+    <% 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/>')        

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.60'
+  VERSION = '0.9.61'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.60
+  version: 0.9.61
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -542,6 +542,7 @@ files:
 - app/assets/javascripts/caboose/block_content_controller.js
 - app/assets/javascripts/caboose/block_content_controller_dragdrop.js
 - app/assets/javascripts/caboose/block_media_controller.js
+- app/assets/javascripts/caboose/block_modal_controllers/block_dd_modal_controller.js
 - 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/media_modal_controller.js