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

[rails.git] / app / views / messages / show.html.erb

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 4761aac60d95d4cd5de4dfa4f1481f85248e5a7f..8fe5084692072d1a9e57e5c1bfc93c5b27b14f3c 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -2,13 +2,13 @@
   <h1><%= @message.title %></h1>
 <% end %>
 
   <h1><%= @message.title %></h1>
 <% end %>
 

-<div class='mb-3 border-bottom border-grey py-1 d-flex gap-1 flex-wrap'>
+<div class='mb-3 border-bottom border-secondary-subtle py-1 d-flex gap-1 flex-wrap'>

   <% if current_user == @message.recipient %>
     <%= user_thumbnail_tiny @message.sender %>
   <% if current_user == @message.recipient %>
     <%= user_thumbnail_tiny @message.sender %>

-    <%= link_to @message.sender.display_name, user_path(@message.sender) %>
+    <%= link_to @message.sender.display_name, @message.sender %>

   <% else %>
     <%= user_thumbnail_tiny @message.recipient %>
   <% else %>
     <%= user_thumbnail_tiny @message.recipient %>

-    <%= link_to @message.recipient.display_name, user_path(@message.recipient) %>
+    <%= link_to @message.recipient.display_name, @message.recipient %>

   <% end %>
   <span class="ms-auto">
     <%= l @message.sent_on, :format => :friendly %>
   <% end %>
   <span class="ms-auto">
     <%= l @message.sent_on, :format => :friendly %>


@@ -22,9 +22,8 @@
     <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
     <%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
     <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>
     <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
     <%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
     <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>

-    <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>

   <% else %>
     <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>
   <% else %>
     <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>

-    <%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>

   <% end %>
   <% end %>

+  <%= link_to t(".back"), :back, :class => "btn btn-link" %>

 </div>
 </div>