Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[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 0ac45f9d220271dc8bd7835d6dbc1e413c694fcf..7a2ccf74d6bea047b5cf9c7659e900306cf103ff 100644 (file)
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,11 +1,18 @@
-<h2><%= @title %></h2>
+<h2><%= h(@title) %></h2>
+
+<% if @this_user && @this_user.image %>
+ <%= image_tag url_for_file_column(@this_user, "image") %>
+<% end %>
+
+<br />
+

 <% if @this_user %>
   <% if @user == @this_user %>
 <% 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 %>
   <% 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 %>
 
   <% end %>
 <% end %>
 


@@ -21,5 +28,5 @@
 
 <br />
 
 
 <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' %>
+<%= auto_discovery_link_tag :atom, :action => 'rss' %>