diff options
| author | hukl <contact@smyck.org> | 2009-03-03 14:06:39 +0100 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2009-03-03 14:06:39 +0100 |
| commit | c9183349c2fbacf24fca5cd7767190d069ce8873 (patch) | |
| tree | 464dd3c24540000b7eeda30da91aaa0f2bb3c24d | |
| parent | e72bd939439db5dd43ccc1a76975fafabaf2efa7 (diff) | |
no need to hand the page to the helper
| -rw-r--r-- | app/helpers/content_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb index 2cfba02..fba7737 100644 --- a/app/helpers/content_helper.rb +++ b/app/helpers/content_helper.rb | |||
| @@ -10,7 +10,7 @@ module ContentHelper | |||
| 10 | page.user ? page.user.login : "Unknown author" | 10 | page.user ? page.user.login : "Unknown author" |
| 11 | end | 11 | end |
| 12 | 12 | ||
| 13 | def page_title page | 13 | def page_title |
| 14 | if @page.title && @page.title != "" | 14 | if @page.title && @page.title != "" |
| 15 | "CCC | #{@page.title}" | 15 | "CCC | #{@page.title}" |
| 16 | else | 16 | else |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 58de77e..c546347 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | <html xmlns="http://www.w3.org/1999/xhtml"> | 2 | <html xmlns="http://www.w3.org/1999/xhtml"> |
| 3 | <head> | 3 | <head> |
| 4 | <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" /> | 4 | <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" /> |
| 5 | <title><%= page_title @page %></title> | 5 | <title><%= page_title %></title> |
| 6 | <link rel="shortcut icon" href="/images/chaosknot.ico" type="image/ico" /> | 6 | <link rel="shortcut icon" href="/images/chaosknot.ico" type="image/ico" /> |
| 7 | <%= stylesheet_link_tag 'styled' %> | 7 | <%= stylesheet_link_tag 'styled' %> |
| 8 | <%= stylesheet_link_tag 'safari' %> | 8 | <%= stylesheet_link_tag 'safari' %> |