Finished schneems#3 of HW layout

aecorredor · Mar 5, 2015 · e2021de · e2021de
1 parent 41edf39
commit e2021de
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 7 deletions.
diff --git a/public/alejandro.html b/public/alejandro.html
@@ -1,4 +1,20 @@
-<body>
+
+
+<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>
+      <p>
+        If you want to check out some soccer go to
+        <a href = 'http://marca.com'> MARCA </a>
+      </p>
+    </p>
+    <hr />
+    <div>
+      <body>
   <div>
     <p>Hello, this is Alejandro's homepage<p>
 
@@ -17,3 +33,13 @@
   </div>
 
 </body>
+
+    </div>
+    <hr />
+    <div>
+      <h3> I'm a footer</h3>
+      <p>Put things in the footer</p>
+      <a href = 'http://Lnkdin.me/AlejandroCorredor'> LinkedIn Profile </a>
+    </div>
+  </body>
+</html>
diff --git a/public/index.html b/public/index.html
@@ -1,11 +1,37 @@
-<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>
+      <p>
+        If you want to check out some soccer go to
+        <a href = 'http://marca.com'> MARCA </a>
+      </p>
+    </p>
+    <hr />
+    <div>
+      <h1> Hello</h1>
 <p>
   The time is now:
-  2015-03-02 13:18:15 -0500
+  2015-03-05 18:34:04 -0500
 </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://Lnkdin.me/AlejandroCorredor'> LinkedIn Profile </a>
+    </div>
+  </body>
+</html>
diff --git a/public/me.html b/public/me.html
@@ -1 +1,26 @@
-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>
+      <p>
+        If you want to check out some soccer go to
+        <a href = 'http://marca.com'> MARCA </a>
+      </p>
+    </p>
+    <hr />
+    <div>
+      foo
+    </div>
+    <hr />
+    <div>
+      <h3> I'm a footer</h3>
+      <p>Put things in the footer</p>
+      <a href = 'http://Lnkdin.me/AlejandroCorredor'> LinkedIn Profile </a>
+    </div>
+  </body>
+</html>
diff --git a/readme.md b/readme.md
@@ -37,7 +37,7 @@ This will add your changes to the git repository, once you're happy with the cha
 To push your local changes to github you can run:
 
     $ git push origin master
-
+g
 Origin refers to the place where you cloned the code from (github) and master refers to the branch you're on.
 
 Once you're done with the homework and it has been committed to your laptop, push it to your fork on Github. Then open a pull request. Your assignment will be graded from this pull request.

diff --git a/views/layouts/application.html.erb b/views/layouts/application.html.erb
@@ -1,11 +1,20 @@
+<%
+  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>
-
+      <p>
+        If you want to check out some soccer go to
+        <%= link_to("MARCA", "http://marca.com") %>
+      </p>
     </p>
     <hr />
     <div>
@@ -15,6 +24,7 @@
     <div>
       <h3> I'm a footer</h3>
       <p>Put things in the footer</p>
+      <%= link_to("LinkedIn Profile", "http://Lnkdin.me/AlejandroCorredor") %>
     </div>
   </body>
-</html>
+</html>