application.herb in merb-0.0.8

- old
+ new

@@ -2,12 +2,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
 	<title>Merb: Mongrel + Erb</title>
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-	<%= require_css :merb %>
-	<%= require_js :prototype, :effects %>
+	<%= css_include_tag :merb %>
+	<%= js_include_tag :prototype, :effects %>
 </head>
 
 <body>
 
   <div id="blogtitle">
@@ -31,13 +31,14 @@
    <div id="introduction">
       <h3>Merb Mascot</h3>
       <ul>
       	<li><img src="/images/louiecon.gif" /></li>
       </ul>
+ <%= catch_content :sidebar %>
    </div>
 
-<%= @layout_content %>
-			 
+<%= catch_content :layout %>
+
 		 <div class="maintext3">
 		   <div class="splitleft">
 		     <p>This is a split left box  in the split left class.</p>
 		   </div>
 		 
\ No newline at end of file