Use ejs templates in browse JS

[rails.git] / app / views / user / _contact.html.erb

diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb
index c0bf160fc778f6b21035f0bc112f9aea81eb2da5..82ca579d9fc9ac5aaa7958c9b91ebc45f48e8dd4 100644 (file)
--- a/app/views/user/_contact.html.erb
+++ b/app/views/user/_contact.html.erb
@@ -1,7 +1,15 @@
 <tr>
 <tr>

-  <td rowspan="3">
+  <%
+     user_data = {
+       :lon => contact.home_lon,
+       :lat => contact.home_lat,
+       :icon => type == "friend" ? "marker-blue.png" : "marker-green.png",
+       :description => render(:partial => "popup", :object => contact, :locals => {:type => type})
+     }
+  %>
+  <%= content_tag "td", :rowspan => 3, :data => {:user => user_data} do %>

     <%= user_thumbnail contact %>
     <%= user_thumbnail contact %>

-  </td>
+  <% end %>

   <td>
     <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>
     <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>
   <td>
     <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>
     <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %>


@@ -28,6 +36,7 @@
      <%= t'changeset.changeset.no_edits' %>
     <% end %>
   </td>
      <%= t'changeset.changeset.no_edits' %>
     <% end %>
   </td>

+</tr>

 <tr>
   <td>
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
 <tr>
   <td>
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>