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 f3d6ef1394a4ad243dc51edf3e4fd6831578a398..c18b586a44b12c080bc0c107054e680dea6e2a54 100644 (file)
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -1,21 +1,22 @@
-<% if @user == @message.recipient %>
+<% 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 %>
   <% 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), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+    <%= link_to h(@message.sender.display_name), user_path(@message.sender) %></td>

     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     <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>
 
   <div class="richtext"><%= @message.body.to_html %></div>
 
     </div>
   </div>
 
   <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('.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 %>
 


@@ -23,7 +24,7 @@
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>
 
   <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>
+    <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %></td>

     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>


@@ -31,6 +32,9 @@
 
   <div class="richtext"><%= @message.body.to_html %></div>
 
 
   <div class="richtext"><%= @message.body.to_html %></div>
 

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

 
 <% end %>
 
 <% end %>

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