Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesigned the confirmation email page. #198

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 26 additions & 25 deletions api/app/views/mno_enterprise/auth/confirmations/lounge.html.haml
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
.banners.promo.dark.darkblue.confirmation-lounge
.registration
.container
.row
.col-md-8.col-md-offset-2
.row
.align-center
%i.fa.fa-envelope
%h4= t('mno_enterprise.auth.confirmations.lounge.title')
%h5= t('mno_enterprise.auth.confirmations.lounge.subtitle')

.login-box-wrapper
.login-box-title
%h2= t('mno_enterprise.auth.confirmations.lounge.title')
.login-box
.brand-logo
%form
%label{ :style => "font-weight: normal;"}= t('mno_enterprise.auth.confirmations.lounge.subtitle')
%div{ 'ng-init' => "email = '#{@resource.email}'"}
= form_for(@resource, :as => resource_name, :url => mno_enterprise.user_confirmation_path, :html => { 'name' => 'form', :class => 'dark form-horizontal', :autocomplete => "off" }) do |f|
= form_for(@resource, :as => resource_name, :url => mno_enterprise.user_confirmation_path, :html => { 'name' => 'form', class: 'form-horizontal', :autocomplete => "off" }) do |f|

- unless devise_error_messages!.empty?
%div
.row
.alert.alert-error
%button.close{ 'data-dismiss' => "alert" } ×
%button.close ×
= devise_error_messages!
.spacer2
.form-group
.col-sm-6.col-sm-offset-2
.input-prepend
= f.email_field :email, :placeholder => "Email", :required => true, 'ng-model' => 'email', :class => 'input-xlarge'
.col-sm-2
%button{ :class => "btn btn-lg btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' }= t('mno_enterprise.auth.confirmations.lounge.resend')
%img{ class: 'loader-sm', 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-main.gif'), 'ng-show' => 'hasClicked' }

.spacer2
.row
.col-md-12
.align-center
%h5
= t('mno_enterprise.auth.confirmations.lounge.support_tip_html', email: mail_to(support_email, t('mno_enterprise.auth.confirmations.lounge.support_team'), subject: t('mno_enterprise.auth.confirmations.lounge.support_email_subject')))
%hr
.form-horizontal
.row
.text-center
.col-sm-12
%label{ :style => "font-weight: normal;"}= t('mno_enterprise.auth.confirmations.lounge.resend.description')
.col-sm-12
= f.email_field :email, :placeholder => "Email", :required => true, 'ng-model' => 'email', :class => 'form-control'
%br
.row
.col-sm-12
.text-center
%button{ :class => "btn btn-warning", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'form.$invalid', 'ng-hide' => 'hasClicked' }= t('.resend.button')
%img.ng-hide{ 'ng-src' => asset_path('mno_enterprise/loader-32x32-bg-inverse.gif'), 'ng-show' => 'hasClicked' }
8 changes: 5 additions & 3 deletions core/config/locales/views/auth/confirmations/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ en:
title: Almost there
confirm: Confirm my account
lounge:
title: Congratulations! We've sent you a confirmation link, please check your email inbox.
subtitle: If you did not receive the email please click resend.
resend: Resend!
title: Confirmation sent!
subtitle: "We've sent you a confirmation link, please check your email inbox."
resend:
description: If you did not receive the email please click resend.
button: Resend!
support_tip_html: "Or if you prefer you can send an email to our %{email} directly and we'll activate it for you."
support_team: customer care service
support_email_subject: Signup Verification