summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/tags_controller.rb2
-rw-r--r--app/views/layouts/application.html.erb8
2 files changed, 10 insertions, 0 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 %>