X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3af16f6337b52546297e7e09a1aba9b0e1df7e15..8ff838ae457598fb5828b65948e1b55d21759b06:/app/views/messages/show.html.erb diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 8ad5af9dd..3631467fd 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,11 +1,11 @@ <% if current_user == @message.recipient %> <% content_for :heading do %> -

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

+

<%= @message.title %>

<% end %>
<%= 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 %>
@@ -13,28 +13,29 @@
<%= @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" %> +
+ <%= 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-primary" %> + <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %> +
<% else %> -

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

+

<%= @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 %>
-
+
+ <%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %> +
<% end %> - - <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %> -