X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/aa52ebe6749ba1ea43030f173bfe2101d0f77dc3..0c90905495a5d9fd40282456b4d4098da6adda48:/app/views/message/read.rhtml

diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml
index d20417e14..7a0d2bbe1 100644
--- a/app/views/message/read.rhtml
+++ b/app/views/message/read.rhtml
@@ -1,16 +1,30 @@
 <h2>Reading your messages</h2>
 
 <table>
-<th>from</th>
-<th>message</th>
-<th>date</th>
-<th>reply</th>
-<tr><td><%= (User.find_by_id(@message.from_user_id)).display_name %></td>
-<td><%= @message.body %></td>
-<td><%= @message.sent_on %></td>
-<td><%= link_to 'reply', :controller => 'message', :action => 'new', :user_id => @message.from_user_id %></td>
+  <tr>
+    <th align="right">From</th>
+    <td><%= link_to @message.sender.display_name, :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+  </tr>
+  <tr>
+    <th align="right">Subject</th>
+    <td><%= @message.title %></td>
+  </tr>
+  <tr>
+    <th align="right">Date</th>
+    <td><%= @message.sent_on %></td>
+  </tr>
+  <tr>
+    <th></th>
+    <td><%= @message.body %></td>
+  </tr>
 </table>
 
-<% form_tag :controller => 'message', :action => 'mark', :message_id => @message.id do %>
-<%= submit_tag 'Mark as read' %>
-<% end %>
+<br />
+
+<table>
+  <tr>
+    <td><%= button_to 'Reply', :controller => 'message', :action => 'new', :user_id => @message.from_user_id %></td>
+    <td><%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %></td>
+    <td><%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
+  </tr>
+</table>