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

Merge pull request #1824 from cmgustavo/ux/import-open-profile

Browse source 
Ux/import open profile
This commit is contained in:
Matias Alejo Garcia 2014-11-17 08:41:23 -03:00
commit b49d6b9c01
3 changed files with 43 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/services/identityService.js
View file

@ -40,6 +40,7 @@ angular.module('copayApp.services')
} else { } else {
scope.error = 'Unknown error when connecting Insight Server'; scope.error = 'Unknown error when connecting Insight Server';
} }
$rootScope.starting = false;
$timeout(function() { $timeout(function() {
$rootScope.$digest() $rootScope.$digest()
}, 1); }, 1);
@ -57,6 +58,10 @@ angular.module('copayApp.services')
if (err || !wallet) { if (err || !wallet) {
copay.logger.debug(err); copay.logger.debug(err);
scope.error = 'Could not create default wallet'; scope.error = 'Could not create default wallet';
$rootScope.starting = false;
$timeout(function() {
$rootScope.$digest()
}, 1);
return; return;
} }
controllerUtils.bindProfile(scope, iden, wallet.id); controllerUtils.bindProfile(scope, iden, wallet.id);
@ -82,6 +87,7 @@ angular.module('copayApp.services')
} else { } else {
scope.error = 'Unknown error'; scope.error = 'Unknown error';
} }
$rootScope.starting = false;
$timeout(function() { $timeout(function() {
$rootScope.$digest() $rootScope.$digest()
}, 1); }, 1);

10
views/createProfile.html
View file

@ -50,12 +50,10 @@
{{'Passwords must match'|translate}} {{'Passwords must match'|translate}}
</p> </p>
</div> </div>
<div class="text-right"> <button translate type="submit" class="button primary radius expand m0"
<button translate type="submit" class="button primary radius expand m0" ng-disabled="profileForm.$invalid || loading">
ng-disabled="profileForm.$invalid || loading"> Create
Create </button>
</button>
</div>
</form> </form>
<div class="box-setup-footer"> <div class="box-setup-footer">
<div class="left"> <div class="left">

77
views/importProfile.html
View file

@ -6,31 +6,29 @@
</div> </div>
<div ng-show="!loading"> <div ng-show="!loading">
<div class="large-4 large-centered medium-6 medium-centered columns"> <div class="large-4 large-centered medium-6 medium-centered columns">
<div class="logo-setup"> <div class="logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59"> <img src="img/logo-negative-beta.svg" alt="Copay" width="146" height="59">
<div ng-include="'views/includes/version.html'"></div> <div ng-include="'views/includes/version.html'"></div>
</div> </div>
<div class="box-setup"> <div class="box-setup">
<h1><span translate>Import Profile<span></h1> <h1 translate>Import Profile</h1>
<form name="importProfileForm" ng-submit="import(importProfileForm)" novalidate> <form name="importProfileForm" ng-submit="import(importProfileForm)" novalidate>
<p class="text-warning size-12" <p class="text-warning size-12"
ng-show="error"> ng-show="error">
<i class="fi-x"></i> <i class="fi-x"></i>
{{error|translate}} {{error|translate}}
</p> </p>
<div ng-show="!is_iOS">
<legend for="backupFile" class="m10b">
<span translate>Choose backup file</span>
</legend>
<input type="file" class="form-control"
placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
</div>
<div ng-show="!is_iOS"> <div ng-show="is_iOS">
<legend for="backupFile" class="m10b">
<span translate>Choose backup file</span>
</legend>
<input type="file" class="form-control"
placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
</div>
<div ng-show="is_iOS">
<label for="backupText" class="m10b"> <label for="backupText" class="m10b">
<span translate>Paste backup plain text code</span> <i class="fi-clipboard"></i> <span translate>Paste backup plain text code</span> <i class="fi-clipboard"></i>
</label> </label>
@ -38,38 +36,25 @@
name="backupText" name="backupText"
ng-model="backupText" ng-model="backupText"
rows="5"></textarea> rows="5"></textarea>
</div>
<label for="password" class="m10b"><span translate>Password</span> <small translate>Required</small></label>
<input type="password" class="form-control"
placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
<div class="text-right m20t">
<a class="back-button text-white m20r" href="#!/">&laquo; <span translate>Back</span></a>
<button translate type="submit" class="button primary m0" ng-disabled="importForm.$invalid">
Import backup
</button>
</div> </div>
<input type="password" class="form-control"
placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
<button translate type="submit"
class="button primary radius expand m0"
ng-disabled="importProfileForm.$invalid || loading">
Import backup
</button>
</form> </form>
<div class="box-setup-footer"> <div class="box-setup-footer">
<div class="right m10t">
<a class="text-gray" href="#!/"> <a class="text-gray" href="#!/">
<i class="fi-arrow"></i> <i class="fi-arrow-left"></i>
<span translate>Back</span> <span translate>Back</span>
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>