caboose-cms 0.4.88 → 0.4.89

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzlhOGJkZDk3MWJkYTE1MjIxMjQzYWZjZmNlOTg1YWM0ZjFmNTUxOQ==
+    MjNiMTkxYzhhODU2NWVlMWFhZjIyZjhkYWNmMDNhYmRkZDE3NjY0MA==
   data.tar.gz: !binary |-
-    ZDBiMjdkMzFlYWZjOTk1MmNiMTE5MjFkYjYxNmMxYzQ4MWJmZDU1Mw==
+    ZjdiYjI3MDBlOTkwNWE2YWIzOTIzYTdjNjJkNGJjNGUxZGU5ODdkYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTIxYjU0ZjA1ZmE2Y2JhMWY4MzQxZWM1ZTRkMTRhMjFlYzdhOWIzZjM2MjZi
-    ZjYxMmM2N2Y1NTg3NWNiNDgyMjI5NGU0NDQ0ZjRiNjIzMmU5ZGEzYWE2NWRh
-    MWU0NjUwYjI3MjE3ZjU3MTY0NmNkYzMwNjFiMDcyOTc2N2UyMzU=
+    YjViOGZhMjdkNTdlMGJlZWM0MWYwNmY2MmIzMmI5YzI0YTJhODEwYjUyZmQ1
+    ZTU5OWZmZmIzMzFjMDIxMjQwZTU3MmFlNTYxMGEyZjU2ZWRiZjUyYTg5OTI3
+    NzBkYWNhZTJmMmVlYzVjN2M4NzEyZjFmNTU1ZjllZTVlMTExMTI=
   data.tar.gz: !binary |-
-    ZjhkNzU5ZWY0NWQwNDU0NTgxMTkzZWIyNWRlNTE0MTIzN2ExNjM3NTk5YmQ4
-    ZWU5MzJkMjA5OGQ5NDgzZjhkNjIyMjdkOGRmNjAzNGI4MGMyMjA4N2IyZTVh
-    NTI0NzU5YjM0ZmQ0YjNkMjgyNWE3ZmJhYzYyMTg1NmEwOGI2NmY=
+    YmNkZGNlOTAxNzVhMjk0ODliZTlmNjE5ODA2MDhhZDM5MWY0ZjNlMWFhNjkw
+    M2IzYWM4ZWVhMDBiZWEzNmNjYWVlYTQ5OTBjMzlkZDI5MzI3NjFhMTQ1OGY4
+    MDE2MDdlYmU2NTBkMzk3NTAyY2NlMjFmNjFlZTExNWQ3NDMyNjg=

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

@@ -21,7 +21,8 @@ end
 
 <% if @block.block_type.use_render_function_for_layout %>
   <!-- Start -->
-  <%= raw @block.render(@block, {
+  <%
+  str = @block.render(@block, {
     :modal => true,
     :empty_text => '[Empty, click to edit]',
     :editing => true,    
@@ -33,7 +34,11 @@ end
     :csrf_meta_tags2 => '|CABOOSE_CSRF|',    
     :logged_in_user => @logged_in_user,
     :site => @site
-  }) %>
+  })
+  str.gsub!('|CABOOSE_CSS|'        , yield(:css))
+  str.gsub!('|CABOOSE_JAVASCRIPT|' , yield(:js))  
+  str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)
+  %><%= raw str %>
   <!-- Stop -->
 <% elsif @block.block_type.field_type != 'block' %>
   <p><div id='block_<%= @block.id %>_value'></div></p>
@@ -43,7 +48,8 @@ end
       <% if b.block_type.field_type != 'block' && b.block_type.field_type != 'richtext' %>
         <p><div id='block_<%= b.id %>_value'></div></p>
       <% else %>
-        <%= raw @block.render(b, {
+        <%
+        str = @block.render(b, {
           :modal => true,
           :empty_text => '[Empty, click to edit]',
           :editing => true,
@@ -55,7 +61,11 @@ end
           :csrf_meta_tags2 => '|CABOOSE_CSRF|',    
           :logged_in_user => @logged_in_user,
           :site => @site
-        }) %>
+        })
+        str.gsub!('|CABOOSE_CSS|'        , yield(:css))
+        str.gsub!('|CABOOSE_JAVASCRIPT|' , yield(:js))  
+        str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)
+        %><%= raw str %>
       <% end %>
     <% end %>
   <% else %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.88'
+  VERSION = '0.4.89'
 end

metadata

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