X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78f38502cbe30aeddcd920a37ec6109f874a183a..1c7ead6008397ce815de4102d023a708be636a3c:/app/views/messages/show.html.erb?ds=inline diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 74c61669f..99d6d0435 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,37 +1,29 @@ <% content_for :heading do %> -

<%= @message.title %>

+

<%= @message.title %>

<% end %> -<% if current_user == @message.recipient %> -
+
+ <% if current_user == @message.recipient %> <%= user_thumbnail_tiny @message.sender %> - <%= link_to @message.sender.display_name, user_path(@message.sender) %> -
- <%= l @message.sent_on, :format => :friendly %> -
-
+ <%= link_to @message.sender.display_name, @message.sender %> + <% else %> + <%= user_thumbnail_tiny @message.recipient %> + <%= link_to @message.recipient.display_name, @message.recipient %> + <% end %> + + <%= l @message.sent_on, :format => :friendly %> + +
-
<%= @message.body.to_html %>
+
<%= @message.body.to_html %>
-
- <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %> +
+ <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %> + <% if current_user == @message.recipient %> <%= 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 %> -
- <%= user_thumbnail_tiny @message.recipient %> - <%= link_to @message.recipient.display_name, user_path(@message.recipient) %> -
- <%= l @message.sent_on, :format => :friendly %> -
-
- -
<%= @message.body.to_html %>
- -
+ <% 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" %> +