layout.haml in caboodle-0.1.5

- old
+ new

@@ -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"}/
+    %meta{:content => "Caboodle", :name => "generator"}/
     
     = meta
     
     %title= title
     %link{:href => "/stylesheets/screen.css", :rel => "stylesheet", :type => "text/css"}/
@@ -18,12 +19,17 @@
     %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"}
 
+    - Caboodle::RSS.each do |rss|
+      %link{:href => rss, :rel => "alternate", :type => "application/rss+xml"}/
+    
     = head
     
+    = root
+    
   %body.caboodle
     = before_page
     #page.hfeed
       = before_header
       %header#site-header
@@ -35,29 +41,32 @@
         - if Caboodle::Site.title
           #site-title
             %h1
               %a{:href => "/", :rel => "home", :title => Caboodle::Site.title }
                 = Caboodle::Site.title
-        - if description
+        - if Caboodle::Site.description
           #site-description
             %h2= Caboodle::Site.description
         #access
           .skip-link
             %a{:href => "#content", :title => "Skip navigation to the content"} Skip to content
         
         - if Caboodle::MenuItems.size > 0
           = before_nav
           %nav
+            = above_nav
             %ul
-              %li
-                %a{:href=>"/"}
-                  = Caboodle::Site.home_title
               - Caboodle::MenuItems.each do |p|
                 %li
+                  = above_nav_item
                   %a{:href=>p[:link]}
+                    = above_nav_item_title
                     = p[:display]
-            
+                    = below_nav_item_title
+                  = below_nav_item
+            = below_nav
+          = after_nav
         = below_header
       = after_header
       = before_main
       %section#main
         - if @title
@@ -68,9 +77,16 @@
         %section#content
           = above_content
           = yield
           = below_content
         = after_content
+        - if credit
+          = before_credit
+          %section#credit
+            = above_credit
+            = credit
+            = below_credit
+          = after_credit
       = after_main
       = before_footer
       %footer#footer
         = above_footer
         - if Caboodle::Site.has_footer
\ No newline at end of file