caboose-cms 0.4.8 → 0.4.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWRkMDE4MzQwODc3N2YyMTQ5ZmY4Mzc3MjkyNjFjNzJlYjBmNDBhNA==
+    ZjBlNDA1YjA0NzA2NDcwNzVkYWQ5MTk4YTc2NWUwMzYwNTg5ZmRjMQ==
   data.tar.gz: !binary |-
-    MWRmMzJmNjEyNjdkZGNjNDM0MTAwNzFjZWVhZGUwNmU2MzRlMmNiMA==
+    ODhlMThhNThmODdhZWJkOWEzNDY5ZmE1MDFkOTNkYzU0ZWY2MmJmZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzhhNGFlMmU1NDE1NzFmZjNhMDMwNGIwZjk0ZjA5MDQzM2ZmMDEyY2QzOTdj
-    MTg2ZmIyOWFjZTkxNjgxNGFiN2UwMTBjMjQ4OWQ4OTNiNjE0YmQ2ZDI0ZDM2
-    MDIxY2Q1Yjg3YmI4YTQxYmYxYzM0MGQ4N2JlYmViN2M1YmYyODI=
+    YTI0Y2UxYTRiMzVlMjAzMzJhMWY1NDRhZWFjM2RlZjk4ZWI2ODllZDgwMzNi
+    Y2M4YTljNjE4OGUwMjk4YTIwNTBlZTFjZGUxMjhhNGFlZGQ1ZmMzZTNlMTVh
+    ODdhMTIwZTdlOWI3NTJkYWMyN2IzMWFiZWE5NzdjYzE5NDFhYmI=
   data.tar.gz: !binary |-
-    NGMyODJlYWI0YjZlODkzYThkNjFkZGJiYjZlMTQ5NmM0NzFjN2EyN2JjNDI1
-    ZjQzM2JhODQ4ZjU1MGI1ODU0MzE2NGI3NmE0ZjMwOWUzYTFjODJjYWVhZTI2
-    NmY4ZDBlNWJiZjg3NDNhNGZhZDI2MWViMDkyOTJiODUyNmI0NDM=
+    N2I1MTRhMGMzZjM3NDVmOTcwN2I0NDEzZDRjZDJjZmQyMzEwMWUwNjg4NTMx
+    NTBjMDgyYTYzYzExYWQ3OWNhY2JiNmVjYmMxNGNjMzk4ZGU3ZTc4NGE4NjZk
+    MjE3YTUyZDU1ZWJjZGE1MTMzMWExOGViMzJmMDliN2I1OThlNDg=

data/app/models/caboose/schema.rb

@@ -337,15 +337,17 @@ class Caboose::Schema < Caboose::Utilities::Schema
     end
     
     if !Caboose::BlockType.where(:name => 'heading').exists?   
-      bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading')
+      bt = Caboose::BlockType.create(:name => 'heading', :description => 'Heading', :field_type => 'block')
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :fixed_placeholder => false)
       Caboose::BlockType.create(:parent_id => bt.id, :name => 'size', :description => 'Size', :field_type => 'text', :default =>  1, :width => 800, :fixed_placeholder => false, :options => "1|2|3|4|5|6")
     end
     
-    if !Caboose::BlockType.where(:name => 'richtext').exists?
-      bt = Caboose::BlockType.create(:name => 'richtext', :description => 'Rich Text')
-      Caboose::BlockType.create(:parent_id => bt.id, :name => 'text', :field_type => 'richtext', :description => 'Text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
+    if !Caboose::BlockType.where(:name => 'text').exists?
+      Caboose::BlockType.create(:name => 'text', :description => 'Text', :field_type => 'text', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
     end
-    
+    if !Caboose::BlockType.where(:name => 'richtext').exists?      
+      Caboose::BlockType.create(:name => 'richtext', :description => 'Text', :field_type => 'richtext', :default => '', :width => 800, :height => 400, :fixed_placeholder => false)      
+    end
+            
   end
 end

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

@@ -1,4 +1,7 @@
 <%
+Caboose.log(@block.block_type.field_type)
+
+  
 update_on_close = false
 @block.block_type.children.each do |bt|
   update_on_close = true if bt.field_type == 'image' || bt.field_type == 'file'
@@ -91,7 +94,7 @@ $(document).ready(function() {
   controller = new BlockController({
     block: <%= raw Caboose.json(@block.js_hash) %>,    
     authenticity_token: '<%= form_authenticity_token %>'    
-  });                  
+  });    
 });    
 
 </script>

data/app/views/layouts/caboose/application.html.erb

@@ -1,5 +1,17 @@
+<%
+
+#if !@page.nil? && @page.title != 'Access Denied'
+#
+#  str = @page.block.render(@page.block, {
+#    :controller_view_content => yield,
+#    :modal => false,
+#    :empty_text => '',
+#    :editing => defined?(@editing) ? @editing : false
+#  })      
 
-<%= content_for :js do %>
+%>
+
+<% content_for :js do %>
   <%= javascript_include_tag "caboose/application" %>
   <script>window.loggedIn = <%= logged_in?.to_json %></script>
   <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
@@ -7,7 +19,7 @@
   <%= yield :caboose_js %>
 <% end %>
 
-<%= content_for :css do %>
+<% content_for :css do %>
   <%= stylesheet_link_tag('caboose/application') %>
   <% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
   <% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
@@ -16,21 +28,6 @@
 
 <%
 
-#if yield && yield.strip.length > 0 
-#  %><%= yield %><%
-#elsif !@page.nil? && @page.title != 'Access Denied' 
-#  @page.top_level_blocks.each do |b|    
-#    %><%= raw b.render(b, {
-#      :modal => false,
-#      :empty_text => '',
-#      :editing => defined?(@editing) ? @editing : false,
-#      :css => yield(:css),
-#      :js => yield(:js),
-#      :csrf_meta_tags => csrf_meta_tags
-#    }) %><%
-#  end
-#end
-
 if !@page.nil? && @page.title != 'Access Denied' 
   @page.top_level_blocks.each do |b|    
     %><%= raw b.render(b, {

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.8'
+  VERSION = '0.4.9'
 end

metadata

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