X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/edaddbedaec78a252e988e2271962407e64483fd..2638cd525262321f28479e5c5598866b4e2fd93e:/app/views/message/read.html.erb

diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb
index 8a7b6b156..d829c79e9 100644
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -4,25 +4,24 @@
 
 <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>
+    <th class="fieldName"><%= t'message.read.from' %></th>
+    <td><%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+    <td rowspan="4" valign="top"><%= user_thumbnail @message.sender %></td>
   </tr>
   <tr>
-    <th align="right"><%= t'message.read.subject' %></th>
+    <th class="fieldName"><%= t'message.read.subject' %></th>
     <td><%= h(@message.title) %></td>
+    <td></td>
   </tr>
   <tr>
-    <th align="right"><%= t'message.read.date' %></th>
-    <td><%= l @message.sent_on %></td>
+    <th class="fieldName"><%= t'message.read.date' %></th>
+    <td><%= l @message.sent_on, :format => :friendly %></td>
+    <td></td>
   </tr>
   <tr>
     <th></th>
-    <td><%= htmlize(@message.body) %></td>
+    <td><%= @message.body.to_html %></td>
+    <td></td>
   </tr>
 </table>
 
@@ -42,20 +41,24 @@
 
 <table>
   <tr>
-    <th align="right"><%= t'message.read.to' %></th>
+    <th class="fieldName"><%= t'message.read.to' %></th>
     <td><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+    <td rowspan="4" valign="top"><%= user_thumbnail @message.recipient %></td>
   </tr>
   <tr>
-    <th align="right"><%= t'message.read.subject' %></th>
+    <th class="fieldName"><%= t'message.read.subject' %></th>
     <td><%= h(@message.title) %></td>
+    <td></td>
   </tr>
   <tr>
-    <th align="right"><%= t'message.read.date' %></th>
-    <td><%= l @message.sent_on %></td>
+    <th class="fieldName"><%= t'message.read.date' %></th>
+    <td><%= l @message.sent_on, :format => :friendly %></td>
+    <td></td>
   </tr>
   <tr>
     <th></th>
-    <td><%= htmlize(@message.body) %></td>
+    <td><%= @message.body.to_html %></td>
+    <td></td>
   </tr>
 </table>