11 files changed, 22 insertions, 23 deletions
diff --git a/app/views/help/_sidebar.rhtml b/app/views/help/_sidebar.rhtml
index db69f283b..21038e8df 100644
--- a/app/views/help/_sidebar.rhtml
+++ b/app/views/help/_sidebar.rhtml
@@ -1,4 +1,4 @@
-<div id="right_column">
+<div id="right_column_flip">
     <h2>Help pages</h2>
     <ul class="no_bullets">
         <li><%= link_to_unless_current "Introduction", "/help/about" %></li>
diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml
index 648ca1fb2..668a1df7f 100644
--- a/app/views/help/about.rhtml
+++ b/app/views/help/about.rhtml
@@ -2,7 +2,7 @@
 
 <%= render :partial => 'sidebar' %>
 
-<div id="left_column">
+<div id="left_column_flip">
   <h1 id="introduction">Introduction</h1>
   <dl>
 
diff --git a/app/views/help/alaveteli.rhtml b/app/views/help/alaveteli.rhtml
index f7accdd11..41c75619c 100644
--- a/app/views/help/alaveteli.rhtml
+++ b/app/views/help/alaveteli.rhtml
@@ -1,7 +1,7 @@
 <% @title = "Making requests" %>
 
 <%= render :partial => 'sidebar' %>
-<div id="left_column">
+<div id="left_column_flip">
   <% if params[:country_name] %>  
    <h1><%= _("Would you like to see a website like this in your country?") %></h1>
   <% else %>
diff --git a/app/views/help/api.rhtml b/app/views/help/api.rhtml
index 297aa1e8b..76d2992fb 100644
--- a/app/views/help/api.rhtml
+++ b/app/views/help/api.rhtml
@@ -2,7 +2,7 @@
 
 <%= render :partial => 'sidebar' %>
 
-<div id="left_column">
+<div id="left_column_flip">
   <h1><%=@title %></h1>
   <dl>
     <dt>Introduction</dt>
diff --git a/app/views/help/credits.rhtml b/app/views/help/credits.rhtml
index fd753336b..02f1e40e8 100644
--- a/app/views/help/credits.rhtml
+++ b/app/views/help/credits.rhtml
@@ -2,7 +2,7 @@
 
 <%= render :partial => 'sidebar' %>
 
-<div id="left_column">
+<div id="left_column_flip">
   <h1 id="credits"><%= @title%></h1>
 
   <dl>
diff --git a/app/views/help/officers.rhtml b/app/views/help/officers.rhtml
index b26138db6..3defec62f 100644
--- a/app/views/help/officers.rhtml
+++ b/app/views/help/officers.rhtml
@@ -2,7 +2,7 @@
 
 <%= render :partial => 'sidebar' %>
 
-<div id="left_column">
+<div id="left_column_flip">
   <h1 id="officers"><%= @title %> <a href="#officers">#</a> </h1>
 
   <dl>
diff --git a/app/views/help/privacy.rhtml b/app/views/help/privacy.rhtml
index d62afa45b..bec0c8c23 100644
--- a/app/views/help/privacy.rhtml
+++ b/app/views/help/privacy.rhtml
@@ -2,7 +2,7 @@
 
 <%= render :partial => 'sidebar' %>
 
-<div id="left_column">
+<div id="left_column_flip">
   <h1 id="privacy"><%= @title %></h1>
   <dl>
 
diff --git a/app/views/help/requesting.rhtml b/app/views/help/requesting.rhtml
index bd3ce46f3..af8f2e45d 100644
--- a/app/views/help/requesting.rhtml
+++ b/app/views/help/requesting.rhtml
@@ -1,7 +1,7 @@
 <% @title = "Making requests" %>
 
 <%= render :partial => 'sidebar' %>
-<div id="left_column">
+<div id="left_column_flip">
   <h1 id="making_requests"><%= @title %></h1>
   <dl>
 
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 6551095c2..1075ffc03 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -143,8 +143,6 @@
             <% end %>
 
             <div id="<%= controller.controller_name + "_" + controller.action_name %>" class="controller_<%= controller.controller_name %>">
-
-	    <div id="other-country-notice"></div>
             <%= yield :layout %>
             </div>
         </div>
@@ -159,6 +157,7 @@
 
     <%= render :partial => 'general/before_body_end' %>
 </div>
+<div id="other-country-notice"></div>
     </body>
 </html>
 
diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml
index bb17b544f..e4c803113 100644
--- a/app/views/public_body/list.rhtml
+++ b/app/views/public_body/list.rhtml
@@ -1,4 +1,4 @@
-<div id="right_column">
+<div id="right_column_flip">
     <h2><%=_('Show only...')%></h2>
 
     <h3><%=_('Beginning with') %></h3>
@@ -33,7 +33,7 @@
 </div>
 
 <% @title = _("Public authorities - {{description}}", :description => @description) %>
-<div id="left_column">
+<div id="left_column_flip">
 <h1><%= _('Public authorities') %></h1>
 
 <% form_tag(list_public_bodies_default_url, :method => "get", :id=>"search_form") do %>
diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml
index 9adf5d383..8dae8467a 100644
--- a/app/views/request/new.rhtml
+++ b/app/views/request/new.rhtml
@@ -11,20 +11,20 @@
 
 <% @title = _("Make an {{law_used_short}} request to '{{public_body_name}}'",:law_used_short=>h(@info_request.law_used_short),:public_body_name=>h(@info_request.public_body.name))  %>
 
-<% if @existing_request %>
-    <div class="errorExplanation" id="errorExplanation"><ul>
-    <li>
-     <%= _('{{existing_request_user}} already
-    created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>,
-    or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_url(@existing_request)) %> 
-    </li>
-    </ul></div>
-<% end %>
+    <h1><%= _('2. Ask for Information') %></h1>
+    
+    <% if @existing_request %>
+      <div class="errorExplanation" id="errorExplanation"><ul>
+      <li>
+       <%= _('{{existing_request_user}} already
+      created the same request on {{date}}. You can either view the <a href="{{existing_request}}">existing request</a>,
+      or edit the details below to make a new but similar request.',:existing_request_user=>user_or_you_capital_link(@existing_request.user), :date=>simple_date(@existing_request.created_at), :existing_request=>request_url(@existing_request)) %> 
+      </li>
+      </ul></div>
+    <% end %>
 
     <%= foi_error_messages_for :info_request, :outgoing_message %>
 
-    <h1><%= _('2. Ask for Information') %></h1>
-
     <% form_for(:info_request, @info_request, :html => { :id => 'write_form' }  ) do |f| %>
 
     <div id="request_header">