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

Make user markers display correctly

Browse source 
Instead of putting the data on a bogus <td> element that will be deleted
by the browser, put it on the <div> wrapper instead.
This commit is contained in:
Tom Hughes 2013-01-16 18:27:56 +00:00
parent 4b9efb63b8
commit 354cadfbe7
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/views/user/_contact.html.erb
View file

@ -1,15 +1,13 @@
<div class='contact-activity clearfix'> <%
<% user_data = {
user_data = { :lon => contact.home_lon,
:lon => contact.home_lon, :lat => contact.home_lat,
:lat => contact.home_lat, :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
:icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"), :description => render(:partial => "popup", :object => contact, :locals => {:type => type})
:description => render(:partial => "popup", :object => contact, :locals => {:type => type}) }
} %>
%> <%= content_tag :div, :class => "contact-activity clearfix", :data => {:user => user_data} do %>
<%= content_tag "td", :rowspan => 3, :data => {:user => user_data} do %> <%= user_thumbnail contact %>
<%= user_thumbnail contact %>
<% end %>
<div class='activity-details'> <div class='activity-details'>
<p class='deemphasize'> <p class='deemphasize'>
<%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %> <%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %>
@ -47,4 +45,4 @@
</li> </li>
</ul> </ul>
</div> </div>
</div> <% end %>