diff --git a/public/index.html b/public/index.html index 345d078..13cd038 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

+ This is a link to google + Me + +

+
+
+

Hello

The time is now: - 2013-11-09 14:08:47 -0800 + 2013-11-09 14:37:56 -0800

@@ -9,3 +23,13 @@

Hello

+ +
+
+
+

I'm a footer

+

Put things in the footer

+ This is a link to google2222222 +
+ + \ No newline at end of file diff --git a/public/me.html b/public/me.html index 48a792c..eb2d3b7 100644 --- a/public/me.html +++ b/public/me.html @@ -1,4 +1,18 @@ -foo + + + + +

You're using a layout

+

+

I'm a header

+

Put things in the header

+ This is a link to google + Me + +

+
+
+ foo poo

watch out!

dance dance

@@ -13,4 +27,13 @@

watch out!

  • I like kissing human
  • - \ No newline at end of file + +
    +
    +
    +

    I'm a footer

    +

    Put things in the footer

    + This is a link to google2222222 +
    + + \ No newline at end of file diff --git a/server_simple.rb b/server_simple.rb index fa8e425..309e445 100644 --- a/server_simple.rb +++ b/server_simple.rb @@ -10,5 +10,8 @@ ## Capture control+c to shut down the server trap 'INT' do server.shutdown end + server.mount_proc '/' do |req, res| + res.body = 'Hello, world!' + end ## Start the server server.start \ No newline at end of file diff --git a/views/layouts/application.html.erb b/views/layouts/application.html.erb index 6eeaff7..86b583f 100644 --- a/views/layouts/application.html.erb +++ b/views/layouts/application.html.erb @@ -1,9 +1,16 @@ + <% + def link_to(name, url) + return "#{name}" + end + %> +

    You're using a layout

    I'm a header

    Put things in the header

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

    @@ -15,6 +22,7 @@

    I'm a footer

    Put things in the footer

    + <%= link_to('This is a link to google2222222', 'http://google2222222.com') %>
    \ No newline at end of file