caboose-cms 0.4.9 → 0.4.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjBlNDA1YjA0NzA2NDcwNzVkYWQ5MTk4YTc2NWUwMzYwNTg5ZmRjMQ==
+    M2IxZWJkYTM0YWRiZjg3YjRkMGY1YzY0Y2Q3ZGQ1NzRjMzg1NWQ0ZA==
   data.tar.gz: !binary |-
-    ODhlMThhNThmODdhZWJkOWEzNDY5ZmE1MDFkOTNkYzU0ZWY2MmJmZA==
+    ZTQwNDc1OTNhZDM0MDc0Y2JhM2NjYjQzOTEzNDUxOThmOGI0NjQyMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTI0Y2UxYTRiMzVlMjAzMzJhMWY1NDRhZWFjM2RlZjk4ZWI2ODllZDgwMzNi
-    Y2M4YTljNjE4OGUwMjk4YTIwNTBlZTFjZGUxMjhhNGFlZGQ1ZmMzZTNlMTVh
-    ODdhMTIwZTdlOWI3NTJkYWMyN2IzMWFiZWE5NzdjYzE5NDFhYmI=
+    YzlkM2I4ZjZhY2FhZGZmOGRkNjdlMDgxNjBmYjA2MDc2NzE0YWQyYmExZTc5
+    MGVmN2M5MDA3OTU4OTAxM2RlYTBlNmRjMTBjOWNkYTY0ODViMTk5N2NiMDBh
+    NGZmZTdiZDlmYjA0MTViZWZhMmRhODAxYjQxOGY3NmM4ZjljOGY=
   data.tar.gz: !binary |-
-    N2I1MTRhMGMzZjM3NDVmOTcwN2I0NDEzZDRjZDJjZmQyMzEwMWUwNjg4NTMx
-    NTBjMDgyYTYzYzExYWQ3OWNhY2JiNmVjYmMxNGNjMzk4ZGU3ZTc4NGE4NjZk
-    MjE3YTUyZDU1ZWJjZGE1MTMzMWExOGViMzJmMDliN2I1OThlNDg=
+    YzY2NGY2YzkzMTVkMmExYWM0ODc0YjAzZjYwNmY4ODkxNTc0MjE0YTQ2YTYz
+    NTA5MWE0OTkzZDBiN2FjNjViZjU1YmRjZDc0ZTQ5OTc3OGY2YzcxYjhlMGZj
+    MmQ0M2Y0OWFkNmZhNWRmOTEzZmY0NzA3MjYzNTU5NzBlMmE4NjY=

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

@@ -1,16 +1,6 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
+// /app/assets/caboose/application.js
+// Caboose Javascript
 //
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require_tree ../../templates
 //= require jquery
 //= require jquery_ujs
 //= require colorbox-rails
@@ -18,4 +8,5 @@
 //= require caboose/jquery.placeholder
 //= require caboose/modal_integration
 //= require caboose/main
+//= require_tree ../../templates
 //= require application

data/app/controllers/caboose/pages_controller.rb

@@ -131,10 +131,10 @@ module Caboose
     def admin_edit_content
       return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
-      #if @page.top_level_blocks.nil? || @page.top_level_blocks.count == 0      
-      #  redirect_to '/admin/page/:id/layout'
-      #  return
-      #end
+      if @page.block.nil?      
+        redirect_to '/admin/page/:id/layout'
+        return
+      end
       @editing = true
     end
     

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

@@ -11,8 +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" />
-    <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAzhmPHU-MEhWXbpvAdZRjd0-ZmVy-KYA8&sensor=false"></script>
+    <meta name="viewport" content="width=device-width" /><% javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=AIzaSyAzhmPHU-MEhWXbpvAdZRjd0-ZmVy-KYA8&sensor=false" %>    
     <%= raw css %>
     <%= stylesheet_link_tag 'print', :media => 'print' %>
     <%= raw csrf_meta_tags %>
@@ -26,6 +25,9 @@ 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,7 +24,7 @@
 <% end %>
 
 <% content_for :caboose_js do %>
-<%= javascript_include_tag "caboose/admin" %>
+<%= 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

@@ -1,45 +1,46 @@
-<%
-
-#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
-#  })      
-
-%>
 
+<% if !@page.nil? && @page.title != 'Access Denied' %>
 <% 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 %>
-  <% @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 %>
+<%= javascript_include_tag "caboose/application" %>
+<script>window.loggedIn = <%= logged_in?.to_json %></script>
+<% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
+<% @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 %>
+  <%
+  b = @page.block
+  str = b.render(b, {
+    :controller_view_content => yield,
+    :modal => false,
+    :empty_text => '',
+    :editing => defined?(@editing) ? @editing : false,
+    :css => '|CABOOSE_CSS|',
+    :js => '|CABOOSE_JAVASCRIPT|',
+    :csrf_meta_tags => '|CABOOSE_CSRF|' 
+  })    
+  str.gsub!('|CABOOSE_CSS|'        , yield(:css))
+  str.gsub!('|CABOOSE_JAVASCRIPT|' , yield(:js))  
+  str.gsub!('|CABOOSE_CSRF|'       , csrf_meta_tags)
+  
+  %><%= raw str %><%
+    
+  #b = @page.block
+  #
+  #raw b.render(b, {
+  #    :controller_view_content => yield,
+  #    :modal => false,
+  #    :empty_text => '',
+  #    :editing => defined?(@editing) ? @editing : false,
+  #    :css => yield(:css),
+  #    :js => yield(:js),
+  #    :csrf_meta_tags => csrf_meta_tags
+  #  })      
 
-<%
-
-if !@page.nil? && @page.title != 'Access Denied' 
-  @page.top_level_blocks.each do |b|    
-    %><%= raw b.render(b, {
-      :controller_view_content => yield,
-      :modal => false,
-      :empty_text => '',
-      :editing => defined?(@editing) ? @editing : false,
-      :css => yield(:css),
-      :js => yield(:js),
-      :csrf_meta_tags => csrf_meta_tags
-    }) %><%
-  end
 end
-
 %>

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails