<% %> style block helpers are deprecated

47 files changed, 65 insertions, 65 deletions

diff --git a/app/views/admin_censor_rule/edit.rhtml b/app/views/admin_censor_rule/edit.rhtml
index e34e022a0..844908418 100644
--- a/app/views/admin_censor_rule/edit.rhtml
+++ b/app/views/admin_censor_rule/edit.rhtml
@@ -2,12 +2,12 @@
 
 <h1><%=@title%></h1>
 
-<% form_tag '../update/' + @censor_rule.id.to_s do %>
+<%= form_tag '../update/' + @censor_rule.id.to_s do %>
    <%= render :partial => 'form', :locals => { :info_request => @censor_rule.info_request, :user => @censor_rule.user } %>
   <p><%= submit_tag 'Save', :accesskey => 's' %></p>
 <% end %>
 
-<% form_tag('../destroy/' + @censor_rule.id.to_s) do %>
+<%= form_tag('../destroy/' + @censor_rule.id.to_s) do %>
    <p>
    <%= hidden_field_tag(:censor_rule_id, @censor_rule.id) %>
    Permanent! --&gt; <%= submit_tag "Destroy rule" %>
diff --git a/app/views/admin_censor_rule/new.rhtml b/app/views/admin_censor_rule/new.rhtml
index c6b8cea6a..ad3bf7e8e 100644
--- a/app/views/admin_censor_rule/new.rhtml
+++ b/app/views/admin_censor_rule/new.rhtml
@@ -2,7 +2,7 @@
 
 <h1><%=@title%></h1>
 
-<% form_tag 'create' do %>
+<%= form_tag 'create' do %>
   <%= render :partial => 'form', :locals => { :info_request => @info_request, :user => @user } %>
   <p><%= submit_tag "Create" %></p>
 <% end %>
diff --git a/app/views/admin_public_body/_one_list.rhtml b/app/views/admin_public_body/_one_list.rhtml
index e0d2399d0..2925c5e33 100644
--- a/app/views/admin_public_body/_one_list.rhtml
+++ b/app/views/admin_public_body/_one_list.rhtml
@@ -17,7 +17,7 @@
 <% end %>
 </table>
 
-<% form_tag(admin_url("body/mass_tag_add"), :method => "post", :class => "forms_on_one_line" ) do %>
+<%= form_tag(admin_url("body/mass_tag_add"), :method => "post", :class => "forms_on_one_line" ) do %>
     <p>
        <%= text_field_tag 'new_tag', params[:new_tag], { :size => 15, :id => "mass_add_tag_new_tag_" + table_name } %>
        <%= hidden_field_tag(:query, params[:query], { :id => "mass_add_tag_query_" + table_name } ) %>
diff --git a/app/views/admin_public_body/edit.rhtml b/app/views/admin_public_body/edit.rhtml
index b19477a6b..5d85ae756 100644
--- a/app/views/admin_public_body/edit.rhtml
+++ b/app/views/admin_public_body/edit.rhtml
@@ -9,7 +9,7 @@
 <%= render :partial => 'tag_help' %>
 
 <div id="public_body_form">
-    <% form_tag '../update/' + @public_body.id.to_s do %>
+    <%= form_tag '../update/' + @public_body.id.to_s do %>
       <%= render :partial => 'form' %>
       <p><%= submit_tag 'Save', :accesskey => 's' %></p>
     <% end %>
@@ -20,7 +20,7 @@
     </p>
 
     <% if @public_body.info_requests.size == 0 %>
-        <% form_tag('../destroy/' + @public_body.id.to_s) do %>
+        <%= form_tag('../destroy/' + @public_body.id.to_s) do %>
            <p>
            <%= hidden_field_tag(:public_body_id, { :value => @public_body.id } ) %>
            <%= submit_tag "Destroy " + @public_body.name %> (this is permanent!)
diff --git a/app/views/admin_public_body/import_csv.rhtml b/app/views/admin_public_body/import_csv.rhtml
index 1c6100838..678758b23 100644
--- a/app/views/admin_public_body/import_csv.rhtml
+++ b/app/views/admin_public_body/import_csv.rhtml
@@ -9,7 +9,7 @@
 <pre id="error"><%=@errors %></pre>
 <% end %>
 
-<% form_tag 'import_csv', :multipart => true do %>
+<%= form_tag 'import_csv', :multipart => true do %>
     <p>
     <% if @original_csv_file && @temporary_csv_file %>
         CSV file:
diff --git a/app/views/admin_public_body/list.rhtml b/app/views/admin_public_body/list.rhtml
index c28060604..561944f9a 100644
--- a/app/views/admin_public_body/list.rhtml
+++ b/app/views/admin_public_body/list.rhtml
@@ -14,7 +14,7 @@
     | <%= link_to 'Import from CSV file', 'import_csv' %>
 </p>
 
-<% form_tag("", :method => "get") do %>
+<%= form_tag("", :method => "get") do %>
    <p>
        <%= text_field_tag 'query', params[:query], { :size => 30 } %>
        <%= submit_tag "Search" %> (substring search in names and emails; exact match of tags)
diff --git a/app/views/admin_public_body/new.rhtml b/app/views/admin_public_body/new.rhtml
index 047d5a5bb..9cfcf7db3 100644
--- a/app/views/admin_public_body/new.rhtml
+++ b/app/views/admin_public_body/new.rhtml
@@ -11,7 +11,7 @@
 <%= render :partial => 'tag_help' %>
 
 <div id="public_body_form">
-    <% form_tag './create/' + @public_body.id.to_s do %>
+    <%= form_tag './create/' + @public_body.id.to_s do %>
       <%= render :partial => 'form' %>
       <p><%= submit_tag "Create" %></p>
     <% end %>
diff --git a/app/views/admin_request/_incoming_message_actions.rhtml b/app/views/admin_request/_incoming_message_actions.rhtml
index 569132861..3090185e2 100644
--- a/app/views/admin_request/_incoming_message_actions.rhtml
+++ b/app/views/admin_request/_incoming_message_actions.rhtml
@@ -1,4 +1,4 @@
-<% form_tag '../redeliver_incoming' do %>
+<%= form_tag '../redeliver_incoming' do %>
   <div>
       id or url_title of request (or a list of requests, comma-separated):
       <% if @info_requests && @info_requests.size == 1 %>
@@ -15,7 +15,7 @@
 <%= link_to 'FOI officer upload URL', '../generate_upload_url/' + incoming_message.info_request.id.to_s + "?incoming_message_id=" + incoming_message.id.to_s %>
 </p>
 
-<% form_tag '../destroy_incoming' do %>
+<%= form_tag '../destroy_incoming' do %>
   <div>
       <%= hidden_field_tag 'incoming_message_id', incoming_message.id %>
       Warning, this is permanent! ---&gt; 
diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml
index 8fa2a1fe2..900947321 100644
--- a/app/views/admin_request/edit.rhtml
+++ b/app/views/admin_request/edit.rhtml
@@ -2,7 +2,7 @@
 
 <%= error_messages_for 'info_request' %>
 
-<% form_tag '../update/' + @info_request.id.to_s do %>
+<%= form_tag '../update/' + @info_request.id.to_s do %>
 
    <p><label for="info_request_title"><strong>Title</strong></label> (warning: editing this will break URLs right now)<br/>
    <%= text_field 'info_request', 'title', :size => 50  %></p>
@@ -51,7 +51,7 @@
 
 <hr>
 
-<% form_tag '../destroy/' + @info_request.id.to_s do %>
+<%= form_tag '../destroy/' + @info_request.id.to_s do %>
     <p>
     <strong>This is permanent and irreversible!</strong> <%= submit_tag 'Destroy request entirely' %>
     <br>Use it mainly if someone posts private information, e.g. made a Data Protection request. It
diff --git a/app/views/admin_request/edit_comment.rhtml b/app/views/admin_request/edit_comment.rhtml
index ee43e849a..2152ee72f 100644
--- a/app/views/admin_request/edit_comment.rhtml
+++ b/app/views/admin_request/edit_comment.rhtml
@@ -2,7 +2,7 @@
 
 <%= error_messages_for 'comment' %>
 
-<% form_tag '../update_comment/' + @comment.id.to_s do %>
+<%= form_tag '../update_comment/' + @comment.id.to_s do %>
 
    <p><label for="comment_body">Body of annotation</label><br/>
    <%= text_area 'comment', 'body', :rows => 10, :cols => 60  %></p>
diff --git a/app/views/admin_request/edit_outgoing.rhtml b/app/views/admin_request/edit_outgoing.rhtml
index 4932cb52f..f749eac7b 100644
--- a/app/views/admin_request/edit_outgoing.rhtml
+++ b/app/views/admin_request/edit_outgoing.rhtml
@@ -2,7 +2,7 @@
 
 <%= error_messages_for 'outgoing_message' %>
 
-<% form_tag '../update_outgoing/' + @outgoing_message.id.to_s do %>
+<%= form_tag '../update_outgoing/' + @outgoing_message.id.to_s do %>
 
    <p><label for="outgoing_message_body">Body of message</label><br/>
    <%= text_area 'outgoing_message', 'body', :rows => 10, :cols => 60  %></p>
@@ -22,7 +22,7 @@
 <%= link_to 'List all', '../list' %>
 </p>
 
-<% form_tag '../destroy_outgoing' do %>
+<%= form_tag '../destroy_outgoing' do %>
   <div>
       <%= hidden_field_tag 'outgoing_message_id', @outgoing_message.id %>
       Warning, this is permanent! ---&gt; 
diff --git a/app/views/admin_request/list.rhtml b/app/views/admin_request/list.rhtml
index cb328543e..ae95cb5ad 100644
--- a/app/views/admin_request/list.rhtml
+++ b/app/views/admin_request/list.rhtml
@@ -2,7 +2,7 @@
 
 <h1><%=@title%></h1>
 
-<% form_tag("", :method => "get") do %>
+<%= form_tag("", :method => "get") do %>
    <p>
        <%= text_field_tag 'query', params[:query], { :size => 30 } %>
        <%= submit_tag "Search" %> (substring search, titles only)
diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml
index 973bf8bf3..3dd39347b 100644
--- a/app/views/admin_request/show.rhtml
+++ b/app/views/admin_request/show.rhtml
@@ -3,7 +3,7 @@
 
 <h1><%=@title%></h1>
 
-<% form_tag '../move_request', { :class => "inline" } do %>
+<%= form_tag '../move_request', { :class => "inline" } do %>
 <p>
 <%= hidden_field_tag 'info_request_id', @info_request.id %>
 <% for column in InfoRequest.content_columns %>
@@ -86,7 +86,7 @@
   <% end %>
   <td>
     <% if info_request_event.described_state != 'waiting_clarification' and info_request_event.event_type == 'response' %>
-        <% form_tag '../mark_event_as_clarification' do %>
+        <%= form_tag '../mark_event_as_clarification' do %>
           <div>
               <%= hidden_field_tag 'info_request_event_id', info_request_event.id %>
               <%= submit_tag "Was clarification request" %>
@@ -127,7 +127,7 @@
 
   <% end %>
   <td>
-  <% form_tag '../resend' do %>
+  <%= form_tag '../resend' do %>
       <div>
           <%= hidden_field_tag 'outgoing_message_id', outgoing_message.id %>
           <%= submit_tag "Resend" %>
diff --git a/app/views/admin_track/_some_tracks.rhtml b/app/views/admin_track/_some_tracks.rhtml
index 72ee5fd95..1d2b358b7 100644
--- a/app/views/admin_track/_some_tracks.rhtml
+++ b/app/views/admin_track/_some_tracks.rhtml
@@ -18,7 +18,7 @@
   <% end %>
   <td><%= track_thing.track_things_sent_emails.size %></td>
   <td>
-      <% form_tag '../../user/destroy_track' do %>
+      <%= form_tag '../../user/destroy_track' do %>
           <div>
               <%= hidden_field_tag 'track_id', track_thing.id %>
               <%= submit_tag "Destroy track" %>
diff --git a/app/views/admin_track/list.rhtml b/app/views/admin_track/list.rhtml
index 58c87ddba..1105f965e 100644
--- a/app/views/admin_track/list.rhtml
+++ b/app/views/admin_track/list.rhtml
@@ -2,7 +2,7 @@
 
 <h1><%=@title%></h1>
 
-<% form_tag("", :method => "get") do %>
+<%= form_tag("", :method => "get") do %>
    <p>
        <%= text_field_tag 'query', params[:query], { :size => 30 } %>
        <%= submit_tag "Search" %> (substring search the query - so use url_names_for_a_particular_request_or_authority_or_person)
diff --git a/app/views/admin_user/edit.rhtml b/app/views/admin_user/edit.rhtml
index 06ddc57d3..fb59dffe2 100644
--- a/app/views/admin_user/edit.rhtml
+++ b/app/views/admin_user/edit.rhtml
@@ -2,7 +2,7 @@
 
 <h1><%=@title%></h1>
 
-<% form_tag '../update/' + @admin_user.id.to_s do %>
+<%= form_tag '../update/' + @admin_user.id.to_s do %>
   <%= render :partial => 'form' %>
   <p><%= submit_tag 'Save', :accesskey => 's' %></p>
 <% end %>
@@ -13,7 +13,7 @@
 </p>
 
 <% if false #@admin_user.info_requests.size == 0 %>
-    <% form_tag('../destroy/' + @admin_user.id.to_s) do %>
+    <%= form_tag('../destroy/' + @admin_user.id.to_s) do %>
        <p>
        <%= hidden_field_tag(:admin_user_id, { :value => @admin_user.id } ) %>
        <%= submit_tag "Destroy " + @admin_user.name %> (this is permanent!)
diff --git a/app/views/admin_user/list.rhtml b/app/views/admin_user/list.rhtml
index 9de381ecc..377f5fc10 100644
--- a/app/views/admin_user/list.rhtml
+++ b/app/views/admin_user/list.rhtml
@@ -2,7 +2,7 @@
 
 <h1><%=@title%></h1>
 
-<% form_tag("", :method => "get") do %>
+<%= form_tag("", :method => "get") do %>
    <p>
        <%= text_field_tag 'query', params[:query], { :size => 30 } %>
        <%= submit_tag "Search" %> (substring search, names and emails)
diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml
index 4af79e45a..03e3d30c5 100644
--- a/app/views/admin_user/show.rhtml
+++ b/app/views/admin_user/show.rhtml
@@ -4,7 +4,7 @@
 
 <% if @admin_user.profile_photo %>
     <div class="user_photo_on_admin">
-        <% form_tag '../clear_profile_photo/' + @admin_user.id.to_s, :multipart => true do %>
+        <%= form_tag '../clear_profile_photo/' + @admin_user.id.to_s, :multipart => true do %>
             <img src="<%= main_url(get_profile_photo_url(:url_name => @admin_user.url_name, :only_path => true)) %>">
             <br>
             <%= submit_tag "Clear photo" %>
diff --git a/app/views/comment/_comment_form.rhtml b/app/views/comment/_comment_form.rhtml
index 120929643..b110fa26a 100644
--- a/app/views/comment/_comment_form.rhtml
+++ b/app/views/comment/_comment_form.rhtml
@@ -1,4 +1,4 @@
-<% form_for(:comment, @comment, :url => { :controller => "comment", :action => "new", :type => "request" },  :html => { :id => 'comment_form' } ) do |f| %>
+<%= form_for(:comment, @comment, :url => { :controller => "comment", :action => "new", :type => "request" },  :html => { :id => 'comment_form' } ) do |f| %>
     <p>
         <%= f.text_area :body, :rows => 10, :cols => 55 %>
     </p>
diff --git a/app/views/comment/preview.rhtml b/app/views/comment/preview.rhtml
index 702bd9a9b..5367338ab 100644
--- a/app/views/comment/preview.rhtml
+++ b/app/views/comment/preview.rhtml
@@ -1,6 +1,6 @@
 <% @title = _("Preview new annotation on '{{info_request_title}}'",:info_request_title=>h(@info_request.title)) %>
 
-<% form_for(:comment, @comment, :html => { :id => 'preview_form' }, :url => { :controller => "comment", :action => "new", :type => "request" } ) do |f| %>
+<%= form_for(:comment, @comment, :html => { :id => 'preview_form' }, :url => { :controller => "comment", :action => "new", :type => "request" } ) do |f| %>
     
     <h1><%= _('Now preview your annotation') %></h1>
 
diff --git a/app/views/general/exception_caught.rhtml b/app/views/general/exception_caught.rhtml
index 5f0dfe13d..94b0d0db7 100644
--- a/app/views/general/exception_caught.rhtml
+++ b/app/views/general/exception_caught.rhtml
@@ -7,7 +7,7 @@
   <ul>
   <li><%= _("Check for mistakes if you typed or copied the address.")%></li>
   <li><%= _("Search the site to find what you were looking for.")%>
-      <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %>
+      <%= form_tag({:controller => "general", :action => "search_redirect"}, {:id => "search_form"}) do %>
              <%= text_field_tag 'query', params[:query], { :size => 30 } %>
              <%= submit_tag _("Search") %>
       <% end %>
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml
index 6df12d980..de42d3937 100644
--- a/app/views/general/search.rhtml
+++ b/app/views/general/search.rhtml
@@ -22,7 +22,7 @@
   <% if @advanced %>
     <div id="advanced-search">
       <p><%= _('To use the advanced search, combine phrases and labels as described in the search tips below.') %></p>
-      <% form_tag(advanced_search_url, :method => "get") do %>
+      <%= form_tag(advanced_search_url, :method => "get") do %>
          <p>
            <%= text_field_tag :query, @query, { :size => 60 } %>
            <%= hidden_field_tag 'sortby', @inputted_sortby %>
@@ -35,7 +35,7 @@
       <% end %>
     </div>
   <% else %>
-    <% form_tag(request.url, {:method => "get", :id => "search_form"}) do %>
+    <%= form_tag(request.url, {:method => "get", :id => "search_form"}) do %>
       <p>
         <%= text_field_tag 'query', params[:query], { :size => 40 } %>
         <%= hidden_field_tag 'sortby', @inputted_sortby %>
diff --git a/app/views/help/contact.rhtml b/app/views/help/contact.rhtml
index 385c24a62..0c245ace7 100644
--- a/app/views/help/contact.rhtml
+++ b/app/views/help/contact.rhtml
@@ -40,7 +40,7 @@
     <% end %>
 </div>
 
-<% form_for :contact do |f| %>
+<%= form_for :contact do |f| %>
 
     <% if not @user %>
         <p>
diff --git a/app/views/public_body/_alphabet.rhtml b/app/views/public_body/_alphabet.rhtml
index 92674b8aa..a3359f3ab 100644
--- a/app/views/public_body/_alphabet.rhtml
+++ b/app/views/public_body/_alphabet.rhtml
@@ -1,3 +1,3 @@
-<% "A".upto("Z") do |l| -%>       
+<%= "A".upto("Z") do |l| -%>       
     <%= link_to_unless (@tag == l), l, list_public_bodies_url(:tag => l.downcase) %>
 <% end %>
diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml
index 94fbb759c..171e02679 100644
--- a/app/views/public_body/list.rhtml
+++ b/app/views/public_body/list.rhtml
@@ -32,7 +32,7 @@
 <div id="left_column_flip">
 <h1><%= _('Public authorities') %></h1>
 
-<% form_tag(list_public_bodies_default_url, :method => "get", :id=>"search_form") do %>
+<%= form_tag(list_public_bodies_default_url, :method => "get", :id=>"search_form") do %>
  <div>
   <%= text_field_tag(:public_body_query, params[:public_body_query]) %> 
   <%= submit_tag(_("Search")) %>
diff --git a/app/views/public_body/view_email_captcha.rhtml b/app/views/public_body/view_email_captcha.rhtml
index 6f301e055..4f6db5b67 100644
--- a/app/views/public_body/view_email_captcha.rhtml
+++ b/app/views/public_body/view_email_captcha.rhtml
@@ -4,7 +4,7 @@
 
 <p><%= _('To view the email address that we use to send FOI requests to {{public_body_name}}, please enter these words.', :public_body_name => h(@public_body.name))%></p>
 
-<% form_for :contact do |f| %>
+<%= form_for :contact do |f| %>
     <%= recaptcha_tags %>
 
     <%= hidden_field_tag(:submitted_view_email, { :value => 1 } ) %>
diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml
index 404a2e549..23eddabb4 100644
--- a/app/views/request/_describe_state.rhtml
+++ b/app/views/request/_describe_state.rhtml
@@ -1,6 +1,6 @@
 <% if @is_owning_user %>
 
-    <% form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %>
+    <%= form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %>
         <h2><%= _('What best describes the status of this request now?') %></h2>
 
         <hr> <!------------------------------------------------>
diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml
index 045bcd9ba..127866d5d 100644
--- a/app/views/request/_followup.rhtml
+++ b/app/views/request/_followup.rhtml
@@ -79,7 +79,7 @@
             </p>
         <% end %>
 
-        <% form_for(:outgoing_message, @outgoing_message, :html => { :id => 'followup_form' }, :url => incoming_message.nil? ? show_response_no_followup_url(:id => @info_request.id) : show_response_url(:id => @info_request.id, :incoming_message_id => incoming_message.id)) do |o| %>
+        <%= form_for(:outgoing_message, @outgoing_message, :html => { :id => 'followup_form' }, :url => incoming_message.nil? ? show_response_no_followup_url(:id => @info_request.id) : show_response_url(:id => @info_request.id, :incoming_message_id => incoming_message.id)) do |o| %>
             <p>
                 <%= o.text_area :body, :rows => 15, :cols => 55 %>
             </p>
diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml
index e274fe8c9..735353e86 100644
--- a/app/views/request/_other_describe_state.rhtml
+++ b/app/views/request/_other_describe_state.rhtml
@@ -1,6 +1,6 @@
 
 
-<% form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %>
+<%= form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %>
     <h2><%= _('Hi! We need your help. The person who made the following request
     hasn\'t told us whether or not it was successful. Would you mind taking
     a moment to read it and help us keep the place tidy for everyone?
diff --git a/app/views/request/_request_filter_form.rhtml b/app/views/request/_request_filter_form.rhtml
index 0c215a9b6..090db01df 100644
--- a/app/views/request/_request_filter_form.rhtml
+++ b/app/views/request/_request_filter_form.rhtml
@@ -1,7 +1,7 @@
 <%= render :partial => 'general/localised_datepicker'  %>
 
 <div id="list-filter">
-  <% form_tag(request.path, :method => "get", :id=>"filter_requests_form") do %>
+  <%= form_tag(request.path, :method => "get", :id=>"filter_requests_form") do %>
  <div class="list-filter-item">
   <%= label_tag(:query, _("Keywords"), :class=>"form_label title") %>
   <%= text_field_tag(:query, params[:query]) %> 
diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml
index 884d4b2b1..43e1e7435 100644
--- a/app/views/request/_sidebar.rhtml
+++ b/app/views/request/_sidebar.rhtml
@@ -32,13 +32,13 @@
 
     <div class="act_link">
      <% tweet_link = "https://twitter.com/share?url=#{h(request.url)}&via=#{h(Configuration::twitter_username)}&text='#{h(@info_request.title)}'&related=#{_('alaveteli_foi:The software that runs {{site_name}}', :site_name => h(site_name))}" %>
-        <% link_to tweet_link do %>
+        <%= link_to tweet_link do %>
           <%= image_tag "twitter-16.png", :alt => "twitter icon" %>
         <% end %>
         <%= link_to _("Tweet this request"), tweet_link %>
     </div>
     <div class="act_link">
-        <% link_to "http://wordpress.com/" do %>
+        <%= link_to "http://wordpress.com/" do %>
           <%= image_tag "wordpress.png", :class => "rss" %>
         <% end %>
         <%= link_to _("Start your own blog"), "http://wordpress.com/"%>
diff --git a/app/views/request/followup_preview.rhtml b/app/views/request/followup_preview.rhtml
index 50c64138f..55afc0245 100644
--- a/app/views/request/followup_preview.rhtml
+++ b/app/views/request/followup_preview.rhtml
@@ -2,7 +2,7 @@
 
 <div id="followup">
 
-<% form_for(:outgoing_message, @outgoing_message, :html => { :id => 'preview_form' }, :url => (@incoming_message.nil? ? show_response_no_followup_url(:id => @info_request.id) : show_response_url(:id => @info_request.id, :incoming_message_id => @incoming_message.id)) + "#followup" ) do |o| %>
+<%= form_for(@outgoing_message, :html => { :id => 'preview_form' }, :url => (@incoming_message.nil? ? show_response_no_followup_url(:id => @info_request.id) : show_response_url(:id => @info_request.id, :incoming_message_id => @incoming_message.id)) + "#followup" ) do |o| %>
     
     <% if @internal_review %>
         <h1><%= _('Now preview your message asking for an internal review') %></h1>
@@ -15,7 +15,7 @@
     <li><%= _('Your message will appear in <strong>search engines</strong>') %></li>
     </ul>
 
-    <% fields_for :outgoing_message do |o| %>
+    <%= fields_for :outgoing_message do |o| %>
 
         <div class="correspondence" id="outgoing-0">
             <p class="preview_subject">
diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml
index f396ea9ec..70719405c 100644
--- a/app/views/request/new.rhtml
+++ b/app/views/request/new.rhtml
@@ -33,7 +33,7 @@
 
     <%= foi_error_messages_for :info_request, :outgoing_message %>
 
-    <% form_for(:info_request, @info_request, :html => { :id => 'write_form' }  ) do |f| %>
+    <%= form_for(:info_request, @info_request, :html => { :id => 'write_form' }  ) do |f| %>
 
     <div id="request_header">
         <div id="request_header_body">
@@ -103,7 +103,7 @@
     </div>
 
     <div id="request_form"> 
-        <% fields_for :outgoing_message do |o| %>
+        <%= fields_for :outgoing_message do |o| %>
         <p>
             <label class="form_label" for="outgoing_message_body"><%= _('Your request:') %></label> 
             <%= o.text_area :body, :rows => 20, :cols => 60 %>
diff --git a/app/views/request/preview.rhtml b/app/views/request/preview.rhtml
index 8d1fd753e..d5195bc0c 100644
--- a/app/views/request/preview.rhtml
+++ b/app/views/request/preview.rhtml
@@ -1,6 +1,6 @@
 <% @title = "Preview new " + h(@info_request.law_used_short) + " request to '" + h(@info_request.public_body.name) + "'" %>
 
-<% form_for(:info_request, @info_request, :html => { :id => 'preview_form' }  ) do |f| %>
+<%= form_for(:info_request, @info_request, :html => { :id => 'preview_form' }  ) do |f| %>
     
     <h1><%= _('3. Now check your request') %></h1>
     <ul>
@@ -10,7 +10,7 @@
     </li>
     </ul>
 
-    <% fields_for :outgoing_message do |o| %>
+    <%= fields_for :outgoing_message do |o| %>
 
         <div class="correspondence" id="outgoing-0">
             <p class="preview_subject">
@@ -45,4 +45,4 @@
         <p><strong><%= _('Tags:') %></strong> <%=h @info_request.tag_string %></p>
     <% end %>
 
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/request/select_authority.rhtml b/app/views/request/select_authority.rhtml
index 652c24da9..ece3b57d7 100644
--- a/app/views/request/select_authority.rhtml
+++ b/app/views/request/select_authority.rhtml
@@ -30,7 +30,7 @@
   <h1 style="clear: left"><%= _('1. Select an authority') %></h1>
 
   <div id="authority_selection">
-    <% form_tag({:controller => "request", :action => "select_authority"}, {:id => "search_form", :method => "get"}) do %>
+    <%= form_tag({:controller => "request", :action => "select_authority"}, {:id => "search_form", :method => "get"}) do %>
        <div>
            <p>
            <%= raw(_('First, type in the <strong>name of the UK public authority</strong> you\'d 
diff --git a/app/views/request/upload_response.rhtml b/app/views/request/upload_response.rhtml
index 675951595..158d5d3c4 100644
--- a/app/views/request/upload_response.rhtml
+++ b/app/views/request/upload_response.rhtml
@@ -30,7 +30,7 @@
   <p><%= raw(_('Enter your response below. You may attach one file (use email, or
   <a href="%s">contact us</a> if you need more).')% [help_contact_path]) %></p>
 
-  <% form_tag '', :id => 'upload_response_form', :multipart => true do %>
+  <%= form_tag '', :id => 'upload_response_form', :multipart => true do %>
       <p>
           <label class="form_label" for="body"><% _('Response:')%></label>
                   <%= text_area_tag :body, "", :rows => 10, :cols => 55 %>
diff --git a/app/views/user/_change_receive_email.rhtml b/app/views/user/_change_receive_email.rhtml
index 83e5d8601..12824f711 100644
--- a/app/views/user/_change_receive_email.rhtml
+++ b/app/views/user/_change_receive_email.rhtml
@@ -1,4 +1,4 @@
-<% form_tag(:controller=>"user", :action=>"set_receive_email_alerts") do %>
+<%= form_tag(:controller=>"user", :action=>"set_receive_email_alerts") do %>
  <div>
  <% if @user.receive_email_alerts %>
   <%= _('You are currently receiving notification of new activity on your wall by email.', :wall_url => show_user_wall_path) %><br><br>
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index c4d917991..d7a9c03f0 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -1,6 +1,6 @@
 <div id="signin">
 
-<% form_tag({:action => "signin"}, {:id => "signin_form"}) do %>
+<%= form_tag({:action => "signin"}, {:id => "signin_form"}) do %>
     <%= foi_error_messages_for :user_signin %>
 
     <!--<% if not sign_in_as_existing_user %>
diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml
index 913423ffa..315ae6838 100644
--- a/app/views/user/_signup.rhtml
+++ b/app/views/user/_signup.rhtml
@@ -1,6 +1,6 @@
 <div id="signup">
 
-<% form_tag({:action => "signup"}, {:id => "signup_form"}) do %>
+<%= form_tag({:action => "signup"}, {:id => "signup_form"}) do %>
     <%= foi_error_messages_for :user_signup %>
 
     <!--<h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>-->
diff --git a/app/views/user/contact.rhtml b/app/views/user/contact.rhtml
index 333b72334..6d23dd1ed 100644
--- a/app/views/user/contact.rhtml
+++ b/app/views/user/contact.rhtml
@@ -6,7 +6,7 @@
 
 <%= foi_error_messages_for :contact %>
 
-<% form_for :contact do |f| %>
+<%= form_for :contact do |f| %>
 
     <div class="form_note">
       <h1><%= _("Contact {{recipient}}", :recipient => h(@recipient_user.name)) %></h1>
diff --git a/app/views/user/set_crop_profile_photo.rhtml b/app/views/user/set_crop_profile_photo.rhtml
index eed0304d2..fea7ccab8 100644
--- a/app/views/user/set_crop_profile_photo.rhtml
+++ b/app/views/user/set_crop_profile_photo.rhtml
@@ -9,7 +9,7 @@
 
 <div id="set_crop_profile_photo">
 
-<% form_tag 'set_photo', :id => 'set_crop_profile_photo_form', :multipart => true do %>
+<%= form_tag 'set_photo', :id => 'set_crop_profile_photo_form', :multipart => true do %>
 
     <table>
     <tr>
diff --git a/app/views/user/set_draft_profile_photo.rhtml b/app/views/user/set_draft_profile_photo.rhtml
index b3faba7fc..a44c78f57 100644
--- a/app/views/user/set_draft_profile_photo.rhtml
+++ b/app/views/user/set_draft_profile_photo.rhtml
@@ -8,7 +8,7 @@
 
 <div id="set_draft_profile_photo">
 
-<% form_tag 'set_photo', :id => 'set_draft_profile_photo_form', :multipart => true do %>
+<%= form_tag 'set_photo', :id => 'set_draft_profile_photo_form', :multipart => true do %>
     <p>
 	    <label class="form_label" for="file_1"><%= _('Photo of you:')%></label>
         <%= file_field_tag :file, :size => 35, :id => 'file_1' %>
@@ -45,7 +45,7 @@
 
     <h2><%= _('OR remove the existing photo')%></h2>
 
-    <% form_tag 'clear_photo', :id => 'clear_profile_photo_form', :multipart => true do %>
+    <%= form_tag 'clear_photo', :id => 'clear_profile_photo_form', :multipart => true do %>
         <%= submit_tag _("Clear photo") %>
     <% end %>
 
diff --git a/app/views/user/set_profile_about_me.rhtml b/app/views/user/set_profile_about_me.rhtml
index 4fe1047da..c4b760307 100644
--- a/app/views/user/set_profile_about_me.rhtml
+++ b/app/views/user/set_profile_about_me.rhtml
@@ -4,7 +4,7 @@
 
 <%= foi_error_messages_for :about_me %>
 
-<% form_for :about_me do |f| %>
+<%= form_for :about_me do |f| %>
     <div class="form_note">
         <h1><%= _('Edit text about you')%></h1>
         <p> 
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index e8e59b541..e67d3b719 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -107,7 +107,7 @@
 
 <% if @show_requests %>
 <div id="user_profile_search">
-    <% form_tag(show_user_url, :method => "get", :id=>"search_form") do %>
+    <%= form_tag(show_user_url, :method => "get", :id=>"search_form") do %>
     <div>
         <%= text_field_tag(:user_query, params[:user_query]) %>
         <% if @is_you %>
@@ -181,7 +181,7 @@
         <p><%= _("You're not following anything.")%></p>
     <% else %>
         <% if @track_things_grouped.size == 1 %>
-            <% form_tag({:controller => 'track', :action => 'delete_all_type'}, :class => "feed_form") do %>
+            <%= form_tag({:controller => 'track', :action => 'delete_all_type'}, :class => "feed_form") do %>
                 <h3>
                     <%=TrackThing.track_type_description(@track_things[0].track_type)%>
                     <%= hidden_field_tag 'track_type', @track_things[0].track_type %>
@@ -195,7 +195,7 @@
         <% end %>
         <% for track_type, track_things in @track_things_grouped %>
             <% if @track_things_grouped.size > 1 %>
-                <% form_tag({:controller => 'track', :action => 'delete_all_type'}, :class => "feed_form") do %>
+                <%= form_tag({:controller => 'track', :action => 'delete_all_type'}, :class => "feed_form") do %>
                     <h3>
                         <%=TrackThing.track_type_description(track_type)%>
                         <%= hidden_field_tag 'track_type', track_type %>
@@ -211,7 +211,7 @@
             <ul>
             <% for track_thing in track_things %>
                 <li>
-                    <% form_tag({:controller => 'track', :action => 'update', :track_id => track_thing.id}, :class => "feed_form") do %>
+                    <%= form_tag({:controller => 'track', :action => 'update', :track_id => track_thing.id}, :class => "feed_form") do %>
                         <div>
                             <%= track_thing.params[:list_description] %>
                             <%= hidden_field_tag 'track_medium', "delete", { :id => 'track_medium_' + track_thing.id.to_s } %>
diff --git a/app/views/user/signchangeemail.rhtml b/app/views/user/signchangeemail.rhtml
index 0f8b76bc5..7308179f4 100644
--- a/app/views/user/signchangeemail.rhtml
+++ b/app/views/user/signchangeemail.rhtml
@@ -4,7 +4,7 @@
 
 <div id="change_email">
 
-<% form_tag({:action => "signchangeemail"}, {:id => "signchangeemail_form"}) do %>
+<%= form_tag({:action => "signchangeemail"}, {:id => "signchangeemail_form"}) do %>
     <%= foi_error_messages_for :signchangeemail %>
 
     <div class="form_note">
diff --git a/app/views/user/signchangepassword.rhtml b/app/views/user/signchangepassword.rhtml
index edb980b9f..51bcb466d 100644
--- a/app/views/user/signchangepassword.rhtml
+++ b/app/views/user/signchangepassword.rhtml
@@ -4,7 +4,7 @@
 
 <div id="change_password">
 
-<% form_tag({:action => "signchangepassword"}, {:id => "signchangepassword_form"}) do %>
+<%= form_tag({:action => "signchangepassword"}, {:id => "signchangepassword_form"}) do %>
     <%= foi_error_messages_for :user %>
 
     <div class="form_note">
diff --git a/app/views/user/signchangepassword_send_confirm.rhtml b/app/views/user/signchangepassword_send_confirm.rhtml
index 84ee28f07..850237c34 100644
--- a/app/views/user/signchangepassword_send_confirm.rhtml
+++ b/app/views/user/signchangepassword_send_confirm.rhtml
@@ -2,7 +2,7 @@
 
 <div id="change_password">
 
-<% form_tag({:action => "signchangepassword"}, {:id => "signchangepassword_form"}) do %>
+<%= form_tag({:action => "signchangepassword"}, {:id => "signchangepassword_form"}) do %>
     <%= foi_error_messages_for :signchangepassword %>
 
     <div class="form_note">