cleanup

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

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index f969203a33185f928b10c0182697f327056005fc..60e5e009df8549a86a16e110e891f807ea69ff9f 100644 (file)
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -2,10 +2,17 @@
 <%= error_messages_for 'user' %>
 <%= start_form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name %>
 <table>
-  <tr><td>Email</td><td><%= @user.email %></td></tr>
+  <tr><td>Name</td><td><%= @user.email %></td></tr>
   <tr><td>Mapper since</td><td><%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)</td></tr>
   <tr><td>Display Name</td><td><%= text_field :user, :display_name, :value => @user.display_name %></td></tr>
   <tr id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> ><td>Your home</td><td><em class="message">You have not entered your home location.</em><span class="location">Latitude: <%= text_field :user, :home_lat, :value => @user.home_lat, :size => 20, :id => "home_lat" %> Longitude <%= text_field :user, :home_lon, :value => @user.home_lon, :size => 20, :id => "home_lon" %></span>  </td></tr>
+
+  <tr><td></td><td>
+  <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 300px;">
+    <h3>Click on the map to (re)set your location</h3>
+  </div>
+  </td></tr>
+
   <tr><td valign="top">Description</td><td><%= text_area :user, :description, :value => @user.description, :class => "editDescription" %></td></tr>
 </table>
 <%= submit_tag 'Save Changes' %>
@@ -22,7 +29,6 @@
     <p>These users are mapping in your area:</p>
     <table>
     <tr>
-    <th>Email</th>
     <th>Name</th>
     <th>Contact</th>
     </tr>
@@ -30,9 +36,8 @@
     <% nearest_str = "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } )" %>
 
     <tr>
-    <td><%= nearby.email %></td>
-    <td><%= nearby.display_name %></td>
-    <td><%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => nearby.display_name %></td>
+    <td><%= link_to nearby.display_name, :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
+    <td><%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %></td>
     </tr>
     <%end%>
     </table>
@@ -45,12 +50,6 @@
     <%= nearest_str %>
 </script>
 
-
-
-<div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 300px;">
-    <h3>Click on the map to (re)set your location</h3>
-</div>
-
 <% if @user.home_lat and @user.home_lon %>
     <% marker = true %>
     <% mlon = @user.home_lon %>