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

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-12-14 22:37:37 -06:00
parent 47941683ab f3b69bc57b
commit cf37421f4b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -19,11 +19,13 @@ class ApplicationController < ActionController::Base
Wiki.new Wiki.new
end end
protected
def xhtml_enabled? def xhtml_enabled?
in_a_web? and [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) in_a_web? and [:markdownMML, :markdownPNG, :markdown].include?(@web.markup)
end end
protected helper_method :xhtml_enabled?
def check_authorization def check_authorization
if in_a_web? and authorization_needed? and not authorized? if in_a_web? and authorization_needed? and not authorized?

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

@ -41,7 +41,7 @@
<div id="Container"> <div id="Container">
<div id="Content"> <div id="Content">
<h1 id="pageName"> <h1 id="pageName">
<%= render(:file => 'svg_logo') if @controller.xhtml_enabled? %> <%= render(:file => 'svg_logo') if xhtml_enabled? %>
<%- if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) -%> <%- if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) -%>
<%= h(@web.name) + (@show_diff ? ' (changes)' : '') %> <%= h(@web.name) + (@show_diff ? ' (changes)' : '') %>
<%- elsif @web -%> <%- elsif @web -%>