anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix login / create form errors and confirmed messages

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-11-01 21:34:03 -03:00
commit 3360c31a12
10 changed files with 74 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
views/createProfile.html
View file

@ -1,10 +1,10 @@
<div class="createProfile" ng-controller="CreateProfileController">
<div data-alert class="loading-screen" ng-show="loading">
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Retreiving information from storage...</span>
<span translate>Creating profile...</span>
</div>
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!loading && !retreiving">
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!loading">
<div class="logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div>
@ -17,10 +17,16 @@
<input type="email" ng-model="email" class="form-control fi-email"
name="email" placeholder="Email" required>
<small class="icon-input" ng-show="!profileForm.email.$invalid &&
!profileForm.email.$pristine"><i class="fi-check"></i></small>
!profileForm.email.$pristine && !error"><i class="fi-check"></i></small>
<small class="icon-input" ng-show="profileForm.email.$invalid &&
!profileForm.email.$pristine"><i class="fi-x"></i></small>
!profileForm.email.$pristine || error"><i class="fi-x"></i></small>
</div>
<p class="text-warning size-12"
ng-show="error">
<i class="fi-x"></i>
{{error|translate}}
</p>
</div>
<input id="password" type="password" ng-model="$parent.password"
class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength"

21
views/home.html
View file

@ -2,7 +2,7 @@
<div data-alert class="loading-screen" ng-show="loading">
<i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
<span translate>Synchronizing with storage...</span>
<span translate>Accessing your profile...</span>
</div>
<div class="large-4 large-centered medium-6 medium-centered columns" ng-show="!loading && !retreiving">
<div class="logo-setup">
@ -11,14 +11,17 @@
</div>
<div class="p10 box-setup bg-success m10b text-white" ng-show="confirmedEmail">
<div class="left">
<i class="size-36 fi-alert m10r"></i>
<i class="size-36 fi-check m10r"></i>
</div>
<div class="size-12">
<b>Copay now needs a confirmation.</b><br />
You have to sign in to confirm your email
<div class="size-14">
<h3>
Your email was confimed!
</h3>
Please sign in to access your wallets
</div>
</div>
<div class="p10 box-setup bg-success m10b text-white" ng-show="anyWallet">
<div class="p10 box-setup bg-success m10b text-white" ng-show="anyWallet && !confirmedEmail && !error">
<div class="left">
<i class="size-36 fi-alert m10r"></i>
</div>
@ -29,6 +32,12 @@
<div class="box-setup">
<h1><span translate>Sign in to</span> <b>Copay</b></h1>
<form name="loginForm" ng-submit="openProfile(loginForm)" novalidate>
<p class="text-warning size-12"
ng-show="error">
<i class="fi-x"></i>
{{error|translate}}
</p>
<input type="email" ng-model="email" class="form-control"
name="email" placeholder="Email" required>
<input type="password" ng-model="password" class="form-control"