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-04-05 11:06:23 -05:00
parent 60f2864b9e 28a0043957
commit 83e9415c67
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<%- if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(params['action'])) -%> <%- if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(params['action'])) -%>
<%= h(@web.name) + (@show_diff ? ' (changes)' : '') %> <%= h(@web.name) + (@show_diff ? ' (changes)' : '') %>
<%- elsif @web -%> <%- elsif @web -%>
<%= @title %> in <%= h @web.name -%> <%= @title %> in <%= h @web.name %>
<%- else -%> <%- else -%>
<%= @title %> <%= @title %>
<%- end -%> <%- end -%>
@ -23,14 +23,16 @@
<%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %> <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
</style> </style>
<%= stylesheet_link_tag 'instiki' unless @inline_style %> <%= stylesheet_link_tag 'instiki' unless @inline_style %>
<style type="text/css"><%= @style_additions %></style> <%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
<style type="text/css"><!--/*--><![CDATA[/*><!--*/ <style type="text/css"><!--/*--><![CDATA[/*><!--*/
<%= @web ? @web.additional_style : '' %> <%= @web ? @web.additional_style : '' %>
/*]]>*/--></style> /*]]>*/--></style>
<%= javascript_include_tag :defaults %> <%= javascript_include_tag :defaults %>
<%- if @web -%> <%- if @web -%>
<%= auto_discovery_link_tag(:atom, :controller => 'wiki', :web => @web.address, :action => 'atom_with_headlines') %> <%= auto_discovery_link_tag(:atom, {:controller => 'wiki', :web => @web.address, :action => 'atom_with_headlines'},
<%= auto_discovery_link_tag(:atom, :controller => 'wiki', :web => @web.address, :action => 'atom_with_content') %> :title => 'Atom with headlines') %>
<%= auto_discovery_link_tag(:atom, {:controller => 'wiki', :web => @web.address, :action => 'atom_with_content'},
:title => 'Atom with full content') %>
<%- end -%> <%- end -%>
</head> </head>