Use messages.empty? instead of the deprecated has_messages? method.

[rails.git] / app / views / user / view.rhtml

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 6f6bdb450540ba7d30077322188da03d35a5c73e..3d170726678a258177169afc67c5f35baa2a91b3 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,6 +1,7 @@
 <h2><%= @this_user.display_name %></h2>
 <% if @user and @this_user.id == @user.id %>
-<% if @user.has_messages? %>
+<h3>Messages</h3>
+<% if !@user.messages.empty? %>
 <p>You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length -  @user.get_new_messages.length %> old messages:</p> 
 
 <div id = "messages">
@@ -50,20 +51,21 @@
 <%end%>
 
 <br />
+<%= link_to 'show all messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
 <br />
-<%= link_to 'show unread messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
+<h3>Your account</h3>
+Go to <%= link_to 'your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %> to see who's mapping in your area.
 <br />
 <br />
-
-<%= link_to 'go to your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %><br /><br />
+<%= link_to 'View your diary', :controller => 'user', :action=>'diary', :display_name => @user.display_name %>
 
 <% else %>
-<%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => @this_user.display_name %><br /><br /> 
+<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %><br /><br /> 
 <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br /><br />
+<%= link_to 'Diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %>
 <% end %>
-
-<%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %><br /><br />
-
+<br />
+<br />
 
 <p><%= params[:display_name] %> says:  </p>
 <%= simple_format(@this_user.description) %>