diff --git a/public/index.html b/public/index.html index 5b2f139..2a2df1c 100644 --- a/public/index.html +++ b/public/index.html @@ -1,7 +1,21 @@ -

Hello

+ + + + +

You're using a layout

+

+

I'm a header

+

Put things in the header

+ Me + This is a link to gmail + +

+
+
+

Hello

The time is now: - 2012-10-21 16:47:57 -0400 + 2012-10-21 17:08:01 -0400

@@ -9,3 +23,14 @@

Hello

+ +
+
+
+

I'm a footer

+

Put things in the footer

+ Assignment task #3 told me to add this link to google. + This is a link to google +
+ + \ No newline at end of file diff --git a/public/me.html b/public/me.html index 1910281..04be93e 100644 --- a/public/me.html +++ b/public/me.html @@ -1 +1,25 @@ -foo \ No newline at end of file + + + + +

You're using a layout

+

+

I'm a header

+

Put things in the header

+ Me + This is a link to gmail + +

+
+
+ foo +
+
+
+

I'm a footer

+

Put things in the footer

+ Assignment task #3 told me to add this link to google. + This is a link to google +
+ + \ No newline at end of file diff --git a/views/layouts/application.html.erb b/views/layouts/application.html.erb index 6eeaff7..1e1e629 100644 --- a/views/layouts/application.html.erb +++ b/views/layouts/application.html.erb @@ -1,3 +1,9 @@ +<% +def link_to(name, url) + return "#{name}" +end +%> +

You're using a layout

@@ -5,6 +11,7 @@

I'm a header

Put things in the header

Me + <%= link_to('This is a link to gmail', 'http://www.gmail.com') %>


@@ -15,6 +22,8 @@

I'm a footer

Put things in the footer

+ Assignment task #3 told me to add this link to google. + <%= link_to('This is a link to google', 'http://google.com') %>
\ No newline at end of file