Put auto discovery links in the document head.

[rails.git] / app / views / diary_entry / list.rhtml

diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml
index 4fd5e7bc26f6dd4af4d057e70e0e3654ec49f386..24977a2050f2cf018639936872195387c844ed48 100644 (file)
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,18 +1,18 @@
-<h2><%= @title %></h2>
+<h2><%= h(@title) %></h2>
 
-<% if @user.image %>
- <%= image_tag url_for_file_column(@user, "image") %>
+<% if @this_user && @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
 <% end %>
 
 <br />
 
 <% if @this_user %>
   <% if @user == @this_user %>
-    <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+    <%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
   <% end %>
 <% else %>
   <% if @user %>
-    <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+    <%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
   <% end %>
 <% end %>
 
@@ -28,5 +28,8 @@
 
 <br />
 
-<%= link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), :action => 'rss') %>
-<%= auto_discovery_link_tag(:atom, :action => 'rss') %>
+<%= rss_link_to :action => 'rss' %>
+
+<% content_for :head %>
+<%= auto_discovery_link_tag :atom, :action => 'rss' %>
+<% end %>