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

[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 d067bd4781b4acc73a53de16a3621c62cf2a3b76..c7e10c060c2c655eb4076f6d0d301ff8bff3e437 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -7,7 +7,7 @@
 <%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>
   <%= user_thumbnail contact %>
   <div class='activity-details'>
 <%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>
   <%= 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) %>


@@ -21,17 +21,17 @@
     <p>
       <% changeset = contact.changesets.first %>
       <% if changeset %>
     <p>
       <% 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") }) %>"
+        <%= 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 == "" ? 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) %>