From fd7c2e70d8ec92802ca17ee382bb83e3a1e45788 Mon Sep 17 00:00:00 2001
From: lizconlan <liz@mysociety.org>
Date: Thu, 1 Sep 2016 12:20:39 +0100
Subject: [PATCH] Update signin template

---
 lib/views/user/_signin.html.erb | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/lib/views/user/_signin.html.erb b/lib/views/user/_signin.html.erb
index a11e9de..a1ff5d4 100644
--- a/lib/views/user/_signin.html.erb
+++ b/lib/views/user/_signin.html.erb
@@ -1,24 +1,19 @@
-<div id="signin">
-
-<%= form_tag({:action => "signin"}, {:id => "signin_form"}) do %>
+<div id="signin" class="signin">
+  <%= form_tag({:action => "signin"}, {:id => "signin_form"}) do %>
     <%= foi_error_messages_for :user_signin %>
 
-    <!--<% if not sign_in_as_existing_user %>
-    <h2><%= _('If you\'ve used {{site_name}} before', :site_name=>site_name)%></h2>
-    <% end %>-->
-
     <p>
-    <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label>
-    <%= text_field 'user_signin', 'email', { :size => 20, :tabindex => 120 } %>
+      <label class="form_label" for="user_signin_email"><%= _('Your e-mail:') %></label>
+      <%= text_field 'user_signin', 'email', { :size => 20, :tabindex => 120 } %>
     </p>
 
     <p>
-    <label class="form_label" for="user_signin_password"><%= _('Password:')%></label>
-    <%= password_field 'user_signin', 'password', { :size => 15, :tabindex => 130, :autocomplete => 'off' } %>
+      <label class="form_label" for="user_signin_password"><%= _('Password:') %></label>
+      <%= password_field 'user_signin', 'password', { :size => 15, :tabindex => 130, :autocomplete => 'off' } %>
     </p>
 
     <p class="form_note">
-    <%= link_to _('Forgotten your password?'), signchangepassword_path(:pretoken => h(params[:token])), :tabindex => 140 %>
+      <%= link_to _('Forgotten your password?'), new_password_change_path(:pretoken => h(params[:token])), :tabindex => 140 %>
     </p>
 
     <p class="form_checkbox">
@@ -30,10 +25,9 @@
     </p>
 
     <div class="form_button">
-    <%= hidden_field_tag 'token', params[:token], {:id => 'signin_token' } %>
-    <%= hidden_field_tag :modal, params[:modal], {:id => 'signin_modal' } %>
-    <%= submit_tag _('Sign in'), :tabindex => 160 %>
+      <%= hidden_field_tag 'token', params[:token], {:id => 'signin_token' } %>
+      <%= hidden_field_tag :modal, params[:modal], {:id => 'signin_modal' } %>
+      <%= submit_tag _('Sign in'), :tabindex => 160 %>
     </div>
-<% end %>
-
+  <% end %>
 </div>