X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4189e150f659915dcda7bb130cc2fa1a86afaf51..8a6c34fa78cf4fa52332d90448dae50087f2b510:/app/views/messages/show.html.erb
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 3631467fd..4761aac60 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -1,41 +1,30 @@
-<% if current_user == @message.recipient %>
- <% content_for :heading do %>
-
+
+ <% 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, user_path(@message.sender) %>
+ <% else %>
+ <%= user_thumbnail_tiny @message.recipient %>
+ <%= link_to @message.recipient.display_name, user_path(@message.recipient) %>
+ <% end %>
+
+ <%= l @message.sent_on, :format => :friendly %>
+
+
-
+
+ <% 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-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 %>
-
-
<%= @message.title %>
-
-
- <%= 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 %>
+