cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2007-07-27 17:46:01 +00:00
parent 79457cd43e
commit 985047f18d
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/views/user/account.rhtml
View file

@ -24,7 +24,7 @@
<% 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" %>
@ -36,17 +36,17 @@
<%= 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 %>
<% lat = @user.home_lat %>
<% lat = @user.home_lat %>
<% 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>

13
app/views/user/view.rhtml
View file

@ -22,7 +22,12 @@
<% 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 %>
@ -35,11 +40,5 @@
</tr>
<%end%>
</table>
<%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 %>