Resolve conflict

[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 e723af9e73fb3d673d6447dd5db76587afbeb58a..4811389f12f61b22368b8b84a7c178b142b4f77a 100644 (file)
--- a/app/views/user/_contact.html.erb
+++ b/app/views/user/_contact.html.erb
@@ -1,15 +1,13 @@
-<div class='contact-activity clearfix'>
-  <%
-     user_data = {
-       :lon => contact.home_lon,
-       :lat => contact.home_lat,
-       :icon => image_path(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 %>
-  <% end %>
+<%
+   user_data = {
+     :lon => contact.home_lon,
+     :lat => contact.home_lat,
+     :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
+     :description => render(:partial => "popup", :object => contact, :locals => {:type => type})
+   }
+%>
+<%= content_tag :div, :class => "contact-activity clearfix", :data => {:user => user_data} do %>
+  <%= user_thumbnail contact %>

   <div class='activity-details'>
     <p class='deemphasize'>
       <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>
   <div class='activity-details'>
     <p class='deemphasize'>
       <%= link_to h(contact.display_name), :controller => 'user', :action => 'view',  :display_name => contact.display_name %>


@@ -26,7 +24,7 @@
       <% changeset = contact.changesets.first %>
       <% if changeset %>
         <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
       <% changeset = contact.changesets.first %>
       <% if changeset %>
         <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>

-        <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %>
+        <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>

         "<%= link_to(comment,
                             {:controller => 'browse', :action => 'changeset', :id => changeset.id},
                             {:title => t('changeset.changeset.view_changeset_details')})
         "<%= link_to(comment,
                             {:controller => 'browse', :action => 'changeset', :id => changeset.id},
                             {:title => t('changeset.changeset.view_changeset_details')})


@@ -47,4 +45,4 @@
       </li>
     </ul>
   </div>
       </li>
     </ul>
   </div>

-</div>
+<% end %>