caboose-cms 0.4.51 → 0.4.52

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjdhZjM5NjQ5NTc1OTQzZmI4YzIxNDM4Mzg5YmZhY2Q4MTAxYzY5Mg==
+    YjFkNDIxYjhkZGIxNmQ5MTMxNjhkNWE4Y2E5YzU1ZjQ4OTIzOWRjZg==
   data.tar.gz: !binary |-
-    NzFmZDFjYzlhMmRmOTAzNWI0NjQzYWYxZTc1ZjNjMmU4YzkyYTZiZg==
+    MTA1MWI4N2QwYmI4NDVkODUzMDVjZjVlYTYwMWViNDNjNmY5NGVlMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWI3OTdlMTU1YzViOWVlYzRmNjcwM2NiODJkMTA5N2M3N2U0NDg4MDM4MmU3
-    YzI2ZWE1OTRjYzVhYzA3NjE4NTlkMjliODZjZTQ3MTMyNDE4MTg0NDFmN2Q3
-    ZTIxNzViOTNkMTRhZjA0NTJmZDk2MzUyYjdmMWEzODdmYmRkZTI=
+    NjM5N2RjZjI5MWQ0YzljYjlkMmYxMzYwNWYwZDVhZGM2NjJhNjk4MDQxNzQy
+    OWY5MTQ4ZjQzZjg5NjlhNzY3NzZmMTQ1NGU2MzE3NWQ5MWQyYWM3Y2RkZGM2
+    MGQ2OTkyNDE4MmI0YmE1NWUzYjViNzNmNzljYjAzY2Q1MmYxZGY=
   data.tar.gz: !binary |-
-    OGJjZWNiMjZhY2FjZWVhMmY2ZGFlYjlhNTk4MWY3NTg5NTczZjExMDM4MWU1
-    ZDVjNjUxYTY4ODJjNTM4OGFkNzM5MzRmOTM0Mzg3ZGJjMmFjOGNiNjBjZGQ0
-    MDljZTVmMjk4MGUwYjUzYzYxNzE3NTUyNjdlNjNlMDQ3NjJmNTk=
+    YTNlZWM3MTg3MmRlZDIyOTM0ZGExZjYzNWQyY2U0ZjBhNmZjZjM3MjRiOGI0
+    MjczMTJhODIzZDNlMjhlM2Y1YzMxYTNkMWEwZjFkODUzOGUzM2VhY2ZmOGZl
+    ZTY0NmY1NzlmZjUyMDkzMTc3NTg4NDZiZTBlNGU0YTRlOTI1YjY=

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

@@ -127,13 +127,13 @@ PageContentController.prototype = {
       success: function(blocks) {        
         $(blocks).each(function(i,b) {
           that.set_clickable_helper(b, false, false);
-        });                
+        });        
       }
     });    
   },
   
   set_clickable_helper: function(b, parent_id, parent_allows_child_blocks)
-  {    
+  {
     var that = this;
         
     $('#block_' + b.id)      
@@ -171,8 +171,25 @@ PageContentController.prototype = {
         if (b2.block_type_id = 34)
           show_mouseover = false;
         that.set_clickable_helper(b2, b.id, b.allow_child_blocks);
-      });
-    }    
+      });      
+    }
+    if (b.allow_child_blocks)
+    {
+      $('#block_' + b.id).after($('<div/>')          
+        .addClass('new_block_link')
+        .append($('<div/>').addClass('line'))
+        .append($('<a/>')
+          .attr('href', '#')
+          .html("New Block")
+          .click(function(e) { 
+            e.preventDefault(); e.stopPropagation();
+            caboose_modal_url('/admin/pages/' + that.page_id + '/blocks/' + b.id + '/new?after_id=' + b.id);                        
+          })
+        )
+        .mouseover(function(e) { $(this).addClass('new_block_link_over');    e.stopPropagation(); })
+        .mouseout(function(e)  { $(this).removeClass('new_block_link_over'); e.stopPropagation(); })
+      );
+    }
     if (show_mouseover)
     {
       $('#block_' + b.id).mouseover(function(el) { $('#block_' + b.id).addClass(   'block_over'); });

data/app/controllers/caboose/images_controller.rb

@@ -272,43 +272,35 @@ module Caboose
     #  #}                              
     #  
     #end
-         
+       
+    # GET /admin/images/sign-s3
     def admin_sign_s3
-      @document = Document.create(params[:doc])
       
-      policy = {"expiration" => 10.seconds.from_now.utc.xmlschema,
-        "conditions" =>  [
-          {"bucket" => 'cabooseit'},           
-          {"acl" => "public-read"},
-          {"success_action_status" => "200"}          
+      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]      
+      access_key = config['access_key_id']
+      secret_key = config['secret_access_key']
+      bucket     = config['bucket']
+      
+      policy = {
+        "expiration" => 10.seconds.from_now.utc.xmlschema,
+        "conditions" => [
+          { "bucket" => 'cabooseit' },           
+          { "acl" => "public-read" },
+          { "success_action_status" => "200" }          
         ]
       }
-      policy = Base64.encode64(policy.to_json).gsub(/\n/,'')
+      policy = Base64.encode64(policy.to_json).gsub(/\n/,'')      
+      signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret_key, policy)).gsub("\n","")
       
       render :json => {
         :policy => policy, 
-        :signature => s3_upload_signature, 
-        :key => @document.s3_key, 
-        :success_action_redirect => document_upload_success_document_url(@document)
-      }
-    end
-     
-    def s3_upload_policy_document      
-      ret = {"expiration" => 10.seconds.from_now.utc.xmlschema,
-        "conditions" =>  [
-          {"bucket" => 'cabooseit'},           
-          {"acl" => "public-read"},
-          {"success_action_status" => "200"}          
-        ]
+        :signature => signature, 
+        :key => 'media-images/test.jpg',
+        :success_action_status => '200'
+        #:success_action_redirect => document_upload_success_document_url(@document)
       }
-      return Base64.encode64(ret.to_json).gsub(/\n/,'')
-    end
-    
-    # sign our request by Base64 encoding the policy document.
-    def s3_upload_signature
-      signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), 
-        YOUR_SECRET_KEY, s3_upload_policy_document)).gsub("\n","")
-    end
+      
+    end        
 		
   end
 end

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

@@ -2,6 +2,6 @@
   <div class="content_body">    
     <% if editing %><div class='sortable'><% end %>        
     <% block.children.each do |b| %><%= raw block.render(b, local_assigns) %><% end %>
-    <% if editing %></div><% end %>        
+    <% if editing %></div><% end %>
   </div>
 </div>

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

@@ -43,11 +43,10 @@ end
       <% end %>
     <% end %>
   <% else %>
-    <p>This block doesn't have any content yet. 
-      <% if @block.block_type.allow_child_blocks %>
-        <a href='/admin/pages/<%= @block.page_id %>/blocks/<%= @block.id %>/new'>Add a child block!</a>
-      <% end %>
-    </p>
+    <p>This block doesn't have any content yet.</p>
+  <% end %>
+  <% if @block.block_type.allow_child_blocks %>
+    <a href='/admin/pages/<%= @block.page_id %>/blocks/<%= @block.id %>/new'>Add a child block!</a>
   <% end %>
 <% end %>
 <div id='message'></div>

data/app/views/caboose/images/admin_new.html.erb

@@ -49,7 +49,7 @@ $(document).ready(function() {
           //form.attr('action', pp.url);
         }
       });
-      data.submit();
+      //data.submit();
     },                
     progressall: function (e, data) { $('#bar').css('width', parseInt(data.loaded / data.total * 100, 10) + '%') },
     start: function (e) { $('#bar').css('background', 'green').css('display', 'block').css('width', '0%').text("Loading..."); },

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.51'
+  VERSION = '0.4.52'
 end

metadata

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