Refactor the relation_for_nwr tests to use factories

[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 0fbef1d8c8f1d9d0016887c94eaaa89dceb72de1..0c9b622e8e11a393e0e9505156f924dfcc4b3e40 100644 (file)
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -1,37 +1,39 @@
-<div class='text-content'>
 <% if @user == @message.recipient %>
-
+  <% content_for :heading do %>
     <h2><%= h(@message.title) %></h2>
+  <% end %>
 
-    <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 class='info-line clearfix'>
+    <%= 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 %>
     </div>
+  </div>
 
-    <%= @message.body.to_html %></td>
+  <div class="richtext"><%= @message.body.to_html %></div>
 
-    <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
+  <div class='message-buttons buttons'>
+    <%= button_to t('message.read.reply_button'), {:controller => 'message', :action => 'reply', :message_id => @message.id}, :class => 'reply-button' %>
+    <%= button_to t('message.read.unread_button'), {:controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread'}, :class => 'mark-unread-button' %>
 
 <% else %>
 
-    <h2><%= h(@message.title) %></h2>
+  <h2><%= h(@message.title) %></h2>
 
-    <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 class='info-line clearfix'>
+    <%= 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>
 
-    <%= @message.body.to_html %></td>
+  <div class="richtext"><%= @message.body.to_html %></div>
 
-    <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
+  <div class='message-buttons buttons'>
 
 <% end %>
-</div>
+
+  <%= link_to t('message.read.back'), {:controller => 'message', :action => 'outbox', :display_name => @user.display_name }, :class => "button deemphasize" %>
+  </div>