Rename user_controller to users_controller

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

diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb
deleted file mode 100644 (file)
index 123f511..0000000
--- a/app/views/user/_contact.html.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-<%
-   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), user_path(contact) %>
-      <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
-        <% distance = @user.distance(contact) %>
-        <% if distance < 1 %>
-          (<%= t 'user.show.m away', :count => (distance * 1000).round %>)
-        <% else %>
-          (<%= t 'user.show.km away', :count => distance.round %>)
-        <% end %>
-      <% end %>
-    </p>
-    <p>
-      <% changeset = contact.changesets.first %>
-      <% if changeset %>
-        <%= t('user.show.latest edit', :ago => t('user.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
-        <% 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')})
-        %>"
-      <% else %>
-       <%= t'changeset.changeset.no_edits' %>
-      <% end %>
-    </p>
-
-    <ul class='secondary-actions clearfix deemphasize'>
-      <li><%= link_to t('user.show.send message'), new_message_path(contact) %></li>
-      <li>
-        <% if current_user.is_friends_with?(contact) %>
-          <%= link_to t('user.show.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
-        <% else %>
-          <%= link_to t('user.show.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
-      <% end %>
-      </li>
-    </ul>
-  </div>
-<% end %>