diff options
| author | hukl <contact@smyck.org> | 2010-07-20 09:17:19 +0200 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2010-07-20 09:17:19 +0200 |
| commit | e93140c1083ac9dde55d27d5e0685e9b77527d51 (patch) | |
| tree | 9e8f96e9951176eeab434c388d9806a00882a40a | |
| parent | b783fbfb31be44928fa10a8dfb6c06f114bb213e (diff) | |
adding sponsors footer
| -rw-r--r-- | app/controllers/tags_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 8 | ||||
| -rw-r--r-- | config/locales/de.yml | 4 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
4 files changed, 14 insertions, 1 deletions
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index fe3380d..565cdd4 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb | |||
| @@ -14,6 +14,8 @@ class TagsController < ApplicationController | |||
| 14 | @tag = @tag ? @tag.name : params[:id] | 14 | @tag = @tag ? @tag.name : params[:id] |
| 15 | 15 | ||
| 16 | @page = Page.new | 16 | @page = Page.new |
| 17 | |||
| 18 | params[:page] = ( params[:page].is_a?(Fixnum) ? params[:page] : 1 ) | ||
| 17 | 19 | ||
| 18 | @pages = Page.heads.paginate( | 20 | @pages = Page.heads.paginate( |
| 19 | Page.find_options_for_find_tagged_with(@tag).merge( | 21 | Page.find_options_for_find_tagged_with(@tag).merge( |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c75b803..678180d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -42,6 +42,14 @@ | |||
| 42 | </div> | 42 | </div> |
| 43 | <div id="center_column"> | 43 | <div id="center_column"> |
| 44 | <%= yield :layout %> | 44 | <%= yield :layout %> |
| 45 | |||
| 46 | <div id="footer"> | ||
| 47 | <br /> | ||
| 48 | <br /> | ||
| 49 | <p style="text-align: center"> | ||
| 50 | <%= link_to t(:sponsors), content_path("sponsors") %> | ||
| 51 | </p> | ||
| 52 | </div> | ||
| 45 | </div> | 53 | </div> |
| 46 | <div id="right_column"> | 54 | <div id="right_column"> |
| 47 | <%= tags %> | 55 | <%= tags %> |
diff --git a/config/locales/de.yml b/config/locales/de.yml index ff66ea1..7196120 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | # by Clemens Kofler (clemens@railway.at) | 2 | # by Clemens Kofler (clemens@railway.at) |
| 3 | 3 | ||
| 4 | de: | 4 | de: |
| 5 | sponsors: Sponsoren | ||
| 5 | show_tag_headline: "Seiten mit dem Tag:" | 6 | show_tag_headline: "Seiten mit dem Tag:" |
| 6 | old_ccc_de: das alte ccc.de | 7 | old_ccc_de: das alte ccc.de |
| 7 | date: | 8 | date: |
| @@ -118,4 +119,5 @@ de: | |||
| 118 | less_than: "must be less than {{count}}" | 119 | less_than: "must be less than {{count}}" |
| 119 | less_than_or_equal_to: "must be less than or equal to {{count}}" | 120 | less_than_or_equal_to: "must be less than or equal to {{count}}" |
| 120 | odd: "must be odd" | 121 | odd: "must be odd" |
| 121 | even: "must be even" \ No newline at end of file | 122 | even: "must be even" |
| 123 | \ No newline at end of file | ||
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8a25451..e68cead 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. | 2 | # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. |
| 3 | 3 | ||
| 4 | en: | 4 | en: |
| 5 | sponsors: sponsors | ||
| 5 | hello: "Hello world" | 6 | hello: "Hello world" |
| 6 | show_tag_headline: "Pages tagged with:" | 7 | show_tag_headline: "Pages tagged with:" |
| 7 | old_ccc_de: the old ccc.de \ No newline at end of file | 8 | old_ccc_de: the old ccc.de \ No newline at end of file |
