User form_tag/end instead of start_form_tag/end_form_tag to avoid

deprecation warnings.

app/views/diary_entry/new.rhtml

@@ -1,7 +1,7 @@
 <%= error_messages_for 'diary_entry' %>
 
-<%= start_form_tag :controller => 'diary_entry', :action => 'new' %>
+<% form_tag :controller => 'diary_entry', :action => 'new' do %>
 subject<%= text_field 'diary_entry', 'title' %><br>
 body<%= text_area 'diary_entry', 'body' %><br>
   <%= submit_tag 'Save' %>
-<% end_form_tag %>
+<% end %>

app/views/message/new.rhtml

@@ -9,11 +9,11 @@
 
 <%= error_messages_for 'message' %>
 
-<%= start_form_tag :controller => 'message', :action => 'new' %>
+<% form_tag :controller => 'message', :action => 'new' do %>
 subject: <%= text_field 'message', 'title' %><br>
 body: <%= text_area 'message', 'body' %><br>
   <%= submit_tag 'Send' %>
-<% end_form_tag %>
+<% end %>
 
 <br />
 

app/views/message/read.rhtml

@@ -11,6 +11,6 @@
 <td><%= link_to 'reply', :controller => 'message', :action => 'new', :user_id => @message.from_user_id %></td>
 </table>
 
-<%= start_form_tag :controller => 'message', :action => 'mark', :message_id => @message.id %>
+<% form_tag :controller => 'message', :action => 'mark', :message_id => @message.id do %>
 <%= submit_tag 'Mark as read' %>
-
+<% end %>

app/views/site/index.rhtml

@@ -1,11 +1,11 @@
 
 
 <div id="geocoder">
-  <%= start_form_tag :controller => 'geocoder', :action => 'search' %>
+  <% form_tag :controller => 'geocoder', :action => 'search' do %>
   <%= text_field 'query', 'postcode' %>
   <%= text_field 'query', 'place_name'%>
   <%= submit_tag 'Search' %>
-  <%= end_form_tag %>
+  <% end %>
 
   <div id="geocoder-attribution">
     Geolocation provided by <a href="http://npemap.org.uk/">npemap.org.uk</a>,

app/views/trace/mine.rhtml

@@ -14,7 +14,7 @@
 
 <% if @user %>
 
-<%= start_form_tag({:action => 'create'}, :multipart => true) %>
+<% form_tag({:action => 'create'}, :multipart => true) do %>
 <table>
 <table>
 <tr><td align="right">upload GPX file:</td><td><%= file_field('trace', 'gpx_file', {:size => 50, :maxlength => 255}) %></td></tr>
@@ -26,7 +26,7 @@
 </td></tr>
 </table>
 
-<%= end_form_tag %> 
+<% end %>
 
 <%= render (:partial => 'trace_paging_nav') %>
 <table id="keyvalue" cellpadding="3">

app/views/user/account.rhtml

@@ -1,6 +1,6 @@
 <h2>User details</h2>
 <%= error_messages_for 'user' %>
-<%= start_form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name %>
+<% form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name do %>
 <table style="width : 100%">
   <tr><td>Name</td><td><%= @user.email %></td></tr>
   <tr><td>Mapper since</td><td><%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)</td></tr>
@@ -18,7 +18,7 @@
   <tr><td valign="top">Description</td><td><%= text_area :user, :description, :value => @user.description, :class => "editDescription" %></td></tr>
 </table>
 <%= submit_tag 'Save Changes' %>
-<%= end_form_tag %>
+<% end %>
 
 <% nearest_str = "" %>
 <% if @user.home_lat and @user.home_lon %>
@@ -213,7 +213,7 @@ window.onload = init;
 <% else %>
   Currently your edits are anonymous and people can't find out where you are located. To show what you edited and allow people to contact you through the website, click the button below. This action cannot be reversed.
   <br /><br />
-  <%= start_form_tag :controller => 'user', :action => 'go_public'%>
+  <% form_tag :controller => 'user', :action => 'go_public' do %>
   <%= submit_tag 'Make all my edits public, forever' %>
-  <%= end_form_tag %>
+  <% end %>
 <% end %>

app/views/user/edit.rhtml

@@ -1,6 +1,6 @@
 <h2>Edit details:</h2>
 <%= error_messages_for 'user' %>
-<%= start_form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name %>
+<% form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name do %>
 <table>
   <tr><td>display name</td><td><%= text_field :user, :display_name, :value => @user.display_name %></td></tr>
   <tr><td valign="top">description</td><td><%= text_area :user, :description, :value => @user.description %></td></tr>
@@ -9,5 +9,4 @@
  
 </table>
 <%= submit_tag 'Change' %>
-<%= end_form_tag %>
-
+<% end %>

app/views/user/lost_password.rhtml

@@ -1,8 +1,9 @@
 <h1>Forgotten Password?</h1><br>
 
-<%= start_form_tag :action => 'lost_password' %>
+<% form_tag :action => 'lost_password' do %>
 <table>
   <tr><td>email address:</td><td><%= text_field('user', 'email', {:size => 50, :maxlength => 255} ) %></td></tr>
 </table>
 <br>
 <input type="submit" value="Send me a new password">
+<% end %>

app/views/user/new.rhtml

@@ -5,7 +5,7 @@ By creating an account, you agree that all work uploaded to openstreetmap.org an
 
 <%= error_messages_for 'user' %>
 
-<%= start_form_tag :action => 'save' %>
+<% form_tag :action => 'save' do %>
 <table>
   <tr><td>email:</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>
   <tr><td>login name</td><td><%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %></td></tr>
@@ -16,5 +16,4 @@ By creating an account, you agree that all work uploaded to openstreetmap.org an
 <br>
 <input type="submit" value="Signup">
 
-<%= end_form_tag %>
-
+<% end %>

app/views/way_tag/search.rhtml

@@ -1,10 +1,10 @@
 <h2>Search results</h5>
 fixme postcodes and geonames
 
-<%= start_form_tag :controller => 'way_tag', :action => 'search' %>
+<% form_tag :controller => 'way_tag', :action => 'search' do %>
 <%= text_field 'query', 'query'%>
 <%= submit_tag 'Search' %>
-<%= end_form_tag %>
+<% end %>
 
 
 <table border="0">