Added & cleaned up messages relating to a given user not existing

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

diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml
index d20417e14a475c6e21afb419bdb8704ad9112499..8a7b6b1563c235340f6969e42a320f5b53b3497e 100644 (file)
--- a/app/views/message/read.rhtml
+++ b/app/views/message/read.rhtml
@@ -1,16 +1,70 @@
-<h2>Reading your messages</h2>
+<% if @user == @message.recipient %>
+
+<h2><%= t'message.read.reading_your_messages' %></h2>
+
+<table>
+  <tr>
+    <th align="right"><%= t'message.read.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 align="right"><%= t'message.read.subject' %></th>
+    <td><%= h(@message.title) %></td>
+  </tr>
+  <tr>
+    <th align="right"><%= t'message.read.date' %></th>
+    <td><%= l @message.sent_on %></td>
+  </tr>
+  <tr>
+    <th></th>
+    <td><%= htmlize(@message.body) %></td>
+  </tr>
+</table>
+
+<br />
+
+<table>
+  <tr>
+    <td><%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %></td>
+    <td><%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %></td>
+    <td><%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
+  </tr>
+</table>
+
+<% else %>
+
+<h2><%= t'message.read.reading_your_sent_messages' %></h2>
+
+<table>
+  <tr>
+    <th align="right"><%= t'message.read.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"><%= t'message.read.subject' %></th>
+    <td><%= h(@message.title) %></td>
+  </tr>
+  <tr>
+    <th align="right"><%= t'message.read.date' %></th>
+    <td><%= l @message.sent_on %></td>
+  </tr>
+  <tr>
+    <th></th>
+    <td><%= htmlize(@message.body) %></td>
+  </tr>
+</table>
+
+<br />
 
 <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>
+    <td><%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %></td>
+  </tr>
 </table>
 
-<% form_tag :controller => 'message', :action => 'mark', :message_id => @message.id do %>
-<%= submit_tag 'Mark as read' %>
 <% end %>