X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7d52305640d647d97c7904e447ad48e6d0e2f694..488efc3df8f18cd867d3eb9c5b595d7bd8e1d362:/app/views/message/new.rhtml

diff --git a/app/views/message/new.rhtml b/app/views/message/new.rhtml
index 4075d543e..d66e7caed 100644
--- a/app/views/message/new.rhtml
+++ b/app/views/message/new.rhtml
@@ -1,20 +1,32 @@
-<% display_name = (User.find_by_id(params[:user_id])).display_name %>
+<% display_name = User.find_by_id(params[:user_id]).display_name %>
+<% title = params[:message] ? params[:message][:title] : params[:title] %>
 
-<h2>Send a new message to <%= display_name %></h2>
+<h2>Send a new message to <%= h(display_name) %></h2>
 
 <% if params[:display_name] %>
-<p>Writing a new message to <%= params[:display_name] %></p>  
+<p>Writing a new message to <%= h(params[:display_name]) %></p>  
 <p>TODO: drop down box of your friends</p>
 <%end%>
 
 <%= error_messages_for 'message' %>
 
-<%= start_form_tag :controller => 'message', :action => 'new' %>
-subject: <%= text_field 'message', 'title' %><br>
-body: <%= text_area 'message', 'body' %><br>
-  <%= submit_tag 'Send' %>
-<% end_form_tag %>
+<% form_for :message do |f| %>
+  <table>
+    <tr valign="top">
+      <th>Subject</th>
+      <td><%= text_field_tag 'message[title]', title, :size => 60 %></td>
+    </tr>
+    <tr valign="top">
+      <th>Body</th>
+      <td><%= f.text_area :body, :cols => 80 %></td>
+    </tr>
+    <tr>
+      <th></th>
+      <td><%= submit_tag 'Send' %></td>
+    </tr>
+  </table>
+<% end %>
 
 <br />
 
-<%= link_to 'Back to my account', :controller => 'user', :action => 'account' %>
+<%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>