JSON: return HTTP 406 for unsupported formats

[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 934cfb99a74499a27fa43372fffea2bc5674613d..ea4f5e40df5e2f0473cf4cdc49ba7c9f41b3ca35 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -14,9 +14,11 @@
   <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" %>
+    <%= link_to t(".back"), inbox_messages_path, :class => "button deemphasize" %>
+  </div>

 
 <% else %>
 
 
 <% else %>
 


@@ -33,8 +35,7 @@
   <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'>

+    <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>
+  </div>

 
 <% end %>
 
 <% end %>

-
-  <%= link_to t('.back'), outbox_messages_path, :class => "button deemphasize" %>
-  </div>