caboose-cms 0.4.11 → 0.4.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDRhNTg4YTc1YjEyMDViN2JlNDFlOWUxYjZmYzliN2I1ODY2ZGY3MQ==
+    MDc1NDJkNWFjZDc5MWU0M2U0MGRlMWQwZTQyZjJlOTYzMTdlZjM5NA==
   data.tar.gz: !binary |-
-    Y2E0MGRkNTcwYTQxMDZhMzY1Nzk4ZjUwOTUzOTQ2ZDAwNmQ1Nzc5YQ==
+    OTI4OTljZTEzMjFlNDdjYWQyMTc5YWNmMDUzNWQ5NTNjM2NjNDIzZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWM0MWMwN2ZjYWUwYjZkMjhhODY1NGFkZDQ0Mzc0NDdjZTgxNzhmMzFmMWQw
-    MGMxYzQ5MWVhODMxYjdhNGI5MmE5MjljMTc3Zjg1MjA3YzJiZTI1ZWVkYTll
-    ODEyNjZjOTVkZDkwYmIzNjJhZTM0MzBiNWUxMDUxNmE1NTQzZmI=
+    ODYzNDA5YTkwYTA1NzQzMGNkYWQzM2M0YThiNTNhYjk4Mzg4OTUyMWMwM2Jh
+    YTU3ZjdlNzYyMjVjMWYzMGE4NjMwMmQ1ODAzMmIwYjNhNDUxMTNkMzQ1YjUx
+    ODFlZWNlZTUyZjYzNjg5NTg0YzU4ZGUxYTE3ZTIyODUxNTcxNmE=
   data.tar.gz: !binary |-
-    NWMxNTY1ZDFlOWUxYjM4OTQ4ODQ4N2U5ZWYyN2ZhZDlkNDdiYzg3ZmQzNTBi
-    OWIzOTg3ODIzNWEyMzRiNzg5NGFkOWZjMDJmOWQ1ZmE0Njc0MzcxZDcxNDc1
-    MDQ0OGJkNTQ1MmM5ZTUwZmMyZTFiZWM2N2Y2ZDEyOTZhMTE5NjM=
+    ZmJiMjM2NmY2MDIxYjliN2Y2MjdlN2E0M2EzMGUxMzI0NDBiNDlkNmRjMTRi
+    YWM5YWI2NTFkNDhhMmUyZDk3MDFkNjVkMWM5YTdhMTk3NTBlNGFlZTE3NTgy
+    NDIwNmJlZWU4NTEyNWRiMGU3MzU2YTFlOTk3MTZkMDA0ZTVmZmM=

data/app/models/caboose/block.rb

@@ -92,7 +92,7 @@ class Caboose::Block < ActiveRecord::Base
     #Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\nblock.full_name = #{block.full_name}\noptions.class = #{options.class}\noptions = #{options}")
     
     if block && block.is_a?(String)
-      Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")
+      #Caboose.log("Block #{block} is a string, finding block object... self.id = #{self.id}")                                          
       b = self.child(block)        
       if b.nil?
         self.create_children
@@ -119,16 +119,22 @@ class Caboose::Block < ActiveRecord::Base
       str = block.render_from_function(options2)
     else
       view = ActionView::Base.new(ActionController::Base.view_paths)
-      begin
-        #str = view.render(:partial => "caboose/blocks/#{block.name}", :locals => options2)
+      begin        
         str = view.render(:partial => "caboose/blocks/#{block.full_name}", :locals => options2)
-      rescue
+      rescue ActionView::MissingTemplate
         begin
-          str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
-          #str = view.render(:partial => "caboose/blocks/#{block.name}", :locals => options2)
-        rescue
-          str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
+          str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)          
+        rescue ActionView::MissingTemplate
+          begin
+            str = view.render(:partial => "caboose/blocks/#{block.block_type.field_type}", :locals => options2)
+          rescue Exception => ex
+            Caboose.log(ex.message)
+          end
+        rescue Exception => ex
+          Caboose.log(ex.message)
         end
+      rescue Exception => ex
+        Caboose.log(ex.message)
       end        
     end
     return str

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

@@ -11,7 +11,7 @@ page = block.page
     <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
     <title><%= !page.title.nil? && page.title.strip.length > 0 ? "#{page.title} | " : "" %><%= Caboose::website_name %></title>
     <meta name="description" content="" />
-    <meta name="viewport" content="width=device-width" /><% javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=AIzaSyAzhmPHU-MEhWXbpvAdZRjd0-ZmVy-KYA8&sensor=false" %>    
+    <meta name="viewport" content="width=device-width" />        
     <%= raw css %>
     <%= stylesheet_link_tag 'print', :media => 'print' %>
     <%= raw csrf_meta_tags %>
@@ -25,9 +25,6 @@ page = block.page
       <%= raw block.render('content', local_assigns) %>
       <%= raw block.render('footer' , local_assigns) %>      
     </div>
-<% content_for :js do %>
-<script type='text/javascript' src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAzhmPHU-MEhWXbpvAdZRjd0-ZmVy-KYA8&sensor=false" /></script>
-<% end %>
 <%= raw js %>
   </body>
 </html>

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

@@ -24,8 +24,10 @@
 <% end %>
 
 <% content_for :caboose_js do %>
-<%= javascript_include_tag "jquery.ui.all" %>
-<%= javascript_include_tag "caboose/model/all" %>
+<%
+#= javascript_include_tag "jquery.ui.all" 
+#= javascript_include_tag "caboose/model/all" 
+%>
 <%= javascript_include_tag 'caboose/admin_page_edit_content' %>
 <script type='text/javascript'>
 

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

@@ -7,12 +7,12 @@
 <% @page.linked_resources_map[:js].each do |r| %><%= javascript_include_tag r %><% end %>
 <%= yield :caboose_js %>
 <% end %>  
-  <% 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 %>
-    <%= yield :caboose_css %>
-  <% end %>
+<% 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 %>
+<%= yield :caboose_css %>
+<% end %>
   <%
   b = @page.block
   str = b.render(b, {

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.11'
+  VERSION = '0.4.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - William Barry
@@ -236,6 +236,7 @@ files:
 - app/assets/stylesheets/caboose/modal.css
 - app/assets/stylesheets/caboose/model_binder.css
 - app/assets/stylesheets/caboose/page_bar_generator.css
+- app/assets/stylesheets/caboose/print.css
 - app/assets/stylesheets/caboose/register.css
 - app/assets/stylesheets/caboose/station_modal.css
 - app/assets/stylesheets/caboose/station_sidebar.css