Force new users to enter their email address twice to try and avoid so

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

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index d0600bb8d5d60dea81862f454afe3b0a365c8046..a96fd5b1917c4a24dcc5a9f1f287a0b46c64ec52 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -27,23 +27,8 @@
   You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
   <% end %>
 <% else %>
   You can set your home location on your <%= link_to 'settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> page.
   <% end %>
 <% else %>

-  Nearby users:<br/>
-  <% if @this_user.nearby.empty? %>
-    There are no users who admit to mapping nearby yet.
-  <% else %>
-    <table id="nearbyusers">
-    <% @this_user.nearby.each do |nearby| %>
-    <tr>
-    <td class="username"><%= link_to nearby.display_name, :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
-    <td><%= @this_user.distance(nearby).round %>km away</td>
-    <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
-    </tr>
-    <%end%>
-    </table>
-  <%end%>

 
   <% if @user and @this_user.id == @user.id %>
 
   <% if @user and @this_user.id == @user.id %>

-    <br/>

     Your friends:<br/>
     <% if @this_user.friends.empty? %>
       You have not added any friends yet.
     Your friends:<br/>
     <% if @this_user.friends.empty? %>
       You have not added any friends yet.


@@ -53,11 +38,28 @@
       <% @friend = User.find_by_id(friend.friend_user_id) %>
       <tr>
       <td class="username"><%= link_to @friend.display_name, :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>
       <% @friend = User.find_by_id(friend.friend_user_id) %>
       <tr>
       <td class="username"><%= link_to @friend.display_name, :controller => 'user', :action => 'view',  :display_name => @friend.display_name %></td>

-      <td><%= @this_user.distance(@friend).round %>km away</td>
+      <td><% if @friend.home_lon and @friend.home_lat %><%= @this_user.distance(@friend).round %>km away<% end %></td>

       <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
       </tr>
       <%end%>
       </table>
     <%end%>
       <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @friend.id %>)</td>
       </tr>
       <%end%>
       </table>
     <%end%>

+    <br/>
+  <%end%>
+
+  Nearby users:<br/>
+  <% if @this_user.nearby.empty? %>
+    There are no users who admit to mapping nearby yet.
+  <% else %>
+    <table id="nearbyusers">
+    <% @this_user.nearby.each do |nearby| %>
+    <tr>
+    <td class="username"><%= link_to nearby.display_name, :controller => 'user', :action => 'view',  :display_name => nearby.display_name %></td>
+    <td><%= @this_user.distance(nearby).round %>km away</td>
+    <td class="message">(<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => nearby.id %>)</td>
+    </tr>
+    <%end%>
+    </table>

   <%end%>
   <%end%>

+

 <% end %>
 <% end %>