Skip to content

Commit

Permalink
schneems#4 Addition of Template and URL links
Browse files Browse the repository at this point in the history
Added Template and URL links to Google.
  • Loading branch information
kelemo99 committed Feb 18, 2014
1 parent 6a0f541 commit c749fe0
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 7 deletions.
27 changes: 24 additions & 3 deletions public/Ken'sPage.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
<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 <a href='http://google.com'>This is a link to google</a></a>

</p>
<hr />
<div>
<h1> Hello</h1>
<p>
The time is now:
2014-02-18 13:43:04 -0700
2014-02-18 13:56:58 -0700
</p>

<p>
Expand All @@ -17,4 +29,13 @@ <h1> Hello</h1>

<li>I like to listen to The Devil Wears Prada.</li>

</ul>
</ul>
</div>
<hr />
<div>
<h3> I'm a footer</h3>
<p>Put things in the footer</p>
<a <a href='http://google.com'>This is a link to google</a></a>
</div>
</body>
</html>
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>Put things in the header</p>
<a <a href='http://google.com'>This is a link to google</a></a>

</p>
<hr />
<div>
<h1> Hello</h1>
<p>
The time is now:
2014-02-18 13:43:04 -0700
2014-02-18 13:56:58 -0700
</p>

<p>
My Name is:

</p>


</div>
<hr />
<div>
<h3> I'm a footer</h3>
<p>Put things in the footer</p>
<a <a href='http://google.com'>This is a link to google</a></a>
</div>
</body>
</html>
23 changes: 22 additions & 1 deletion public/me.html
Original file line number Diff line number Diff line change
@@ -1 +1,22 @@
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 <a href='http://google.com'>This is a link to google</a></a>

</p>
<hr />
<div>
foo
</div>
<hr />
<div>
<h3> I'm a footer</h3>
<p>Put things in the footer</p>
<a <a href='http://google.com'>This is a link to google</a></a>
</div>
</body>
</html>
8 changes: 7 additions & 1 deletion views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +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>
<a href='me.html'>Me</a>
<a <%= link_to('This is a link to google', 'http://google.com') %></a>

</p>
<hr />
Expand All @@ -15,6 +20,7 @@
<div>
<h3> I'm a footer</h3>
<p>Put things in the footer</p>
<a <%= link_to('This is a link to google', 'http://google.com') %></a>
</div>
</body>
</html>

0 comments on commit c749fe0

Please sign in to comment.