layout.haml in caboodle-0.2.2

- old
+ new

@@ -1,35 +1,30 @@
 !!!
 %html{:dir => "ltr", :lang => "en-US", :xmlns => "http://www.w3.org/1999/xhtml"}
   %head{:profile => "http://gmpg.org/xfn/11"}
+    %link{:href => Caboodle::Site.url_base, :rel => "index", :title => Caboodle::Site.title}/
     %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"}/
     
     - Caboodle::Stylesheets.each do |css|
-      %link{:rel => "stylesheet", :rel => css, :type => "text/css"}    
-    
-    %link{:href => Caboodle::Site.url_base, :rel => "index", :title => Caboodle::Site.title}/
+      %link{:rel => "stylesheet", :href => css, :type => "text/css"}    
    
-    %script{:charset => "utf-8", :src => "http://ajax.googleapis.com/ajax/libs/jquery/#{Caboodle::Site.jquery_version || "1.4.2"}/jquery.min.js", :type => "text/javascript"}
-    %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"}
-
+      
+    %script{:charset => "utf-8", :src => "/js/application.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
@@ -80,19 +75,26 @@
           = above_social
           = social
           = below_social
         = after_social 
         = before_content
+        - if Caboodle::Errors.size > 0
+          %section#errors
+            - Caboodle::Errors.each do |err|
+              %h2
+                = err.title
+              %p.reason
+                = err.reason
         %section#content
           = above_content
           = yield
           = below_content
         = after_content
-        - if credit
+        - if self.credit_link
           = before_credit
           %section#credit
             = above_credit
-            = credit
+            = self.credit_link
             = below_credit
           = after_credit
       = after_main
       = before_footer
       %footer#footer
\ No newline at end of file