X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f47eeb0632d63b5f305e52d3758a38044b350a20..29020530a8fabe1d02e3bc9c41970c9030efc380:/app/views/messages/show.html.erb?ds=sidebyside diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 4761aac60..8fe508469 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -2,13 +2,13 @@

<%= @message.title %>

<% end %> -
+
<% 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 %> - <%= link_to @message.recipient.display_name, user_path(@message.recipient) %> + <%= link_to @message.recipient.display_name, @message.recipient %> <% end %> <%= 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(".back"), inbox_messages_path, :class => "btn btn-link" %> <% 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 %> + <%= link_to t(".back"), :back, :class => "btn btn-link" %>