deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added meta robots tag to the default layout; added error handling to published pages

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-11-01 07:31:44 +00:00
parent 9e7306fb0a
commit d3b25c8a19
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/application.rb
View file

@ -2,7 +2,7 @@
# Likewise will all the methods added be available for all controllers. # Likewise will all the methods added be available for all controllers.
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
before_filter :connect_to_model, :setup_url_generator, :set_content_type_header before_filter :connect_to_model, :setup_url_generator, :set_content_type_header, :set_robots_metatag
after_filter :remember_location, :teardown_url_generator after_filter :remember_location, :teardown_url_generator
observer :page_observer observer :page_observer
@ -152,6 +152,14 @@ class ApplicationController < ActionController::Base
end end
end end
def set_robots_metatag
if controller_name == 'wiki' and %w(show published).include? action_name
@robots_metatag_value = 'index,follow'
else
@robots_metatag_value = 'noindex,nofollow'
end
end
def setup_url_generator def setup_url_generator
PageRenderer.setup_url_generator(UrlGenerator.new(self)) PageRenderer.setup_url_generator(UrlGenerator.new(self))
end end

13
app/controllers/wiki_controller.rb
View file

@ -195,12 +195,13 @@ class WikiController < ApplicationController
end end
def published def published
if @web.published? render_text("Published version of web '#{@web_name}' is not available", 404) and return if not @web.published?
page = wiki.read_page(@web_name, @page_name || 'HomePage')
@renderer = PageRenderer.new(page.revisions.last) page_name = @page_name || 'HomePage'
else page = wiki.read_page(@web_name, page_name)
redirect_home render_text("Page '#{page_name}' not found", 404) and return unless page
end
@renderer = PageRenderer.new(page.revisions.last)
end end
def revision def revision

3
app/views/layouts/default.rhtml
View file

@ -14,7 +14,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
</title> </title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="robots" content="<%= @robots_metatag_value %>" />
<style type="text/css"> <style type="text/css">
h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 { h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 {
color: #<%= @web ? @web.color : "393" %>; color: #<%= @web ? @web.color : "393" %>;