X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9b36021ec5eabeca8db735cf80c5876d2d31338d..e42e95c3decfea7770c8d5b2df2fbd5bb3de17ef:/app/views/messages/show.html.erb diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 934cfb99a..9ade68121 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,40 +1,37 @@ -<% 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) %> + <%= link_to @message.sender.display_name, user_path(@message.sender) %>
<%= l @message.sent_on, :format => :friendly %>
-
<%= @message.body.to_html %>
- -
- <%= button_to t('.reply_button'), reply_message_path(@message), :class => 'reply-button' %> - <%= button_to t('.unread_button'), mark_message_path(@message, :mark => 'unread'), :class => 'mark-unread-button' %> - <%= button_to t('.destroy_button'), destroy_message_path(@message), :class => 'destroy-button' %> +
<%= @message.body.to_html %>
+
+ <%= 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 %> - -

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

-
<%= user_thumbnail_tiny @message.recipient %> - <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %> + <%= link_to @message.recipient.display_name, user_path(@message.recipient) %>
<%= l @message.sent_on, :format => :friendly %>
-
<%= @message.body.to_html %>
- -
+
<%= @message.body.to_html %>
-<% end %> - - <%= link_to t('.back'), outbox_messages_path, :class => "button deemphasize" %> +
+ <%= 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 %>