Merge remote-tracking branch 'upstream/pull/1857'

[rails.git] / app / views / message / read.html.erb

diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb
index 6bad015cc8c111b7059c8bdc556348914e801f83..c18b586a44b12c080bc0c107054e680dea6e2a54 100644 (file)
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -1,73 +1,40 @@
-<% if @user == @message.recipient %>
-
-<h2><%= t'message.read.reading_your_messages' %></h2>
-
-<table>
-  <tr>
-    <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 class="fieldName"><%= t'message.read.subject' %></th>
-    <td><%= h(@message.title) %></td>
-    <td></td>
-  </tr>
-  <tr>
-    <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></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>
+<% if current_user == @message.recipient %>
+  <% content_for :heading do %>
+    <h2><%= h(@message.title) %></h2>
+  <% end %>
+
+  <div class='info-line clearfix'>
+    <%= user_thumbnail_tiny @message.sender %>
+    <%= link_to h(@message.sender.display_name), user_path(@message.sender) %></td>
+    <div class='right'>
+      <%= l @message.sent_on, :format => :friendly %>
+    </div>
+  </div>
+
+  <div class="richtext"><%= @message.body.to_html %></div>
+
+  <div class='message-buttons buttons'>
+    <%= button_to t('.reply_button'), reply_message_path(@message), :class => 'reply-button' %>
+    <%= button_to t('.unread_button'), mark_message_path(@message, :mark => 'unread'), :class => 'mark-unread-button' %>
+    <%= button_to t('.delete_button'), delete_message_path(@message), :class => 'delete-button' %>

 
 <% else %>
 
 
 <% else %>
 

-<h2><%= t'message.read.reading_your_sent_messages' %></h2>
+  <h2><%= h(@message.title) %></h2>

 
 

-<table>
-  <tr>
-    <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 class="fieldName"><%= t'message.read.subject' %></th>
-    <td><%= h(@message.title) %></td>
-    <td></td>
-  </tr>
-  <tr>
-    <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></td>
-  </tr>
-</table>
+  <div class='info-line clearfix'>
+    <%= user_thumbnail_tiny @message.recipient %>
+    <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %></td>
+    <div class='right'>
+      <%= l @message.sent_on, :format => :friendly %>
+    </div>
+  </div>

 
 

-<br />
+  <div class="richtext"><%= @message.body.to_html %></div>

 
 

-<table>
-  <tr>
-    <td><%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %></td>
-  </tr>
-</table>
+  <div class='message-buttons buttons'>

 
 <% end %>
 
 <% end %>

+
+  <%= link_to t('.back'), outbox_path(current_user), :class => "button deemphasize" %>
+  </div>