Send an email notification out when a new message is waiting on the site for you.

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

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 1fd177fa76d5e51e94796a3ffcb7b97a17fc8649..97a90ed617bedac4433b0341e3b09cbaea413598 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -3,26 +3,26 @@
 
 <% if @user and @this_user.id == @user.id %>
 <h3>Your diary</h3>
 
 <% if @user and @this_user.id == @user.id %>
 <h3>Your diary</h3>

-<%= link_to 'View your diary', :controller => 'user', :action=>'diary', :display_name => @user.display_name %><br/>
-<%= link_to 'New diary post', :controller => 'diary_entry', :action=>'new', :display_name => @user.display_name %>
-
+<%= link_to 'View your diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %><br/>
+<%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>

 <h3>Your traces</h3>
 <%= link_to 'View your traces', :controller => 'trace', :action=>'mine' %>
 <h3>Your traces</h3>
 <%= link_to 'View your traces', :controller => 'trace', :action=>'mine' %>

-

 <h3>Your account</h3>
 <%= link_to 'Edit your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 <h3>Your account</h3>
 <%= link_to 'Edit your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>

-
-

 <% else %>
 <%= link_to 'Send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %><br /> 
 <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br />
 <% else %>
 <%= link_to 'Send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %><br /> 
 <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br />

-<%= link_to 'View diary', :controller => 'user', :action=>'diary', :display_name => @this_user.display_name %><br />
-<%= link_to 'View traces', :controller => 'trace', :action=>'view', :display_name => @this_user.display_name %>
-
+<%= link_to 'View diary', :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %><br />
+<%= link_to 'View traces', :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>

 <% end %>
 
 <h3>Nearby users</h3>
 <% end %>
 
 <h3>Nearby users</h3>

-<% if @this_user.home_lat and @this_user.home_lon %>
+<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>
+  No home location has been set.
+  <% if @user and @this_user.id == @user.id %>
+  You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
+  <% end %>
+<% else %>

   <% if @this_user.nearby.empty? %>
     There are no users who admit to mapping nearby.
   <% else %>
   <% if @this_user.nearby.empty? %>
     There are no users who admit to mapping nearby.
   <% else %>


@@ -35,11 +35,5 @@
     </tr>
     <%end%>
     </table>
     </tr>
     <%end%>
     </table>

-

   <%end%>
   <%end%>

-<% else %>
-  No home location has been set.
-  <% if @user and @this_user.id == @user.id %>
-  You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
-  <% end %>

 <% end %>
 <% end %>