4 files changed, 44 insertions, 28 deletions
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index 79628b3a9..6baed3c25 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -3,9 +3,9 @@
 <% form_tag({:action => "signin"}, {:id => "signin_form"}) do %>
     <%= foi_error_messages_for :user_signin %>
 
-    <% if not sign_in_as_existing_user %>
+    <!--<% if not sign_in_as_existing_user %>
     <h2><%= _('If you\'ve used {{site_name}} before', :site_name=>site_name)%></h2>
-    <% end %>
+    <% end %>-->
 
     <p>
     <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label>
diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml
index 6b0a1f8c7..f183ac1f1 100644
--- a/app/views/user/_signup.rhtml
+++ b/app/views/user/_signup.rhtml
@@ -3,15 +3,15 @@
 <% 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>
+    <!--<h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>-->
 
     <p>
         <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label>
         <%= text_field 'user_signup', 'email', { :size => 20 } %>
     </p>
     <div class="form_item_note">
-        <%= ('We will not reveal your email address to anybody unless you or
-        the law tell us to (<a href="%s">_details</a>). ') %[help_privacy_path] %>
+        <%= _('We will not reveal your email address to anybody unless you or
+        the law tell us to (<a href="%s">details</a>). ') %[help_privacy_path] %>
     </div>
 
     <p>
@@ -36,6 +36,10 @@
         <%= password_field 'user_signup', 'password_confirmation', { :size => 15 } %>
     </p>
 
+    <% if @request_from_foreign_country %>
+    <%= recaptcha_tags %>
+    <% end %>
+
     <div class="form_button">
         <%= hidden_field_tag 'token', params[:token], { :id => 'signup_token' } %>
         <%= submit_tag _('Sign up') %>
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index 8fd6c52ad..17fc0c46d 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -24,20 +24,20 @@
     </div>
 <% end %>
 
-
-<div id="request_sidebar">
-    <h2><%= _('Track this person')%></h2>
-    <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
-
-    <h2><%= _('On this page')%></h2>
-    <a href="#foi_requests"><%= _('FOI requests')%></a>
-    <br><a href="#annotations"><%= _('Annotations')%></a>
-    <% if @is_you %>
-        <br><a href="#email_subscriptions"><%= _('Email subscriptions')%></a>
-    <% end %>
-</div> 
-
-<div class="single_user">
+<div>
+  <div id="header_right">
+      <h2><%= _('Track this person')%></h2>
+      <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
+
+      <h2><%= _('On this page')%></h2>
+      <a href="#foi_requests"><%= _('FOI requests')%></a>
+      <br><a href="#annotations"><%= _('Annotations')%></a>
+      <% if @is_you %>
+          <br><a href="#email_subscriptions"><%= _('Email subscriptions')%></a>
+      <% end %>
+  </div> 
+
+  <div class="header_left">
     <p id="user_photo_on_profile">
         <% if @display_user.profile_photo %> 
             <% if @is_you %>
@@ -113,15 +113,18 @@
            <%= _('<a href="%s">Sign in</a> to change password, subscriptions and more ({{user_name}} only)',:user_name=>h(@display_user.name)) % [signin_url(:r => request.request_uri)]%>
         </p>
     <% end %>
+  </div>
+</div>
+<div style="clear:both"></div>
 
     <% if !@xapian_requests.nil? %>
         <% if @xapian_requests.results.empty? %>
             <% if @page == 1 %>
-                <h2 id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> </h2>
+                <h2 class="foi_results" id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> </h2>
                 <p><%= @is_you ? _('You have made no Freedom of Information requests using this site.') : _('This person has made no Freedom of Information requests using this site.') %>
             <% end %>
         <% else %>
-            <h2 id="foi_requests">
+            <h2 class="foi_results" id="foi_requests">
                 <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size  : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size %>
                 <!-- matches_estimated <%=@xapian_requests.matches_estimated%> -->
                 <%= @page_desc %>
@@ -134,7 +137,7 @@
             <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @display_user.info_requests.size) %>
         <% end %>
     <% else %> 
-        <h2 id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> </h2>
+        <h2 class="foi_results" id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> </h2>
         <p><%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests this person has made.')%></p>
     <% end %> 
 
diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml
index b76edbc64..1140d961a 100644
--- a/app/views/user/sign.rhtml
+++ b/app/views/user/sign.rhtml
@@ -21,17 +21,26 @@
 
     <div id="sign_together">
 
-        <p id="sign_in_reason">
+        <!--<p id="sign_in_reason">
         <% if @post_redirect.reason_params[:web].empty? %>
             <%= _(' Please sign in or make a new account.') %>
         <% else %>
             <%= @post_redirect.reason_params[:web] %>,  <%= _('please sign in or make a new account.') %>
         <% end %>
-        </p>
-
-        <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %>
-        <%= render :partial => 'signup' %>
-
+        </p>-->
+        
+        <div id="left_half">
+          <h1>Sign in</h1>
+          <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %>
+        </div>
+        <div id="middle_strip">
+          - or -
+        </div>
+        <div id="right_half">
+          <h1>Sign up</h2>
+          <%= render :partial => 'signup' %>
+        </div>
+        <div style="clear:both"></div>
     </div>
 
 <% end %>