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

[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 35f5b4a0422505642ae4a1f773cc3bfa6fee505d..03454767a6c0eff7414d2bfccffa333b3d8b5131 100644 (file)
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@message.recipient.display_name), {:controller => 'user', :action => 'view', :display_name => @message.recipient.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' %>
 <% end %>
 
 <%= error_messages_for 'message' %>


@@ -7,16 +7,16 @@
 <%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @message.recipient.display_name } do |f| %>
   <fieldset>
     <div class='form-row'>
 <%= 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>
+      <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'>
       <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
     </div>
     <div class='form-row'>

-      <label class="standard-label"><%= t'message.new.body' %></label>
+      <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') %>
       <%= 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 %>
     </div>
   </fieldset>
 <% end %>