From 5f4429646d3932856042a3b8ec9b3aee3f8bf450 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sun, 18 Aug 2019 21:33:23 +0100 Subject: [PATCH] Move override to the view that is now in our code base (from spree_auth_devise originally) --- .../_user_form/add_confirmation_message.html.haml.deface | 5 ----- app/views/spree/shared/_user_form.html.haml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 app/overrides/spree/shared/_user_form/add_confirmation_message.html.haml.deface diff --git a/app/overrides/spree/shared/_user_form/add_confirmation_message.html.haml.deface b/app/overrides/spree/shared/_user_form/add_confirmation_message.html.haml.deface deleted file mode 100644 index c904c13d77..0000000000 --- a/app/overrides/spree/shared/_user_form/add_confirmation_message.html.haml.deface +++ /dev/null @@ -1,5 +0,0 @@ -/ insert_before "#password-credentials" - -- if @unconfirmed_email - %p.alert-box - = t('spree.users.show.unconfirmed_email', unconfirmed_email: @unconfirmed_email) \ No newline at end of file diff --git a/app/views/spree/shared/_user_form.html.haml b/app/views/spree/shared/_user_form.html.haml index ddee06e421..1698d97ee3 100644 --- a/app/views/spree/shared/_user_form.html.haml +++ b/app/views/spree/shared/_user_form.html.haml @@ -3,6 +3,10 @@ %br = f.email_field :email, class: 'title' +- if @unconfirmed_email + %p.alert-box + = t('spree.users.show.unconfirmed_email', unconfirmed_email: @unconfirmed_email) + %div{"id" => "password-credentials"} %p = f.label :password, Spree.t(:password)