Add an explicit message when no results are found for a given source.

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

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 177e9ac9743639f599d06d39b491d0c12e8e47a3..54702ace9a04b149a685ef3008b15926f73afb29 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,20 +36,20 @@
     <%= 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 %>
 
 <% end %>
 

-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>

 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">


@@ -64,7 +64,9 @@
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 

-    var map = createMap("map", centre, zoom);
+    var map = createMap("map");
+
+    map.setCenter(centre, zoom);

 
     <% if marker %>
     marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)), null, "Your location");
 
     <% if marker %>
     marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)), null, "Your location");