caboose-cms 0.4.4 → 0.4.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODUzNTBkMWYxM2RiNTYzOTZjNGQ1Y2IwNDk2YjYwNTNhMDIzNzFiOQ==
+    ZDEyMWIwNTQ4MDhiNWEwZjQwMmVhMmYwNmRjOGQyOGJhZDQ2Y2VmZA==
   data.tar.gz: !binary |-
-    NDFkOGNiOTIzOGRjMmQ1NGNlMWMxNTYxZTk3Yzg0MjAwZGYwMjMzMA==
+    YWVlNzE1MDI5NTkzMGU3ZWZjYWU0ZTYyMDA5MWQ3ZjRjOGRjZDVkMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTYwMGMyZjI4N2YzNGI3MTNmYWM1M2Y1MjQ3NWRjOGQ5ZTZmNjVkNDFkN2Rm
-    YTYxOTYyNDA2MjZmODI0MjJlZDY3ZjgzZGQ4MTdkYjUyNTQ2OTM2ODQ0Mjdi
-    NWYxNmY5NTY0N2QxNTI3MTIyOGFlN2YyY2QyZTg0M2UwNzgzMDI=
+    NTU1MDYwN2MxZTU5ODM4MjlhYWE0MDZkYWZmZjE2YWU3ZjRhMWNjYTk0NGFl
+    NDU3NTg0NmVmZTkyYzVjZDM5ZDZiNGI0NTRmNzk3YjFiYmNhYTk3Mzg2ZTQ2
+    OGQxZTI3MjhlNjEwNjIyNjg0N2RlNmNkY2Y1MTg2NzlkMDk3ZGE=
   data.tar.gz: !binary |-
-    MTk3ZjU1MDM5NDQ1ZjE4ZGRhZGZjODczMzc4MWE3MGJiMGM1M2NkYTY0ZTAy
-    Y2YyMTYxNWE5N2MwYWIzY2JkNDdmMzEyY2YxMWQzZDMyNGFjNjY1YWQ4OWQ1
-    YWFjNDZkZTdkNTlhNjM4N2VjZjQyZTNmYjY4MmI1ZTVjZmI0NDc=
+    YWI0NjQxMDViYzY5MDljN2Y0MDI0NTEyZmFhZmJkYjg4MjM0YWJiNGQ0MTQ1
+    MzMxZDYxMTk3NGUxOTE5OTJmZTk2NTM1MTRhMmU2NmRjYjFiOGZkNTEwNGNi
+    YjEzZTIzZTQ4ZGM5NDNlM2NiMjBiOTMzOGJiYWMyOGFmZjhhMWU=

data/app/controllers/caboose/pages_controller.rb

@@ -248,8 +248,9 @@ module Caboose
 
       page.save
       
-      # Create the top level block for the page             
-      Block.create(:page_id => page.id, :block_type_id => params[:block_type_id])
+      # Create the top level block for the page
+      bt = BlockType.find(params[:block_type_id])
+      Block.create(:page_id => page.id, :block_type_id => params[:block_type_id], :name => bt.name)
       
       # Set the new page's permissions		  
       viewers = Caboose::PagePermission.where({ :page_id => parent.id, :action => 'view' }).pluck(:role_id)

data/app/models/caboose/block.rb

@@ -89,7 +89,7 @@ class Caboose::Block < ActiveRecord::Base
   end
                                             
   def render(block, options)    
-    #Caboose.log("block.render\nself.id = #{self.id}\nblock = #{block}\noptions.class = #{options.class}\noptions = #{options}")
+    #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}")
@@ -123,11 +123,12 @@ class Caboose::Block < ActiveRecord::Base
         #str = view.render(:partial => "caboose/blocks/#{block.name}", :locals => options2)
         str = view.render(:partial => "caboose/blocks/#{block.full_name}", :locals => options2)
       rescue
-        #begin
-        #  str = view.render(:partial => "caboose/blocks/#{block.block_type.name}", :locals => options2)
-        #rescue
+        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)
-        #end
+        end
       end        
     end
     return str

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

@@ -22,9 +22,9 @@ page = block.page
       <!--[if lt IE 7]>
         <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
       <![endif]-->      
-      <%= raw block.render('layout_basic_header' , local_assigns) %>
-      <%= raw block.render('layout_basic_content', local_assigns) %>
-      <%= raw block.render('layout_basic_footer' , local_assigns) %>      
+      <%= raw block.render('header' , local_assigns) %>
+      <%= raw block.render('content', local_assigns) %>
+      <%= raw block.render('footer' , local_assigns) %>      
     </div>
 <%= raw js %>
   </body>

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

@@ -22,12 +22,12 @@ page = block.page
       <!--[if lt IE 7]>
         <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
       <![endif]-->      
-      <%= raw block.render('layout_left_sidebar_header'  , local_assigns) %>
+      <%= raw block.render('header'  , local_assigns) %>
       <div class='sidebar_content_wrapper'>
-        <%= raw block.render('layout_left_sidebar_sidebar' , local_assigns) %>
-        <%= raw block.render('layout_left_sidebar_content' , local_assigns) %>
+        <%= raw block.render('sidebar' , local_assigns) %>
+        <%= raw block.render('content' , local_assigns) %>
       </div>
-      <%= raw block.render('layout_left_sidebar_footer'  , local_assigns) %>      
+      <%= raw block.render('footer'  , local_assigns) %>      
     </div>
 <%= raw js %>
   </body>

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

@@ -1,3 +1,3 @@
 <div class="sidebar" id='block_<%= block.id %>'>                                  
-  <p>Please edit /app/views/caboose/_layout_left_sidebar_sidebar.html.erb</p>
+  <p>Please edit /app/views/caboose/blocks/_layout_left_sidebar_sidebar.html.erb</p>
 </div>

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

@@ -22,12 +22,12 @@ page = block.page
       <!--[if lt IE 7]>
         <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
       <![endif]-->      
-      <%= raw block.render('layout_right_sidebar_header'  , local_assigns) %>
+      <%= raw block.render('header'  , local_assigns) %>
       <div class='sidebar_content_wrapper'>
-        <%= raw block.render('layout_right_sidebar_sidebar' , local_assigns) %>
-        <%= raw block.render('layout_right_sidebar_content' , local_assigns) %>
+        <%= raw block.render('sidebar' , local_assigns) %>
+        <%= raw block.render('content' , local_assigns) %>
       </div>
-      <%= raw block.render('layout_right_sidebar_footer'  , local_assigns) %>      
+      <%= raw block.render('footer'  , local_assigns) %>      
     </div>
 <%= raw js %>
   </body>

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

@@ -6,11 +6,12 @@
   color: #fff;
   background-image: url(/assets/caboose/caboose_logo_small.png);
   background-color: #000;  
-  background-repeat: no-repeat;  
-  padding: 14px 10px 14px 50px;
+  background-repeat: no-repeat;
+  background-position: 116px 0;  
+  padding: 16px 50px 14px 10px;
   position: absolute;
   top: 0px;
-  left: 0px;
+  right: 0px;
   z-index: 100;
 }
 .block_over { background: #fff799; }

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

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