Make api changeset show path resourceful

[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 b789f721bc828eec29bbc7fc7da2303b6b6eb753..021f1a33585e7e5dac88e25bdfe894eb211c310b 100644 (file)
--- a/app/views/dashboards/_contact.html.erb
+++ b/app/views/dashboards/_contact.html.erb
@@ -1,7 +1,7 @@
 <% user_data = {
      :lon => contact.home_lon,
      :lat => contact.home_lat,
 <% user_data = {
      :lon => contact.home_lon,
      :lat => contact.home_lat,

-     :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
+     :icon => image_path(type == "following" ? "marker-blue.png" : "marker-green.png"),

      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>
 <%= tag.div :class => "clearfix row", :data => { :user => user_data } do %>
      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>
 <%= tag.div :class => "clearfix row", :data => { :user => user_data } do %>


@@ -9,10 +9,10 @@
     <%= user_thumbnail contact %>
   </div>
   <div class="col">
     <%= user_thumbnail contact %>
   </div>
   <div class="col">

-    <p class='text-muted mb-0'>
-      <%= link_to contact.display_name, user_path(contact) %>
-      <% if @user.home_location? and contact.home_location? %>
-        <% distance = @user.distance(contact) %>
+    <p class='text-body-secondary mb-0'>
+      <%= link_to contact.display_name, contact %>
+      <% if current_user.home_location? and contact.home_location? %>
+        <% distance = current_user.distance(contact) %>

         <% if distance < 1 %>
           (<%= t ".m away", :count => (distance * 1000).round %>)
         <% else %>
         <% if distance < 1 %>
           (<%= t ".m away", :count => (distance * 1000).round %>)
         <% else %>


@@ -25,20 +25,20 @@
       <% if changeset %>
         <%= t(".latest_edit_html", :ago => friendly_date_ago(changeset.created_at)) %>
         <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %>
       <% if changeset %>
         <%= t(".latest_edit_html", :ago => friendly_date_ago(changeset.created_at)) %>
         <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %>

-        <q><%= link_to comment, changeset_path(changeset), :title => t("changesets.changeset.view_changeset_details") %></q>
+        <q><%= link_to comment, changeset, :title => t("changesets.changeset.view_changeset_details") %></q>

       <% else %>
        <%= t "changesets.changeset.no_edits" %>
       <% end %>
     </p>
 
     <nav class='secondary-actions'>
       <% else %>
        <%= t "changesets.changeset.no_edits" %>
       <% end %>
     </p>
 
     <nav class='secondary-actions'>

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

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

-          <% 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 %>
+          <% if current_user.follows?(contact) %>
+            <%= link_to t("users.show.unfollow"), follow_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :delete %>

           <% else %>
           <% 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.follow"), follow_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>

           <% end %>
         </li>
       </ul>
           <% end %>
         </li>
       </ul>