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

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

diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb
index 545557e642431b217ea578c0610c6cffac326ab6..7785c05523fb287cc3a239b430b65392b3c15953 100644 (file)
--- a/app/views/dashboards/_contact.html.erb
+++ b/app/views/dashboards/_contact.html.erb
@@ -4,10 +4,12 @@
      :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 })
    } %>

-<%= tag.div :class => "contact-activity clearfix", :data => { :user => user_data } do %>
-  <%= user_thumbnail contact %>
-  <div class='activity-details'>
-    <p class='text-muted'>
+<%= tag.div :class => "clearfix row", :data => { :user => user_data } do %>
+  <div class="col-auto">
+    <%= user_thumbnail contact %>
+  </div>
+  <div class="col">
+    <p class='text-muted mb-0'>

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


@@ -18,7 +20,7 @@
         <% end %>
       <% end %>
     </p>
         <% end %>
       <% end %>
     </p>

-    <p>
+    <p class="mb-0">

       <% 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")) %>


@@ -35,7 +37,7 @@
       <ul class='clearfix text-muted'>
         <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
         <li>
       <ul class='clearfix text-muted'>
         <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
         <li>

-          <% if current_user.is_friends_with?(contact) %>
+          <% if current_user.friends_with?(contact) %>

             <%= link_to t("users.show.remove as friend"), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
           <% else %>
             <%= link_to t("users.show.add as friend"), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
             <%= link_to t("users.show.remove as friend"), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
           <% else %>
             <%= link_to t("users.show.add as friend"), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>