assignment task schneems#3 completed

Eric-Xu · Oct 21, 2012 · 53c099d · 53c099d
1 parent 831bc43
commit 53c099d
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 3 deletions.
diff --git a/public/index.html b/public/index.html
@@ -1,11 +1,36 @@
-<h1> Hello</h1>
+
+
+<html>
+  <body>
+    <h1>You're using a layout</h1>
+    <p>
+      <h3> I'm a header</h3>
+      <p>Put things in the header</p>
+      <a href='me.html'>Me</a>
+      <a href='http://www.gmail.com'>This is a link to gmail</a>
+
+    </p>
+    <hr />
+    <div>
+      <h1> Hello</h1>
 <p>
   The time is now:
-  2012-10-21 16:47:57 -0400
+  2012-10-21 17:08:01 -0400
 </p>
 
 <p>
   My Name is:
 
 </p>
 
+
+    </div>
+    <hr />
+    <div>
+      <h3> I'm a footer</h3>
+      <p>Put things in the footer</p>
+      <a href="http://google.com">Assignment task #3 told me to add this link to google.</a>
+      <a href='http://google.com'>This is a link to google</a>
+    </div>
+  </body>
+</html>
diff --git a/public/me.html b/public/me.html
@@ -1 +1,25 @@
-foo
+
+
+<html>
+  <body>
+    <h1>You're using a layout</h1>
+    <p>
+      <h3> I'm a header</h3>
+      <p>Put things in the header</p>
+      <a href='me.html'>Me</a>
+      <a href='http://www.gmail.com'>This is a link to gmail</a>
+
+    </p>
+    <hr />
+    <div>
+      foo
+    </div>
+    <hr />
+    <div>
+      <h3> I'm a footer</h3>
+      <p>Put things in the footer</p>
+      <a href="http://google.com">Assignment task #3 told me to add this link to google.</a>
+      <a href='http://google.com'>This is a link to google</a>
+    </div>
+  </body>
+</html>
diff --git a/views/layouts/application.html.erb b/views/layouts/application.html.erb
@@ -1,10 +1,17 @@
+<%
+def link_to(name, url)
+    return "<a href='#{url}'>#{name}</a>"
+end
+%>  
+
 <html>
   <body>
     <h1>You're using a layout</h1>
     <p>
       <h3> I'm a header</h3>
       <p>Put things in the header</p>
       <a href='me.html'>Me</a>
+      <%= link_to('This is a link to gmail', 'http://www.gmail.com') %>
 
     </p>
     <hr />
@@ -15,6 +22,8 @@
     <div>
       <h3> I'm a footer</h3>
       <p>Put things in the footer</p>
+      <a href="http://google.com">Assignment task #3 told me to add this link to google.</a>
+      <%= link_to('This is a link to google', 'http://google.com') %>
     </div>
   </body>
 </html>