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

Merge pull request #2161 from cmgustavo/bug/import-text-plain-backup

Browse source 
Fixes importing a plain text backup
This commit is contained in:
Matias Alejo Garcia 2014-12-18 19:40:26 -03:00
commit abf552aa5c
9 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

21
views/import.html
View file

@ -1,9 +1,9 @@
<div class="import" ng-controller="ImportController">
<div ng-show="loading">
<div ng-show="$root.starting">
<div ng-include="'views/includes/loading.html'" ng-init="title = importStatus"></div>
</div>
<div ng-show="!loading">
<div ng-show="!$root.starting">
<div class="row hide-for-large-up">
<div class="large-12 medium-12 small-12 columns">
<h1>{{$root.title}}</h1>
@ -13,19 +13,23 @@
<div class="large-12 columns">
<div class="panel">
<form name="importForm" ng-submit="import(importForm)" novalidate>
<div class="text-warning size-12 m20b" ng-show="error">
<i class="fi-x"></i> {{error|translate}}
<div class="box-notification" ng-show="error">
<div class="box-icon error">
<i class="fi-x size-24"></i>
</div>
<span class="text-warning size-14">
{{error|translate}}
</span>
</div>
<div ng-show="!is_iOS && !backupOldWallet">
<div ng-show="!isSafari && !isCordova && !backupOldWallet">
<legend for="backupFile" class="m10b">
<span translate>Choose backup file from your computer</span> <i class="fi-laptop"></i>
</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 && !backupOldWallet">
<div ng-show="isSafari || isCordova && !backupOldWallet">
<label for="backupText" class="m10b">
<span translate>Paste backup plain text code</span> <i class="fi-clipboard"></i>
</label>
@ -81,7 +85,8 @@
<div class="text-right m20t">
<button translate type="submit" class="button expand black m0" ng-disabled="importForm.$invalid">
<button translate type="submit" class="button expand black m0"
ng-disabled="importForm.$invalid || $root.starting">
Import backup
</button>
</div>

12
views/importProfile.html
View file

@ -1,10 +1,10 @@
<div class="import-profile" ng-controller="ImportProfileController">
<div ng-show="loading">
<div ng-show="$root.starting">
<div ng-include="'views/includes/loading.html'" ng-init="title = importStatus"></div>
</div>
<div ng-show="!loading">
<div ng-show="!$root.starting">
<div class="large-4 large-centered medium-6 medium-centered columns">
<div class="logo-setup show-for-large-up">
<img src="img/logo-negative-beta.svg" alt="Copay" width="100">
@ -22,14 +22,14 @@
</span>
</div>
<div ng-show="!is_iOS">
<div ng-show="!isSafari && !isCordova">
<div class="input">
<input type="file" class="db form-control"
placeholder="{{'Select a backup file'|translate}}" name="backupFile" ng-model="backupFile" ng-file-select>
</div>
</div>
<div ng-show="is_iOS">
<div ng-show="isSafari || isCordova">
<div class="input">
<textarea
placeholder="Paste backup plain text code"
@ -41,13 +41,13 @@
</div>
</div>
<div class="input">
<input type="password" class="form-control" placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
<input type="password" class="form-control" placeholder="{{'Your profile password'|translate}}" name="password" ng-model="password" required>
<i class="icon-locked"></i>
</div>
<button translate type="submit"
class="button primary radius expand m0"
ng-disabled="importProfileForm.$invalid || loading">
ng-disabled="importProfileForm.$invalid || $root.starting">
Import backup
</button>
</form>

4
views/modals/wallet-info.html
View file

@ -24,9 +24,9 @@
<div class="row" ng-show="!backupWalletPlainText && !error">
<div class="large-6 medium-6 small-12 columns">
<button class="primary expand" ng-click="downloadWalletBackup()" ng-disabled="loading"
ng-show="!isSafari"><i class="fi-download"></i> Download backup</button>
ng-show="!isSafari && !isCordova"><i class="fi-download"></i> Download backup</button>
<button class="primary expand" ng-click="viewWalletBackup()" ng-disabled="loading"
ng-show="isSafari"><i class="fi-eye"></i> View Backup</button>
ng-show="isSafari || isCordova"><i class="fi-eye"></i> View Backup</button>
</div>
<div class="large-6 medium-6 small-12 columns">
<button class="warning expand" ng-disabled="loading"