User form_tag/end instead of start_form_tag/end_form_tag to avoid

deprecation warnings.

diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index ead58944ce521e5e290c6db14b3c299434537b3e..d0a58cec50654c1a2e0f088defceceaa1a6e00bf 100644 (file)
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -1,7 +1,7 @@
 <%= error_messages_for 'diary_entry' %>
 
 <%= 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' %>
 subject<%= text_field 'diary_entry', 'title' %><br>
 body<%= text_area 'diary_entry', 'body' %><br>
   <%= submit_tag 'Save' %>

-<% end_form_tag %>
+<% end %>

diff --git a/app/views/message/new.rhtml b/app/views/message/new.rhtml
index 4075d543e1e16d7c084b54e4b33ee342ef4c23b1..6e268e905b1f6d42b7761a431bde9ce8838ba521 100644 (file)
--- a/app/views/message/new.rhtml
+++ b/app/views/message/new.rhtml
@@ -9,11 +9,11 @@
 
 <%= error_messages_for 'message' %>
 
 
 <%= 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' %>
 subject: <%= text_field 'message', 'title' %><br>
 body: <%= text_area 'message', 'body' %><br>
   <%= submit_tag 'Send' %>

-<% end_form_tag %>
+<% end %>

 
 <br />
 
 
 <br />
 

diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml
index 1e2a3bf5b27405e889e061e93e1d84d6897b7d9a..d20417e14a475c6e21afb419bdb8704ad9112499 100644 (file)
--- a/app/views/message/read.rhtml
+++ b/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>
 
 <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' %>
 <%= submit_tag 'Mark as read' %>

-
+<% end %>

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index d540836d7cdec0a27c16fe5788a0175247c8b629..31b8fcd70f5a85fd6b5e45041903b598b062bbe7 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,11 +1,11 @@
 
 
 <div id="geocoder">
 
 
 <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' %>
   <%= 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>,
 
   <div id="geocoder-attribution">
     Geolocation provided by <a href="http://npemap.org.uk/">npemap.org.uk</a>,

diff --git a/app/views/trace/mine.rhtml b/app/views/trace/mine.rhtml
index e403d591bba707566b53cc1155c44919ad38c18b..a626e2b514959b0bd7706e28b1eae02f673e2733 100644 (file)
--- a/app/views/trace/mine.rhtml
+++ b/app/views/trace/mine.rhtml
@@ -14,7 +14,7 @@
 
 <% if @user %>
 
 
 <% 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>
 <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>
 
 </td></tr>
 </table>
 

-<%= end_form_tag %> 
+<% end %>

 
 <%= render (:partial => 'trace_paging_nav') %>
 <table id="keyvalue" cellpadding="3">
 
 <%= render (:partial => 'trace_paging_nav') %>
 <table id="keyvalue" cellpadding="3">

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index bbede9fed139ad653f9cf034c3ca3319634a1e15..eafa2d5f4aab47116652e80357d7bdde19d8810b 100644 (file)
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -1,6 +1,6 @@
 <h2>User details</h2>
 <%= error_messages_for 'user' %>
 <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>
 <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' %>
   <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 %>
 
 <% 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 />
 <% 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' %>
   <%= submit_tag 'Make all my edits public, forever' %>

-  <%= end_form_tag %>
+  <% end %>

 <% end %>
 <% end %>

diff --git a/app/views/user/edit.rhtml b/app/views/user/edit.rhtml
index 65f028f16e1c96f4e13a4ba61c84728e20528c1d..a5ef3c7990ddfe71802f96333de78cc818876a95 100644 (file)
--- a/app/views/user/edit.rhtml
+++ b/app/views/user/edit.rhtml
@@ -1,6 +1,6 @@
 <h2>Edit details:</h2>
 <%= error_messages_for 'user' %>
 <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>
 <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' %>
  
 </table>
 <%= submit_tag 'Change' %>

-<%= end_form_tag %>
-
+<% end %>

diff --git a/app/views/user/lost_password.rhtml b/app/views/user/lost_password.rhtml
index ab60cd8457f0f3a3436c48e0e18fa5cf924d8b4c..003b256b232cab3285ada5726f2cef431f915360 100644 (file)
--- a/app/views/user/lost_password.rhtml
+++ b/app/views/user/lost_password.rhtml
@@ -1,8 +1,9 @@
 <h1>Forgotten Password?</h1><br>
 
 <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">
 <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 %>

diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index 409e30a658de63af6185ae265ed6686b05ea20c2..242c27548dbe70c0e00721fc6d5c630108162953 100644 (file)
--- a/app/views/user/new.rhtml
+++ b/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' %>
 
 
 <%= 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>
 <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">
 
 <br>
 <input type="submit" value="Signup">
 

-<%= end_form_tag %>
-
+<% end %>

diff --git a/app/views/way_tag/search.rhtml b/app/views/way_tag/search.rhtml
index 2a475fda98f138c86d3b471a4d5f65f24695553b..820bad7db48ef79ac442b4540d39d5d7feacdc8d 100644 (file)
--- a/app/views/way_tag/search.rhtml
+++ b/app/views/way_tag/search.rhtml
@@ -1,10 +1,10 @@
 <h2>Search results</h5>
 fixme postcodes and geonames
 
 <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' %>
 <%= text_field 'query', 'query'%>
 <%= submit_tag 'Search' %>

-<%= end_form_tag %>
+<% end %>

 
 
 <table border="0"> 
 
 
 <table border="0">