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

Replace $root.go directive for href ui-sref

Browse source
This commit is contained in:
Javier 2016-06-13 14:31:42 -03:00
commit 2f8c42ca25
14 changed files with 120 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

77
public/views/backup.html
View file

@ -1,17 +1,17 @@
<div class="backup" ng-controller="backupController as wordsC">
<div class="backup" ng-controller="backupController as backupC">
<nav class="tab-bar">
<section class="left-small" ng-show="(wordsC.step != 1 && wordsC.step != 4)">
<a ng-click="wordsC.goToStep(1);">
<section class="left-small" ng-show="(backupC.step != 1 && backupC.step != 4)">
<a ng-click="backupC.goToStep(1);">
<i class="icon-arrow-left3 icon-back"></i>
</a>
</section>
<section class="middle tab-bar-section" ng-style="{'color':index.backgroundColor}">
<span>{{wordsC.walletName}}</span>
<span>{{backupC.walletName}}</span>
</section>
<section class="right-small">
<a class="p10" ng-click="$root.go(index.prevState);">
<a class="p10" ng-click="backupC.backTo(index.prevState)">
<span class="text-close">
<i class="fi-x size-24"></i>
</span>
@ -19,9 +19,20 @@
</section>
</nav>
<<<<<<< 41f76292fef879856ea30ae58291f333a5e83415
<div class="box-notification" ng-show="wordsC.error">
=======
<div class="onGoingProcess" ng-show="backupC.loading">
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
<ion-spinner class="spinner-stable" icon="lines"></ion-spinner>
<span translate>Validating recovery phrase...</span>
</div>
</div>
<div class="box-notification" ng-show="backupC.error">
>>>>>>> Replace $root.go directive for href ui-sref
<span class="text-warning">
{{wordsC.error|translate}}
{{backupC.error|translate}}
</span>
</div>
@ -30,8 +41,8 @@
-->
<div class="content preferences text-center">
<div ng-show="wordsC.step == 1">
<div ng-show="wordsC.mnemonicWords || (wordsC.credentialsEncrypted && !wordsC.deleted)" class="row">
<div ng-show="backupC.step == 1">
<div ng-show="backupC.mnemonicWords || (backupC.credentialsEncrypted && !backupC.deleted)" class="row">
<h5 class="text-center" translate>Write your wallet recovery phrase</h5>
<div class="size-14 text-gray columns" ng-show="(index.n>1 && index.m != index.n )">
<span translate>
@ -56,37 +67,37 @@
</div>
</div>
<div class="row m20t" ng-show="wordsC.deleted">
<div class="row m20t" ng-show="backupC.deleted">
<div class="columns size-14 text-gray text-center" translate>
Wallet recovery phrase not available. You can still export it from Advanced &gt; Export.
</div>
</div>
<div ng-show="wordsC.mnemonicWords || (wordsC.credentialsEncrypted && !wordsC.deleted)">
<p class="text-center columns text-gray" ng-show="index.n==1 && wordsC.step == 1">
<div ng-show="backupC.mnemonicWords || (backupC.credentialsEncrypted && !backupC.deleted)">
<p class="text-center columns text-gray" ng-show="index.n==1 && backupC.step == 1">
<span translate>
You need the wallet recovery phrase to restore this personal wallet. Write it down and keep them somewhere safe.
</span>
</p>
<div class="row" ng-show="wordsC.credentialsEncrypted">
<div class="row" ng-show="backupC.credentialsEncrypted">
<div class="m10t columns">
<a class="button outline light-gray expand tiny" ng-click="wordsC.toggle()">
<a class="button outline light-gray expand tiny" ng-click="backupC.toggle()">
<i class="fi-widget m3r"></i>
<span translate ng-hide="wordsC.show">Show Wallet Recovery Phrase</span>
<span translate ng-hide="backupC.show">Show Wallet Recovery Phrase</span>
</a>
</div>
</div>
<div class="row" ng-show="!wordsC.credentialsEncrypted">
<div class="row" ng-show="!backupC.credentialsEncrypted">
<div class="columns">
<div class="panel" ng-class="{'enable_text_select': index.network == 'testnet'}">
<span ng-repeat="word in wordsC.mnemonicWords track by $index"><span style="white-space:nowrap">{{word}}</span><span ng-show="wordsC.useIdeograms">&#x3000;</span> </span>
<span ng-repeat="word in backupC.mnemonicWords track by $index"><span style="white-space:nowrap">{{word}}</span><span ng-show="backupC.useIdeograms">&#x3000;</span> </span>
</div>
</div>
</div>
</div>
<div class="columns extra-padding-bottom" ng-show="!wordsC.credentialsEncrypted">
<div class="line-t p10 size-10 text-gray text-center" ng-show="wordsC.mnemonicHasPassphrase">
<div class="columns extra-padding-bottom" ng-show="!backupC.credentialsEncrypted">
<div class="line-t p10 size-10 text-gray text-center" ng-show="backupC.mnemonicHasPassphrase">
<i class="fi-alert"></i>
<span translate>
This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed.
@ -96,11 +107,11 @@
<div class="button-box">
<button
ng-show="!wordsC.deleted"
ng-disabled="wordsC.credentialsEncrypted || wordsC.error"
ng-show="!backupC.deleted"
ng-disabled="backupC.credentialsEncrypted || backupC.error"
class="round expand m0"
ng-style="{'background-color':index.backgroundColor}"
ng-click="wordsC.goToStep(2);"
ng-click="backupC.goToStep(2);"
translate>Continue
</button>
</div>
@ -110,19 +121,19 @@
## STEP 2
-->
<div ng-show="wordsC.step == 2">
<div ng-show="backupC.step == 2">
<div class="columns text-center extra-padding-bottom">
<h5 translate>Confirm your wallet recovery phrase</h5>
<p class="text-gray m0" translate>
Please tap the words in order to confirm your backup phrase is correctly written.
</p>
<div class="panel words text-left">
<span ng-repeat="cword in wordsC.customWords track by $index" ng-show="wordsC.customWords[$index]">
<span ng-repeat="cword in backupC.customWords track by $index" ng-show="backupC.customWords[$index]">
<button class="button radius tiny words" ng-click="removeButton($index, cword)">{{cword.word}}</button>
</span>
</div>
<div class="text-left">
<span ng-repeat="shuffledWord in wordsC.shuffledMnemonicWords track by $index">
<span ng-repeat="shuffledWord in backupC.shuffledMnemonicWords track by $index">
<button class="button radius tiny words" ng-click="addButton($index, shuffledWord)"
ng-disabled="shuffledWord.selected">{{shuffledWord.word}}
</button>
@ -132,10 +143,10 @@
<div class="button-box">
<button
ng-disabled="!wordsC.selectComplete"
ng-disabled="!backupC.selectComplete"
class="round expand m0"
ng-style="{'background-color':index.backgroundColor}"
ng-click="wordsC.goToStep(3);"
ng-click="backupC.goToStep(3);"
translate>Continue
</button>
</div>
@ -145,7 +156,7 @@
## STEP 3
-->
<div ng-show="wordsC.step == 3">
<div ng-show="backupC.step == 3">
<div class="columns text-center">
<h5 translate>Enter your password</h5>
<p class="text-gray m0" translate>
@ -161,7 +172,7 @@
ng-disabled="!passphrase"
ng-style="{'background-color':index.backgroundColor}"
class="button round expand m0"
ng-click="wordsC.goToStep(4);"
ng-click="backupC.goToStep(4);"
translate>Continue
</button>
</div>
@ -171,8 +182,8 @@
## STEP 4
-->
<div ng-show="wordsC.step == 4">
<div class="row m10t m10b text-center" ng-show="!wordsC.backupError">
<div ng-show="backupC.step == 4">
<div class="row m10t m10b text-center" ng-show="!backupC.backupError">
<div class="circle-icon">
<i class="fi-like size-48"></i>
</div>
@ -185,7 +196,7 @@
<button
ng-style="{'background-color':index.backgroundColor}"
class="button round expand"
ng-click="$root.go('walletHome');"
href ui-sref="walletHome"
translate>Finish
</button>
<!-- hide this in multisig just to show less text -->
@ -201,7 +212,7 @@
</div>
</div>
</div>
<div class="row m10t m10b text-center" ng-show="wordsC.backupError">
<div class="row m10t m10b text-center" ng-show="backupC.backupError">
<div class="circle-icon">
<i class="fi-dislike size-48"></i>
</div>
@ -222,7 +233,7 @@
<button
ng-style="{'background-color':index.backgroundColor}"
class="button round expand m0"
ng-click="wordsC.goToStep(1);"
ng-click="backupC.goToStep(1);"
translate>Try again
</button>
</div>