Merge remote-tracking branch 'upstream/pull/3125'

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

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index 8379bcd07a22c17391d485c7324855c830706127..a5b29411c64e30d34cae1ca6a6d571562320e689 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -4,10 +4,10 @@
      :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>
      :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 %>
+<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>

   <%= user_thumbnail contact %>
   <div class='activity-details'>
   <%= user_thumbnail contact %>
   <div class='activity-details'>

-    <p class='deemphasize'>
+    <p class='text-muted'>

       <%= link_to 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) %>
       <%= link_to 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) %>


@@ -22,16 +22,16 @@
       <% changeset = contact.changesets.first %>
       <% if changeset %>
         <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')) %>
       <% changeset = contact.changesets.first %>
       <% if changeset %>
         <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')) %>

-        <% 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("changesets.changeset.view_changeset_details") }) %>"
+        <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %>
+        <q><%= link_to(comment,
+                       { :controller => "browse", :action => "changeset", :id => changeset.id },
+                       { :title => t("changesets.changeset.view_changeset_details") }) %></q>

       <% else %>
        <%= t "changesets.changeset.no_edits" %>
       <% end %>
     </p>
 
       <% else %>
        <%= t "changesets.changeset.no_edits" %>
       <% end %>
     </p>
 

-    <ul class='secondary-actions clearfix deemphasize'>
+    <ul class='secondary-actions clearfix text-muted'>

       <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
       <li>
         <% if current_user.is_friends_with?(contact) %>
       <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
       <li>
         <% if current_user.is_friends_with?(contact) %>