5 files changed, 88 insertions, 76 deletions
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
new file mode 100644
index 000000000..470c7709c
--- /dev/null
+++ b/app/views/user/_signin.rhtml
@@ -0,0 +1,30 @@
+<div id="signin">
+
+<% form_tag({:action => "signin"}, {:id => "accountForm"}) do %>
+    <%= foi_error_messages_for :user %>
+
+    <% if not flash[:error] %>
+    <h2>If you've used GovernmentSpy before</h2>
+    <% end %>
+
+    <p>
+    <label for="user_email" id="signin_email"><strong>Your e-mail:</strong></label>
+    <%= text_field 'user', 'email', { :size => 20 } %>
+    </p>
+
+    <p>
+    <label for="user_password"><strong>Password:</strong></label>
+    <%= password_field 'user', 'password', { :size => 15 } %>
+    </p>
+
+    <p class="form_note">
+    Forgotten your password? Tough.
+    </p>
+
+    <div class="form_button">
+    <%= hidden_field_tag 'token', params[:token] %>
+    <%= submit_tag "Sign in" %>
+    </div>
+<% end %>
+
+</div>
diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml
new file mode 100644
index 000000000..fb13f9b48
--- /dev/null
+++ b/app/views/user/_signup.rhtml
@@ -0,0 +1,44 @@
+<div id="signup">
+
+<% form_tag({:action => "signup"}, {:id => "accountForm"}) do %>
+    <%= foi_error_messages_for :user %>
+
+    <% if not flash[:error] %>
+    <h2>If you're new to GovernmentSpy</h2>
+    <% end %>
+
+    <p>
+    <label for="user_email" id="signin_email"><strong>Your e-mail:</strong></label>
+    <%= text_field 'user', 'email', :size => 20 %>
+    </p>
+    <div class="form_item_note">
+    We will not reveal your email address to anybody.
+    </div>
+
+    <p>
+    <label for="name"><strong>Your name:</strong></label>
+    <%= text_field 'user', 'name', { :size => 20 } %>
+    </p>
+    <div class="form_item_note">Your <strong>name will appear
+    publically</strong> on this website and in search engines. We encourage you
+    to use your real name, but you may use a pseudonym if you would like to be
+    anonymous.</div>
+
+    <p>
+    <label for="password"><strong>Password:</strong></label>
+    <%= password_field 'user', 'password', { :size => 15 } %>
+    </p>
+
+    <p>
+    <label for="password"><strong>Password: (again)</strong></label>
+    <%= password_field 'user', 'password_confirmation', { :size => 15 } %>
+    </p>
+
+    <div class="form_button">
+    <%= hidden_field_tag 'token', params[:token] %>
+    <%= submit_tag "Sign up" %>
+    </div>
+
+<% end %>
+
+</div>
diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml
new file mode 100644
index 000000000..a2ff6ab19
--- /dev/null
+++ b/app/views/user/sign.rhtml
@@ -0,0 +1,12 @@
+<div id="sign_together">
+
+<p id="sign_in_reason">
+<%= @post_redirect.reason_params[:web] %>
+</p>
+
+<%= render :partial => 'signin' %>
+
+<%= render :partial => 'signup' %>
+
+</div>
+
diff --git a/app/views/user/signin.rhtml b/app/views/user/signin.rhtml
index 401565bde..3dcfd198f 100644
--- a/app/views/user/signin.rhtml
+++ b/app/views/user/signin.rhtml
@@ -1,28 +1 @@
-<%= foi_error_messages_for :user %>
-
-<% form_tag({:action => "signin"}, {:id => "accountForm"}) do %>
-    <% if not @post_redirect.reason_params[:web].nil? %>
-    <div class="form_note"><%= @post_redirect.reason_params[:web] %></div>
-    <% end %>
-
-    <p>
-    <label for="user_email" id="signin_email"><strong>Enter your e-mail address:</strong></label>
-    <%= text_field 'user', 'email', { :size => 20 } %>
-    </p>
-
-    <p>
-    <label for="user_password"><strong>Password:</strong></label>
-    <%= password_field 'user', 'password', { :size => 15 } %>
-    </p>
-
-    <p class="form_note">
-    Don't have a password? Just enter one to create a new account.
-    </p>
-
-    <div class="form_button">
-    <%= hidden_field_tag 'token', params[:token] %>
-    <%= submit_tag "Sign in" %>
-    </div>
-
-<% end %>
-
+<%= render :partial => 'signin' %>
diff --git a/app/views/user/signup.rhtml b/app/views/user/signup.rhtml
index fd83174b6..bcade0078 100644
--- a/app/views/user/signup.rhtml
+++ b/app/views/user/signup.rhtml
@@ -1,48 +1 @@
-<%= foi_error_messages_for :user %>
-
-<% form_tag({:action => "signup"}, {:id => "accountForm"}) do %>
-    <% if @first_time %>
-    <div class="form_note">
-    <h1>Register new account</h1>
-    </div>
-    <% end %>
-        
-    <p>
-    <label for="user_email" id="signin_email"><strong>E-mail:</strong></label>
-    <%= text_field 'user', 'email', :size => 20 %>
-    </p>
-
-    <p>
-    <label for="name"><strong>Full name:</strong> e.g. "Jack Bauer"</label>
-    <%= text_field 'user', 'name', { :size => 20 } %>
-    </p>
-
-    <p>
-    <label for="password"><strong>Password:</strong></label>
-    <%= password_field 'user', 'password', { :size => 15 } %>
-    </p>
-
-    <p>
-    <label for="password"><strong>Password (again):</strong></label>
-    <%= password_field 'user', 'password_confirmation', { :size => 15 } %>
-    </p>
-
-    <div class="form_note">
-    <strong>Privacy notes</strong>
-    <ul>
-    <li>We will not reveal your email address to anybody.
-    <li>Your <strong>name will appear publically</strong> on this website and
-    in search engines. We encourage you to use your real name, but you may use
-    an obvious pseudonym if you would like to be anonymous. 
-    <li>Any requests you make using the same email will be displayed on the
-    site under the same name.
-    </ul>
-    </div>
-
-    <div class="form_button">
-    <%= hidden_field_tag 'token', params[:token] %>
-    <%= submit_tag "Sign up" %>
-    </div>
-
-<% end %>
-
+<%= render :partial => 'signup' %>