5d47fdff8b
Links to a published web should be to the 'publish' action, not to the 'show' action. Previously, the published status of the source, not the target was used. Also, correct display of the Navigation Links for the 'published' action.
80 lines
2.6 KiB
Plaintext
80 lines
2.6 KiB
Plaintext
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd" >
|
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
|
<head>
|
|
<title>
|
|
<% if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(params['action'])) %>
|
|
<%= h @web.name %>
|
|
<% elsif @web %>
|
|
<%= @title %> in <%= h @web.name %>
|
|
<% else %>
|
|
<%= @title %>
|
|
<% end %>
|
|
<%= @show_diff ? ' (changes)' : '' %>
|
|
</title>
|
|
|
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
<meta name="robots" content="<%= @robots_metatag_value %>" />
|
|
|
|
<%= javascript_include_tag 'page_helper' %>
|
|
|
|
<style type="text/css">
|
|
h1#pageName, .newWikiWord a, a.existingWikiWord, .newWikiWord a:hover, #TextileHelp h3 {
|
|
color: #<%= @web ? @web.color : "393" %>;
|
|
}
|
|
<%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
|
|
</style>
|
|
|
|
<%= stylesheet_link_tag 'instiki' unless @inline_style %>
|
|
|
|
<style type="text/css"><!--/*--><![CDATA[/*><!--*/
|
|
<%= @style_additions %>
|
|
<%= @web ? @web.additional_style : '' %>
|
|
/*]]>*/--></style>
|
|
<%= javascript_include_tag :defaults %>
|
|
<% 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_content') %>
|
|
<% end %>
|
|
</head>
|
|
|
|
<body>
|
|
|
|
<div id="Container">
|
|
<div id="Content">
|
|
<h1 id="pageName">
|
|
<% if @page and (@page.name == 'HomePage') and %w( show published print ).include?(@action_name) %>
|
|
<%= h(@web.name) + (@show_diff ? ' (changes)' : '') %>
|
|
<% elsif @web %>
|
|
<span class="webName"><%= @web.name %></span><br />
|
|
<%= @title %>
|
|
<% else %>
|
|
<%= @title %>
|
|
<% end %>
|
|
</h1>
|
|
|
|
<%= render(:file => 'navigation') unless @web.nil? || @hide_navigation %>
|
|
|
|
<% if flash[:info] %>
|
|
<div class="info"><%= escape_preserving_linefeeds flash[:info] %></div>
|
|
<% end %>
|
|
|
|
<% if @error or flash[:error] %>
|
|
<div class="errorExplanation"><%= escape_preserving_linefeeds(@error || flash[:error]) %></div>
|
|
<% end %>
|
|
|
|
<%= @content_for_layout %>
|
|
|
|
<% if @show_footer %>
|
|
<div id="footer">
|
|
<div>This site is running on <a href="http://golem.ph.utexas.edu/instiki/show/HomePage">Instiki <%= "#{Instiki::VERSION::STRING}" %></a></div>
|
|
<div>Powered by <a href="http://rubyonrails.com/">Ruby on Rails</a> <%= "#{Rails::VERSION::STRING}" %></div>
|
|
</div>
|
|
<% end %>
|
|
|
|
</div> <!-- Content -->
|
|
|
|
</div> <!-- Container -->
|
|
|
|
</body>
|
|
</html>
|