X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2827d8ad812850815a0af7c423dcbe58203e5816..9d739b3d5b0450ea1a24dd86c5e15477866c0a41:/app/views/message/new.html.erb?ds=sidebyside

diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index 32344a3e9..03454767a 100644
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -1,22 +1,22 @@
 <% 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>
+  <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' %>
 
-<%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @this_user.display_name } do |f| %>
+<%= 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, :value => @subject %>
+      <label class="standard-label" for="message_title"><%= 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, :value => @body %>
+      <label class="standard-label" for="message_body"><%= 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'), { :controller => 'message', :action => 'inbox', :display_name => @user.display_name }, :class => 'deemphasize 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 %>