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

[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 532f3d71ee335558f36dce2004ad04d23193d233..2899c2ff7aee3ae4fb87e9843d378ca76135c0e8 100644 (file)
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,23 +1,12 @@
 <% 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" %>
-
-<%= form_for @message, :html => { :class => "standard-form" } do |f| %>
+<%= bootstrap_form_for @message do |f| %>
   <%= hidden_field_tag :display_name, @message.recipient.display_name %>
-  <fieldset>
-    <div class='form-row'>
-      <label class="standard-label" for="message_title"><%= t ".subject" %></label>
-      <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
-    </div>
-    <div class='form-row'>
-      <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") %>
-      <%= link_to t(".back_to_inbox"), inbox_messages_path, :class => "deemphasize button" %>
-    </div>
-  </fieldset>
+  <%= f.text_field :title %>
+  <%= f.richtext_field :body, :cols => 80, :rows => 20 %>
+
+  <%= f.primary %>
+  <%= link_to t(".back_to_inbox"), inbox_messages_path, :class => "btn btn-link" %>
 <% end %>