Merge remote-tracking branch 'upstream/pull/2167'

[rails.git] / app / views / messages / show.html.erb

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 4d2f6f6ce9b7124df088f54143618fb469cafc1a..e3634e232807a9600e6157d41a017e5ffed93784 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -14,9 +14,9 @@
   <div class="richtext"><%= @message.body.to_html %></div>
 
   <div class='message-buttons buttons'>
   <div class="richtext"><%= @message.body.to_html %></div>
 
   <div class='message-buttons buttons'>

-    <%= 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' %>
+    <%= 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 %>
 
 
 <% else %>
 


@@ -36,5 +36,5 @@
 
 <% end %>
 
 
 <% end %>
 

-  <%= link_to t('.back'), outbox_path(current_user), :class => "button deemphasize" %>
+  <%= link_to t('.back'), outbox_messages_path, :class => "button deemphasize" %>

   </div>
   </div>