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

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

diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index dedace3d7657956b49802c45599be8c2ef703316..0918a23f015f84acd39aef22fdeedc1e29710892 100644 (file)
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= raw(t ".send_message_to", :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %></h2>
+  <h2><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, user_path(@message.recipient))) %></h2>

 <% end %>
 
 <%= error_messages_for "message" %>
 <% end %>
 
 <%= error_messages_for "message" %>


@@ -7,16 +7,16 @@
 <%= form_for @message, :html => { :class => "standard-form" } do |f| %>
   <%= hidden_field_tag :display_name, @message.recipient.display_name %>
   <fieldset>
 <%= form_for @message, :html => { :class => "standard-form" } do |f| %>
   <%= hidden_field_tag :display_name, @message.recipient.display_name %>
   <fieldset>

-    <div class='form-row'>
+    <div class='standard-form-row'>

       <label class="standard-label" for="message_title"><%= t ".subject" %></label>
       <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
     </div>
       <label class="standard-label" for="message_title"><%= t ".subject" %></label>
       <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
     </div>

-    <div class='form-row'>
+    <div class='standard-form-row'>

       <label class="standard-label" for="message_body"><%= t ".body" %></label>
       <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
     </div>
     <div class='buttons'>
       <label class="standard-label" for="message_body"><%= t ".body" %></label>
       <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
     </div>
     <div class='buttons'>

-      <%= submit_tag t(".send_button") %>
+      <%= f.submit %>

       <%= link_to t(".back_to_inbox"), inbox_messages_path, :class => "deemphasize button" %>
     </div>
   </fieldset>
       <%= link_to t(".back_to_inbox"), inbox_messages_path, :class => "deemphasize button" %>
     </div>
   </fieldset>