finished exercise schneems#4

asakurasol · Nov 9, 2013 · a390d6f · a390d6f
1 parent 90c140c
commit a390d6f
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 4 deletions.
diff --git a/public/index.html b/public/index.html
@@ -1,11 +1,35 @@
-<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='http://google.com'>This is a link to google</a>
+      <a href='me.html'>Me</a>
+
+    </p>
+    <hr />
+    <div>
+      <h1> Hello</h1>
 <p>
   The time is now:
-  2013-11-09 14:08:47 -0800
+  2013-11-09 14:37:56 -0800
 </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://google2222222.com'>This is a link to google2222222</a>
+    </div>
+  </body>
+</html>
diff --git a/public/me.html b/public/me.html
@@ -1,4 +1,18 @@
-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='http://google.com'>This is a link to google</a>
+      <a href='me.html'>Me</a>
+
+    </p>
+    <hr />
+    <div>
+      foo
 poo
 <h1>watch out!</h1>
 <p> dance dance </p>
@@ -13,4 +27,13 @@ <h1>watch out!</h1>
 
         <li>I like kissing human</li>
 
-    </ul>
+    </ul>
+    </div>
+    <hr />
+    <div>
+      <h3> I'm a footer</h3>
+      <p>Put things in the footer</p>
+  <a href='http://google2222222.com'>This is a link to google2222222</a>
+    </div>
+  </body>
+</html>
diff --git a/server_simple.rb b/server_simple.rb
@@ -10,5 +10,8 @@
 ## Capture control+c to shut down the server
 trap 'INT' do server.shutdown end
 
+    server.mount_proc '/' do |req, res|
+      res.body = 'Hello, world!'
+    end
 ## Start the server
 server.start
diff --git a/views/layouts/application.html.erb b/views/layouts/application.html.erb
@@ -1,9 +1,16 @@
+    <%
+        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>
+   <%= link_to('This is a link to google', 'http://google.com') %>
       <a href='me.html'>Me</a>
 
     </p>
@@ -15,6 +22,7 @@
     <div>
       <h3> I'm a footer</h3>
       <p>Put things in the footer</p>
+  <%= link_to('This is a link to google2222222', 'http://google2222222.com') %>
     </div>
   </body>
 </html>