X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..4965c19b7a8c96ab87b543af1fc36a1ad7514c09:/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 8ad5af9dd..8fe508469 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,40 +1,29 @@ -<% if current_user == @message.recipient %> - <% content_for :heading do %> -

<%= h(@message.title) %>

- <% end %> +<% content_for :heading do %> +

<%= @message.title %>

+<% end %> -
+
+ <% if current_user == @message.recipient %> <%= user_thumbnail_tiny @message.sender %> - <%= link_to h(@message.sender.display_name), user_path(@message.sender) %> -
- <%= l @message.sent_on, :format => :friendly %> -
-
- -
<%= @message.body.to_html %>
- -
- <%= button_to t(".reply_button"), message_reply_path(@message), :class => "reply-button" %> - <%= button_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :class => "mark-unread-button" %> - <%= button_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "destroy-button" %> - -<% else %> - -

<%= h(@message.title) %>

- -
+ <%= link_to @message.sender.display_name, @message.sender %> + <% else %> <%= user_thumbnail_tiny @message.recipient %> - <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %> -
- <%= l @message.sent_on, :format => :friendly %> -
-
- -
<%= @message.body.to_html %>
- -
- -<% end %> - - <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %> -
+ <%= link_to @message.recipient.display_name, @message.recipient %> + <% end %> + + <%= l @message.sent_on, :format => :friendly %> + +
+ +
<%= @message.body.to_html %>
+ +
+ <% if current_user == @message.recipient %> + <%= 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" %> + <% else %> + <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %> + <% end %> + <%= link_to t(".back"), :back, :class => "btn btn-link" %> +