From 6fa294292058dd5ab9bd089c446b3017aa85b868 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Tue, 5 May 2015 22:12:35 -0400 Subject: [PATCH] Update login views for two-factor auth --- app/views/devise/sessions/_new_base.html.haml | 1 - app/views/devise/sessions/two_factor.html.haml | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index dcb989e8d81..54a39726771 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -1,7 +1,6 @@ = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| = f.text_field :login, class: "form-control top", placeholder: "Username or Email", autofocus: "autofocus" = f.password_field :password, class: "form-control bottom", placeholder: "Password" - = f.hidden_field :otp_attempt, value: '' - if devise_mapping.rememberable? .remember-me.checkbox %label{for: "user_remember_me"} diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml index cfae81367be..32ba90fd7ce 100644 --- a/app/views/devise/sessions/two_factor.html.haml +++ b/app/views/devise/sessions/two_factor.html.haml @@ -7,10 +7,7 @@ - if @error .alert.alert-danger = @error - .hide - = f.text_field :login, class: "form-control top", placeholder: "Username or Email", autofocus: "autofocus" - = f.password_field :password, class: "form-control bottom", placeholder: "Password" - = f.text_field :otp_attempt, class: 'form-control', - placeholder: 'Two-factor authentication token', required: true, autofocus: true + = f.hidden_field :login + = f.text_field :otp_attempt, class: 'form-control', placeholder: 'Two-factor authentication code', required: true, autofocus: true .prepend-top-20 = f.submit "Verify code", class: "btn btn-save"