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

[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 113e566d82b74b4bcab5cbb423234ec852f9cddf..0b54adb1caecb87944ab19c5d940a86e8bbcff88 100644 (file)
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -1,24 +1,22 @@
-<h2><%= raw(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(@message.recipient.display_name), user_path(@message.recipient))) %></h2>
+<% end %>

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

-<%= form_for :message, :url => { :action => "new", :display_name => @to_user.display_name } do |f| %>
-  <table>
-    <tr valign="top">
-      <td class="fieldName"><%= t'message.new.subject' %></td>
-      <td><%= f.text_field :title, :size => 60, :value => @subject %></td>
-    </tr>
-    <tr valign="top">
-      <td class="fieldName"><%= t'message.new.body' %></td>
-      <td><%= f.text_area :body, :cols => 80, :value => @body %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td><%= submit_tag t('message.new.send_button') %></td>
-    </tr>
-  </table>
+<%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @message.recipient.display_name } do |f| %>
+  <fieldset>
+    <div class='form-row'>
+      <label class="standard-label"><%= t'message.new.subject' %></label>
+      <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
+    </div>
+    <div class='form-row'>
+      <label class="standard-label"><%= t'message.new.body' %></label>
+      <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
+    </div>
+    <div class='buttons'>
+      <%= submit_tag t('message.new.send_button') %>
+      <%= link_to t('message.new.back_to_inbox'), { :controller => 'message', :action => 'inbox', :display_name => current_user.display_name }, :class => 'deemphasize button' %>
+    </div>
+  </fieldset>

 <% end %>
 <% end %>

-
-<br />
-
-<%= link_to t('message.new.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>