Remove reference to large screen stylesheet

[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..6621c3e8ed760481bc87a39749c6ff7c48ca477e 100644 (file)
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -1,4 +1,4 @@
-<% if @user == @message.recipient %>
+<% if current_user == @message.recipient %>

   <% content_for :heading do %>
     <h2><%= h(@message.title) %></h2>
   <% end %>
   <% content_for :heading do %>
     <h2><%= h(@message.title) %></h2>
   <% end %>


@@ -8,14 +8,15 @@
     <%= 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 %>
     <%= 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>
 
   <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('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' %>
+    <%= button_to t('message.read.delete_button'), {:controller => 'message', :action => 'delete', :message_id => @message.id}, :class => 'delete-button' %>

 
 <% else %>
 
 
 <% else %>
 


@@ -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('message.read.back'), {:controller => 'message', :action => 'outbox', :display_name => current_user.display_name }, :class => "button deemphasize" %>
+  </div>