User null to indicate the the user's home location is not set.

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 80746ba078e44d246c53e47dca139a448a481d75..5b9fd84f65ea4f376613229be7b22649c2f74b7f 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -14,7 +14,7 @@
 <% lon = params['mlon'] %> 
 <% lat = params['mlat'] %>
 <% zoom =  params['zoom'] || '12' %>
 <% lon = params['mlon'] %> 
 <% lat = params['mlat'] %>
 <% zoom =  params['zoom'] || '12' %>

-<% elsif @user %> 
+<% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 

 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% zoom = '10' %>

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index f17a792fb2bde1132efd04207a51349a9c1422a6..4933dc085e3c296ef7ac4708cb0ab25941b0f31c 100644 (file)
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -24,7 +24,7 @@
 <% end %>
 
 <% nearest_str = "" %>
 <% end %>
 
 <% nearest_str = "" %>

-<% if @user.home_lat and @user.home_lon %>
+<% if !@user.home_lat.nil? and !@user.home_lon.nil? %>

   <% if !@user.nearby.empty? %>
     <% @user.nearby.each do |nearby| %>
     <% nearest_str += "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } );\n" %>
   <% if !@user.nearby.empty? %>
     <% @user.nearby.each do |nearby| %>
     <% nearest_str += "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } );\n" %>


@@ -36,17 +36,17 @@
     <%= nearest_str %>
 </script>
 
     <%= nearest_str %>
 </script>
 

-<% if @user.home_lat and @user.home_lon %>
+<% if @user.home_lat.nil? or @user.home_lon.nil? %>
+  <% lon =  params['lon'] || '-0.1' %>
+  <% lat =  params['lat'] || '51.5' %>
+  <% zoom =  params['zoom'] || '4' %> 
+<% else %>

   <% marker = true %>
   <% mlon = @user.home_lon %> 
   <% mlat = @user.home_lat %>
   <% lon =  @user.home_lon %>
   <% marker = true %>
   <% mlon = @user.home_lon %> 
   <% mlat = @user.home_lat %>
   <% lon =  @user.home_lon %>

-  <% lat =  @user.home_lat  %>
+  <% lat =  @user.home_lat %>

   <% zoom =  '12' %>
   <% zoom =  '12' %>

-<% else %>
-  <% lon =  params['lon'] || '-0.1' %>
-  <% lat =  params['lat'] || '51.5' %>
-  <% zoom =  params['zoom'] || '4' %> 

 <% end %>
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <% end %>
 
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 15176f3757ecdd64788b287cd8eaf4f100fc2292..391523b581279eb7eb97740fd7ab8a69f8c96cc8 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -22,7 +22,12 @@
 <% 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 +40,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 %>