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

diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb
index 8a7b6b156..de36cafe8 100644
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -1,70 +1,37 @@
+<div class='text-content'>
 <% if @user == @message.recipient %>
 
-<h2><%= t'message.read.reading_your_messages' %></h2>
+    <h2><%= h(@message.title) %></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>
+    <div class='info-line'>
+        <%= user_thumbnail_tiny @message.sender %>
+        <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+        <div class='right'>
+            <%= l @message.sent_on, :format => :friendly %>
+            <%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %>
+            <%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %>
+        </div>
+    </div>
 
-<br />
+    <%= @message.body.to_html %></td>
 
-<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>
+    <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
 
 <% else %>
 
-<h2><%= t'message.read.reading_your_sent_messages' %></h2>
+    <h2><%= h(@message.title) %></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>
+    <div class='info-line'>
+        <%= user_thumbnail_tiny @message.recipient %>
+        <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+        <div class='right'>
+            <%= l @message.sent_on, :format => :friendly %>
+        </div>
+    </div>
 
-<br />
+    <%= @message.body.to_html %></td>
 
-<table>
-  <tr>
-    <td><%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %></td>
-  </tr>
-</table>
+    <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
 
 <% end %>
+</div>