Skip to content

Commit

Permalink
homework schneems#3 complete
Browse files Browse the repository at this point in the history
  • Loading branch information
kylefoo committed Jul 30, 2014
1 parent f1d59c3 commit ee78019
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 5 deletions.
26 changes: 24 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,33 @@
<h1> Hello</h1>


<html>
<body>
<h1>You're using a layout</h1>
<p>
<h3> I'm a header</h3>
<p><a href= www.google.com>Google</a></p>
<a href='me.html'>Me</a>

</p>
<hr />
<div>
<h1> Hello</h1>
<p>
The time is now:
2014-07-30 02:23:10 +0000
2014-07-30 02:57:45 +0000
</p>

<p>
My Name is:

</p>


</div>
<hr />
<div>
<h3> I'm a footer</h3>
<p><a href= www.google.com>Google</a></p>
</div>
</body>
</html>
23 changes: 22 additions & 1 deletion public/me.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
<html>


<html>
<body>
<h1>You're using a layout</h1>
<p>
<h3> I'm a header</h3>
<p><a href= www.google.com>Google</a></p>
<a href='me.html'>Me</a>

</p>
<hr />
<div>
<html>
<p>

This is Kyle trying to create view
Expand All @@ -25,4 +38,12 @@
</ul>

</p>
</html>
</div>
<hr />
<div>
<h3> I'm a footer</h3>
<p><a href= www.google.com>Google</a></p>
</div>
</body>
</html>
10 changes: 8 additions & 2 deletions views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<%
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>
<p><%= link_to('Google','www.google.com') %></p>
<a href='me.html'>Me</a>

</p>
Expand All @@ -14,7 +20,7 @@
<hr />
<div>
<h3> I'm a footer</h3>
<p>Put things in the footer</p>
<p><%= link_to('Google','www.google.com')%></p>
</div>
</body>
</html>

0 comments on commit ee78019

Please sign in to comment.