Merge branch 'pull/5141'

[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 e33bc176d107427b31678f9fbe2602111348a119..2838a5dab1c93ca9ba866e9451f049e0e7ca5eab 100644 (file)
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,22 +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>
+  <h1><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, @message.recipient)) %></h1>
 <% end %>
 
-<%= error_messages_for 'message' %>
+<%= bootstrap_form_for @message do |f| %>
+  <%= hidden_field_tag :display_name, @message.recipient.display_name, :autocomplete => "off" %>
+  <%= f.text_field :title %>
+  <%= f.richtext_field :body, :cols => 80, :rows => 20 %>
 
-<%= form_for :message, :html => { :class => 'standard-form' }, :url => new_message_path(@message.recipient) do |f| %>
-  <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.primary %>
+  <%= link_to t(".back_to_inbox"), inbox_messages_path, :class => "btn btn-link" %>
 <% end %>