From ee780192d60ea0498a06cf2e85ac2f5d4ce1d85c Mon Sep 17 00:00:00 2001 From: bitnami Date: Wed, 30 Jul 2014 02:59:43 +0000 Subject: [PATCH] homework #3 complete --- public/index.html | 26 ++++++++++++++++++++++++-- public/me.html | 23 ++++++++++++++++++++++- views/layouts/application.html.erb | 10 ++++++++-- 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index f866e14..f45c260 100644 --- a/public/index.html +++ b/public/index.html @@ -1,7 +1,20 @@ -

Hello

+ + + + +

You're using a layout

+

+

I'm a header

+

Google

+ Me + +

+
+
+

Hello

The time is now: - 2014-07-30 02:23:10 +0000 + 2014-07-30 02:57:45 +0000

@@ -9,3 +22,12 @@

Hello

+ +
+
+
+

I'm a footer

+

Google

+
+ + \ No newline at end of file diff --git a/public/me.html b/public/me.html index 9012e99..4078c7f 100644 --- a/public/me.html +++ b/public/me.html @@ -1,4 +1,17 @@ - + + + + +

You're using a layout

+

+

I'm a header

+

Google

+ Me + +

+
+
+

This is Kyle trying to create view @@ -25,4 +38,12 @@

+ +
+
+
+

I'm a footer

+

Google

+
+ \ No newline at end of file diff --git a/views/layouts/application.html.erb b/views/layouts/application.html.erb index 6eeaff7..d0e161a 100644 --- a/views/layouts/application.html.erb +++ b/views/layouts/application.html.erb @@ -1,9 +1,15 @@ +<% + def link_to(name, url) + return "#{name}" + end +%> +

You're using a layout

I'm a header

-

Put things in the header

+

<%= link_to('Google','www.google.com') %>

Me

@@ -14,7 +20,7 @@

I'm a footer

-

Put things in the footer

+

<%= link_to('Google','www.google.com')%>

\ No newline at end of file