From: Tom Hughes Date: Sun, 31 Jul 2011 15:21:35 +0000 (+0100) Subject: Fix an accidental CSS match that broke user popups on maps X-Git-Tag: live~6810 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/866f25bc45b01776f6319fda7f6b91da43710ec0?hp=e951e0936a70af4c9afdeaf92e6f94770851cd07 Fix an accidental CSS match that broke user popups on maps --- diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 5de2beff7..834e8571b 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -92,7 +92,7 @@ <% if @user and @this_user.id == @user.id %>
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> -

<%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %>

+

<%= t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name) %>

<% else %> <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> <% end %> diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index fd4dfac6a..2a06085b3 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -857,7 +857,7 @@ p#contributorGuidance { height: 400px; } -.user_view .user_map p { +.user_view .user_map p#no_home_location { position: absolute; top: 0px; bottom: 0px;