default.rhtml in instiki-0.10.2

- old
+ new

@@ -24,30 +24,25 @@
       width: <%= @content_width || "600" %>px;
     }
     <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
   </style>
 
-  <link rel="Stylesheet" href="/stylesheets/instiki.css" type="text/css" media="screen" />
+  <%= stylesheet_link_tag 'instiki' unless @inline_style %>
 
   <style type="text/css">
     <%= @style_additions %>
     <%= @web ? @web.additional_style : '' %>
   </style>
-  
+
   <% if @web %>
-    <link rel="alternate" type="application/rss+xml" title="<%= h @web.name %> - Headlines RSS" 
-          href="<%= url_for :controller => 'wiki', :web => @web.address, 
-                      :action => 'rss_with_headlines' %>"
-    />
-    <link rel="alternate" type="application/rss+xml" title="<%= h @web.name %> - Full Pages RSS" 
-          href="<%= url_for :controller => 'wiki', :web => @web.address, 
-                      :action => 'rss_with_content' %>"
-    />
+  	<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_with_headlines') %>
+  	<%= auto_discovery_link_tag(:rss, :controller => 'wiki', :web => @web.address, :action => 'rss_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) %>
       <%= @web.name %>
@@ -57,15 +52,15 @@
     <% else %>
       <%= @title %>
     <% end %>
   </h1>
 
-<% if @flash[:error] %> <div id="error">
-    <hr/><p><%= @flash[:error].to_s %></p><hr/></div>
+<% if @error or @flash[:error] %> <div id="error">
+    <hr/><p><%= escape_preserving_linefeeds(@error || @flash[:error]) %></p><hr/></div>
 <% end %>
 
 <% if @flash[:info] %> <div id="info">
-    <hr/><p><%= @flash[:info].to_s %></p><hr/></div>
+    <hr/><p><%= escape_preserving_linefeeds @flash[:info] %></p><hr/></div>
 <% end %>
 
 <%= render 'navigation' unless @web.nil? || @hide_navigation %>
 <%= @content_for_layout %>
 