Merge branch 'master' into notes

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

diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index 151cd275936ab6fd25c4e7ae6de4bec6ac6ceb6b..96f6b080d945823db4f7c948b39599e06aea3f6d 100644 (file)
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -1,19 +1,21 @@
-<h2><%= t'message.new.send_message_to', :name => link_to(h(@to_user.display_name), {:controller => 'user', :action => 'view', :display_name => @to_user.display_name}) %></h2>
+<% content_for :heading do %>
+  <h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h2>
+<% end %>

 
 <%= error_messages_for 'message' %>
 
 
 <%= error_messages_for 'message' %>
 

-<% form_for :message, :url => { :action => "new", :display_name => @to_user.display_name } do |f| %>
+<%= form_for :message, :url => { :action => "new", :display_name => @this_user.display_name } do |f| %>

   <table>
     <tr valign="top">
   <table>
     <tr valign="top">

-      <th><%= t'message.new.subject' %></th>
+      <td class="fieldName"><%= t'message.new.subject' %></td>

       <td><%= f.text_field :title, :size => 60, :value => @subject %></td>
     </tr>
     <tr valign="top">
       <td><%= f.text_field :title, :size => 60, :value => @subject %></td>
     </tr>
     <tr valign="top">

-      <th><%= t'message.new.body' %></th>
-      <td><%= f.text_area :body, :cols => 80, :value => @body %></td>
+      <td class="fieldName"><%= t'message.new.body' %></td>
+      <td><%= richtext_area :message, :body, :cols => 80, :value => @body %></td>

     </tr>
     <tr>
     </tr>
     <tr>

-      <th></th>
+      <td></td>

       <td><%= submit_tag t('message.new.send_button') %></td>
     </tr>
   </table>
       <td><%= submit_tag t('message.new.send_button') %></td>
     </tr>
   </table>