From 28a0043957809023ef3e09c2ca68006c8c04f82f Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Sun, 5 Apr 2009 11:04:44 -0500
Subject: [PATCH] Tweaks to Default Layout

---
 app/views/layouts/default.rhtml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 3464c723..ef0b85aa 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -5,7 +5,7 @@
     <%- if @page and (@page.name == 'HomePage') and (%w( show published print ).include?(params['action'])) -%>
       <%= h(@web.name) + (@show_diff ? ' (changes)' : '') %>
     <%- elsif @web -%>
-      <%= @title %> in <%= h @web.name -%>
+      <%= @title %> in <%= h @web.name %>
     <%- else -%>
       <%= @title %>
     <%- end -%>
@@ -23,14 +23,16 @@
     <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
   </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[/*><!--*/    
     <%= @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') %>
+  	<%= auto_discovery_link_tag(:atom, {:controller => 'wiki', :web => @web.address, :action => 'atom_with_headlines'},
+  	      :title => 'Atom with headlines') %>
+  	<%= auto_discovery_link_tag(:atom, {:controller => 'wiki', :web => @web.address, :action => 'atom_with_content'},
+  	      :title => 'Atom with full content') %>
   <%- end -%>
 </head>