Excercise 3 Complete

kylegracey · kylegracey · commit 8ee647e5968a · 2013-04-13T14:30:33.000-05:00
diff --git a/public/index.html b/public/index.html
@@ -1,11 +1,32 @@
-<h1> Hello</h1>
+
+<html>
+  <body>
+    <h1>You're using a layout</h1>
+    <div>
+      <h3> I'm a header</h3>
+      <p>Navigation:</p>
+      <a href='index.html'>Home</a>
+      <a href='me.html'>Me</a>
+    </div>
+    <hr />
+    <div>
+      <h1> Hello</h1>
 <p>
   The time is now:
-  2013-04-13 14:06:39 -0500
+  2013-04-13 14:28:50 -0500
 </p>
 
 <p>
   My Name is:
   
 </p>
 
+
+    </div>
+    <hr />
+    <div>
+      <h3> I'm a footer</h3>
+      <p>Put things in the footer</p>
+    </div>
+  </body>
+</html>
diff --git a/public/me.html b/public/me.html
@@ -1,4 +1,16 @@
 
+<html>
+  <body>
+    <h1>You're using a layout</h1>
+    <div>
+      <h3> I'm a header</h3>
+      <p>Navigation:</p>
+      <a href='index.html'>Home</a>
+      <a href='me.html'>Me</a>
+    </div>
+    <hr />
+    <div>
+      
 
 <div class="header">
 	<h2>This is the 'Me' page. </h2>
@@ -14,4 +26,12 @@ <h2>This is the 'Me' page. </h2>
 		<li>Cooking</li>
 		
 	</ul>
-</div>
+</div>
+    </div>
+    <hr />
+    <div>
+      <h3> I'm a footer</h3>
+      <p>Put things in the footer</p>
+    </div>
+  </body>
+</html>
diff --git a/views/layouts/application.html.erb b/views/layouts/application.html.erb
@@ -1,12 +1,17 @@
+<%
+  def link_to(name, url)
+    return "<a href='#{url}'>#{name}</a>"
+  end
+%>
 <html>
   <body>
     <h1>You're using a layout</h1>
-    <p>
+    <div>
       <h3> I'm a header</h3>
-      <p>Put things in the header</p>
-      <a href='me.html'>Me</a>
-
-    </p>
+      <p>Navigation:</p>
+      <%= link_to('Home', 'index.html') %>
+      <%= link_to('Me', 'me.html') %>
+    </div>
     <hr />
     <div>
       <%= yield %>
