lib/caboodle/app/views/layout.haml in caboodle-0.1.0 vs lib/caboodle/app/views/layout.haml in caboodle-0.1.1

@@ -1,10 +1,11 @@
 !!!
 %html{:dir => "ltr", :lang => "en-US", :xmlns => "http://www.w3.org/1999/xhtml"}
   %head{:profile => "http://gmpg.org/xfn/11"}
     %meta{:content => "text/html; charset=utf-8", "http-equiv" => "content-type"}/
     %meta{:content => "index,follow", :name => "robots"}/
+    = Caboodle::Site.meta
     
     %title= @title || Caboodle::Site.title
     %link{:href => "/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"}/
     
     - Caboodle::Stylesheets.each do |css|
@@ -16,51 +17,73 @@
     %script{:charset => "utf-8", :src => "/js/application.js", :type => "text/javascript"}
 
     - Caboodle::Javascripts.each do |js|
       %script{:charset => "utf-8", :src => js, :type => "text/javascript"}
 
-    / - content_for :javascripts do
-    /   
-    / 
-    /     = yield_content :some_key
+    = Caboodle::Site.head
     
-        
-  %body.sinatra.ruby
+  %body.caboodle.sinatra.ruby
+    = Caboodle::Site.before_page
     #page.hfeed
+      = Caboodle::Site.before_header
       %header#site-header
-        #logo
-          %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
-            %img{:src=>Caboodle::Site.logo_url, :width=>"64", :height=>"64"}
-        #site-title
-          %h1
+        = Caboodle::Site.above_header
+        - if Caboodle::Site.logo_url
+          #logo
             %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
-              = Caboodle::Site.title
-        #site-description
-          %h2= Caboodle::Site.description
-        #access
-          .skip-link
-            %a{:href => "#content", :title => "Skip navigation to the content"} Skip to content
-        %nav
-          %ul
-            %li
-              %a{:href=>"/"}
-                = Caboodle::Site.home_title
-            - Caboodle::MenuItems.each do |p|
+              %img{:src=>Caboodle::Site.logo_url, :width=>"64", :height=>"64"}
+        - if Caboodle::Site.title
+          #site-title
+            %h1
+              %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
+                = Caboodle::Site.title
+        - if Caboodle::Site.description
+          #site-description
+            %h2= Caboodle::Site.description
+        - if Caboodle::Site.has_access
+          #access
+            .skip-link
+              %a{:href => "#content", :title => "Skip navigation to the content"} Skip to content
+        
+        - if Caboodle::MenuItems.size > 0
+          = Caboodle::Site.before_nav
+          %nav
+            %ul
               %li
-                %a{:href=>p[:link]}
-                  = p[:display]
-                
+                %a{:href=>"/"}
+                  = Caboodle::Site.home_title
+              - Caboodle::MenuItems.each do |p|
+                %li
+                  %a{:href=>p[:link]}
+                    = p[:display]
+            
+        = Caboodle::Site.below_header
+      = Caboodle::Site.after_header
+      = Caboodle::Site.before_main
       %section#main
         - if @title
           %header#page_title
             %h1
               = @title
+        = Caboodle::Site.before_content
         %section#content
+          = Caboodle::Site.above_content
           = yield
+          = Caboodle::Site.below_content
+        = Caboodle::Site.after_content
+      = Caboodle::Site.after_main
+      = Caboodle::Site.before_footer
       %footer#footer
-        %p
-          \© 
-          = Caboodle::Site.author
-          |
-          Powered by 
-          %a{:href=>"http://github.com/steflewandowski/caboodle"}
-            Caboodle
+        = Caboodle::Site.above_footer
+        - if Caboodle::Site.has_footer
+          %p
+            \© 
+            = Caboodle::Site.author
+            - if Caboodle::Site.has_caboodle_link
+              |
+              Powered by 
+              %a{:href=>"http://github.com/steflewandowski/caboodle"}
+                Caboodle
+        = Caboodle::Site.below_footer     
+      = Caboodle::Site.after_footer
+    = Caboodle::Site.after_page
+  = Caboodle::Site.after_body
\ No newline at end of file