10 files changed, 15 insertions, 15 deletions
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 %>