Fix confirmation email notification

This commit is contained in:
Gustavo Maximiliano Cortez 2015-01-16 02:25:33 -03:00
parent 3a8717a1f4
commit e2d178df19
4 changed files with 28 additions and 26 deletions

View File

@ -268,15 +268,13 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
}
.status {
-moz-box-shadow: inset 0px -1px 1px 0px rgba(159,47,34,0.30);
box-shadow: inset 0px -1px 1px 0px rgba(159,47,34,0.30);
color: #FFFFFF;
background-color: #A02F23;
position: absolute;
left: 250px;
right: 0;
bottom: 0;
padding: 10px 2rem;
padding: 10px 1rem 10px 0.5rem;
z-index: 9;
font-size: 14px;
text-align: left;
@ -284,7 +282,6 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
}
.status-first-line {
z-index: 9;
font-size: 16px;
}
@ -414,9 +411,10 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
a.close-notification {
position: absolute;
top: 8px;
right: 10px;
top: 0;
right: 0;
font-size: 24px;
padding: 10px;
}
.panel.last-transactions {

View File

@ -50,21 +50,25 @@
<div class="off-canvas-wrap" id="off-canvas-wrap" ng-show="!signingOut">
<div class="inner-wrap">
<span class="status" ng-if="$root.needsEmailConfirmation && !$root.pleaseConfirmEmailAck">
<a class="close-notification text-white" ng-click="$root.pleaseConfirmEmailAck=true">&#215;</a>
<button class="text-white warning tiny m0 right"
ng-click="resendVerificationEmail()"
ng-disabled="loading"
ng-show="!hideReSendButton">
{{ loading ? 'Resending...' : 'Resend' }}
</button>
<i class="fi-alert size-36 left m20r"></i>
<span translate>
<strong class="size-16">Email not confirmed</strong>.<br>
Please confirm your email address using the confirmation link at the message we sent you
</span>
</span>
<span class="status" ng-if="$root.pleaseConfirmEmail">
<div class="status" ng-if="$root.needsEmailConfirmation && !$root.pleaseConfirmEmailAck">
<a class="close-notification text-white" ng-click="$root.pleaseConfirmEmailAck=true">&#215;</a>
<div class="row">
<div class="large-10 medium-9 small-12 columns m5b">
<i class="fi-alert size-36 left m20r"></i>
<strong class="size-16">Email not confirmed</strong>.<br>
Please confirm your email address using the confirmation link at the message we sent you
</div>
<div class="large-2 medium-3 small-12 columns text-center">
<button class="text-white warning tiny m0"
ng-click="resendVerificationEmail()"
ng-disabled="loading"
ng-show="!hideReSendButton">
{{ loading ? 'Resending...' : 'Resend' }}
</button>
</div>
</div>
</div>
<div class="status" ng-if="$root.pleaseConfirmEmail">
<a class="close-notification text-white" ng-click="$root.pleaseConfirmEmail=null">&#215;</a>
<i class="fi-alert size-36 left m20r"></i>
<span translate>
@ -72,11 +76,11 @@
An email was sent to {{$root.iden.getName()}}. Please follow the link on it to confirm it. Unconfirmed profiles could be deleted from server.
</span>
</span>
<span class="status" ng-if="$root.reconnecting">
</div>
<div class="status" ng-if="$root.reconnecting">
<i class="fi-loop icon-rotate"></i>
<span translate> <strong class="size-16">Network Error</strong>.<br> Attempting to reconnect..</span>
</span>
</div>
<div ng-controller="SidebarController" ng-show="$root.iden && !$root.hideNavigation && !$root.wpInputFocused">
<nav class="tab-bar">

View File

@ -3,7 +3,7 @@
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating profile'"></div>
</div>
<div class="large-4 large-centered medium-7 medium-centered columns m20b" ng-show="!$root.starting && !askForPin">
<div class="large-4 large-centered medium-7 medium-centered columns m20b" ng-show="!$root.starting && !askForPin">
<div class="logo-setup hide-for-small-only" ng-hide="hideForWP">
<img src="img/logo-negative-beta.svg" alt="Copay" width="100">
</div>

View File

@ -48,7 +48,7 @@
<div class="line-dashed-h m20b"></div>
<div class="row oh">
<div class="row oh m20b">
<div class="large-12 columns">
<a class="small left button-setup" ng-click="hideAdv=!hideAdv">
<i class="fi-widget m3r"></i>