Use correct names for member types.

[rails.git] / app / views / message / read.rhtml

diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml
index b84fea4c7c60f7b0e2606c7235297d755b623601..d44859029dea35f7cadda8002239b8120943d419 100644 (file)
--- a/app/views/message/read.rhtml
+++ b/app/views/message/read.rhtml
@@ -1,21 +1,28 @@
+<% if @user == @message.recipient %>
+
 <h2>Reading your messages</h2>
 
 <table>
   <tr>
-    <th>From</th>
-    <td><%= link_to @message.sender.display_name, :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+    <th align="right">From</th>
+    <td>
+     <% if @message.sender.image %>
+        <%= image_tag url_for_file_column(@message.sender, "image") %>
+      <% end %>
+  
+<%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
   </tr>
   <tr>
-    <th>Subject</th>
-    <td><%= @message.title %></td>
+    <th align="right">Subject</th>
+    <td><%= h(@message.title) %></td>
   </tr>
   <tr>
-    <th>Date</th>
+    <th align="right">Date</th>
     <td><%= @message.sent_on %></td>
   </tr>
   <tr>
-    <th>Message</th>
-    <td><%= @message.body %></td>
+    <th></th>
+    <td><%= htmlize(@message.body) %></td>
   </tr>
 </table>
 
@@ -23,8 +30,41 @@
 
 <table>
   <tr>
-    <td><%= button_to 'Reply', :controller => 'message', :action => 'new', :user_id => @message.from_user_id %></td>
+    <td><%= button_to 'Reply', :controller => 'message', :action => 'reply', :message_id => @message.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>
+
+<% else %>
+
+<h2>Reading your sent messages</h2>
+
+<table>
+  <tr>
+    <th align="right">To</th>
+    <td><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+  </tr>
+  <tr>
+    <th align="right">Subject</th>
+    <td><%= h(@message.title) %></td>
+  </tr>
+  <tr>
+    <th align="right">Date</th>
+    <td><%= @message.sent_on %></td>
+  </tr>
+  <tr>
+    <th></th>
+    <td><%= htmlize(@message.body) %></td>
+  </tr>
+</table>
+
+<br />
+
+<table>
+  <tr>
+    <td><%= link_to 'Back to outbox', :controller => 'message', :action => 'outbox', :display_name => @user.display_name %></td>
+  </tr>
+</table>
+
+<% end %>