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

5
public/views/buyCoinbase.html
View file

@ -106,7 +106,7 @@
</p> </p>
<button class="m20t outline black round expand" <button class="m20t outline black round expand"
ng-style="{'background-color': '#2b71b1'}" ng-style="{'background-color': '#2b71b1'}"
ng-click="$root.go('coinbase')">OK</button> href ui-sref="coinbase">OK</button>
</div> </div>
</div> </div>
@ -161,8 +161,7 @@
Bitcoin purchase completed. Coinbase has queued the transfer to your selected Copay wallet. Bitcoin purchase completed. Coinbase has queued the transfer to your selected Copay wallet.
</p> </p>
<button class="outline dark-gray round expand" <button class="outline dark-gray round expand" href ui-sref="coinbase">OK</button>
ng-click="$root.go('coinbase')">OK</button>
</div> </div>
</div> </div>

5
public/views/buyGlidera.html
View file

@ -115,10 +115,7 @@
A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days. A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.
</p> </p>
<button class="outline dark-gray round expand" <button class="outline dark-gray round expand" href ui-sref="glidera">OK</button>
ng-click="$root.go('glidera')">
OK
</button>
</div> </div>
</div> </div>
</div> </div>

8
public/views/coinbase.html
View file

@ -11,7 +11,7 @@
</section> </section>
<section class="right-small" ng-show="index.coinbaseAccount"> <section class="right-small" ng-show="index.coinbaseAccount">
<a class="p10" ng-click="$root.go('preferencesCoinbase')"> <a class="p10" href ui-sref="preferencesCoinbase">
<i class="fi-widget size-24"></i> <i class="fi-widget size-24"></i>
</a> </a>
</section> </section>
@ -43,7 +43,7 @@
Reconnect Reconnect
</button> </button>
<div class="m20t size-12"> <div class="m20t size-12">
Or go to <a class="text-gray" ng-click="$root.go('preferencesCoinbase')">Preferences</a> and log out manually. Or go to <a class="text-gray" href ui-sref="preferencesCoinbase">Preferences</a> and log out manually.
</div> </div>
</div> </div>
</div> </div>
@ -102,7 +102,7 @@
<ul ng-show="index.coinbaseAccount" class="no-bullet m0 size-12"> <ul ng-show="index.coinbaseAccount" class="no-bullet m0 size-12">
<li class="line-b line-t p15 pointer" <li class="line-b line-t p15 pointer"
ng-click="$root.go('buyCoinbase')"> href ui-sref="buyCoinbase">
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="30"> <img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="30">
<span class="m10 text-normal text-bold">Buy Bitcoin</span> <span class="m10 text-normal text-bold">Buy Bitcoin</span>
<span class="right text-gray"> <span class="right text-gray">
@ -110,7 +110,7 @@
</span> </span>
</li> </li>
<li class="line-b p15 pointer" <li class="line-b p15 pointer"
ng-click="$root.go('sellCoinbase')"> href ui-sref="sellCoinbase">
<img src="img/sell-bitcoin.svg" alt="sell bitcoin" width="30"> <img src="img/sell-bitcoin.svg" alt="sell bitcoin" width="30">
<span class="m10 text-normal text-bold">Sell Bitcoin</span> <span class="m10 text-normal text-bold">Sell Bitcoin</span>
<span class="right text-gray"> <span class="right text-gray">

8
public/views/glidera.html
View file

@ -28,7 +28,7 @@
Retry Retry
</button> </button>
<div class="m20t size-12"> <div class="m20t size-12">
<a class="text-gray" ng-click="$root.go('preferencesGlidera')">Preferences</a> <a class="text-gray" href ui-sref="preferencesGlidera">Preferences</a>
</div> </div>
</div> </div>
</div> </div>
@ -94,7 +94,7 @@
<div class="p20v text-center white"> <div class="p20v text-center white">
<img src="img/glidera-logo.png" ng-click="index.updateGlidera(index.glideraToken, index.glideraPermissions)" width="100"> <img src="img/glidera-logo.png" ng-click="index.updateGlidera(index.glideraToken, index.glideraPermissions)" width="100">
</div> </div>
<div class="sub-header" ng-click="$root.go('preferencesGlidera')"> <div class="sub-header" href ui-sref="preferencesGlidera">
<div class="left"> <div class="left">
<div ng-show="!index.glideraPersonalInfo && !index.glideraEmail"> <div ng-show="!index.glideraPersonalInfo && !index.glideraEmail">
Preferences Preferences
@ -136,7 +136,7 @@
ng-show="index.glideraStatus && index.glideraStatus.userCanTransact"> ng-show="index.glideraStatus && index.glideraStatus.userCanTransact">
<li ng-show="index.glideraStatus.userCanBuy" <li ng-show="index.glideraStatus.userCanBuy"
class="line-b line-t p20 pointer" class="line-b line-t p20 pointer"
ng-click="$root.go('buyGlidera')"> href ui-sref="buyGlidera">
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="40"> <img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="40">
<span class="m10 text-normal text-bold">Buy Bitcoin</span> <span class="m10 text-normal text-bold">Buy Bitcoin</span>
<span class="right text-gray"> <span class="right text-gray">
@ -145,7 +145,7 @@
</li> </li>
<li class="line-b p20 pointer" <li class="line-b p20 pointer"
ng-show="index.glideraStatus.userCanSell" ng-show="index.glideraStatus.userCanSell"
ng-click="$root.go('sellGlidera')"> href ui-sref="sellGlidera">
<img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="40"> <img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="40">
<span class="m10 text-normal text-bold">Sell Bitcoin</span> <span class="m10 text-normal text-bold">Sell Bitcoin</span>
<span class="right text-gray"> <span class="right text-gray">

11
public/views/includes/sidebar.html
View file

@ -7,18 +7,15 @@
<ion-content overflow-scroll="true"> <ion-content overflow-scroll="true">
<ul class="pr"> <ul class="pr">
<li ng-show="sidebar.wallets[0]" <li ng-show="sidebar.wallets[0]"
ng-repeat="item in sidebar.wallets track by $index" ng-repeat="item in sidebar.wallets track by $index" ng-class="{'selected': item.id == index.walletId}" class="nav-item"
ng-class="{'selected': item.id == index.walletId}" menu-toggle href ui-sref="walletHome" on-touch="sidebar.switchWallet(item.id, index.walletId)">
class="nav-item" <div class="avatar-wallet" ng-style="{'background-color':item.color}">
menu-toggle on-touch="$root.go('walletHome'); sidebar.switchWallet(item.id, index.walletId)" >
<div class="avatar-wallet"
ng-style="{'background-color':item.color}">
<i class="icon-wallet size-21"></i> <i class="icon-wallet size-21"></i>
</div> </div>
<div class="name-wallet" ng-class="{'m8t':item.n == 1}">{{item.name || item.id}}</div> <div class="name-wallet" ng-class="{'m8t':item.n == 1}">{{item.name || item.id}}</div>
<div class="size-12" ng-show="item.n > 1" translate>{{item.m}}-of-{{item.n}}</div> <div class="size-12" ng-show="item.n > 1" translate>{{item.m}}-of-{{item.n}}</div>
</li> </li>
<li menu-toggle href ui-sref="add"> <li menu-toggle href ui-sref="add">
<i class="icon-arrow-right3 size-18 right m10t vm"></i> <i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-plus size-24 icon vm"></i> <i class="fi-plus size-24 icon vm"></i>
<div class="tu text-bold"> <div class="tu text-bold">

7
public/views/includes/topbar.html
View file

@ -4,14 +4,13 @@
<a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet" <a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
on-tap="index.toggleLeftMenu()"><i class="fi-list size-24"></i> on-tap="index.toggleLeftMenu()"><i class="fi-list size-24"></i>
</a> </a>
<a ng-show="goBackToState" <a ng-show="goBackToState" ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i> <span class="text-back" translate>Back</span>
<span class="text-back">{{'Back'|translate}}</span>
</a> </a>
<a ng-show="closeToHome" class="p10 " <a ng-show="closeToHome" class="p10 "
ng-click="topbar.goHome(); index.setCompactTxHistory(); closeToHome = null"> ng-click="topbar.goHome(); index.setCompactTxHistory(); closeToHome = null">
<span class="text-close">{{'Close'|translate}}</span> <span class="text-close" translate>Close</span>
</a> </a>
</section> </section>

12
public/views/preferences.html
View file

@ -12,7 +12,7 @@
<ul class="no-bullet m0" ng-show="!index.noFocusedWallet"> <ul class="no-bullet m0" ng-show="!index.noFocusedWallet">
<li ng-click="$root.go('preferencesAlias')"> <li href ui-sref="preferencesAlias">
<div class="right text-gray"> <div class="right text-gray">
{{index.alias||index.walletName}} {{index.alias||index.walletName}}
<i class="icon-arrow-right3 size-24"></i> <i class="icon-arrow-right3 size-24"></i>
@ -20,7 +20,7 @@
<div translate>Alias</div> <div translate>Alias</div>
</li> </li>
<li ng-click="$root.go('preferencesEmail')"> <li href ui-sref="preferencesEmail">
<div class="right text-gray"> <div class="right text-gray">
<span ng-if="!index.preferences.email" translate>Disabled</span> <span ng-if="!index.preferences.email" translate>Disabled</span>
<span ng-if="index.preferences.email">{{index.preferences.email}}</span> <span ng-if="index.preferences.email">{{index.preferences.email}}</span>
@ -29,7 +29,7 @@
<div translate>Email Notifications</div> <div translate>Email Notifications</div>
</li> </li>
<li ng-click="$root.go('preferencesColor')"> <li href ui-sref="preferencesColor">
<div class="right text-gray"> <div class="right text-gray">
<span ng-style="{'color':index.backgroundColor}">&block;</span> <span ng-style="{'color':index.backgroundColor}">&block;</span>
<i class="icon-arrow-right3 size-24"></i> <i class="icon-arrow-right3 size-24"></i>
@ -45,7 +45,7 @@
<div translate>Hardware wallet</div> <div translate>Hardware wallet</div>
</li> </li>
<li ng-click="$root.go('backup')" ng-hide="index.isPrivKeyExternal"> <li href ui-sref="backup" ng-hide="index.isPrivKeyExternal">
<div class="right text-gray"> <div class="right text-gray">
<span class="text-warning" ng-show="index.needsBackup"> <span class="text-warning" ng-show="index.needsBackup">
<i class="fi-alert"></i> <span translate>Not completed</span> <i class="fi-alert"></i> <span translate>Not completed</span>
@ -55,7 +55,7 @@
<div translate>Backup</div> <div translate>Backup</div>
</li> </li>
<li ng-click="$root.go('preferencesAdvanced')"> <li href ui-sref="preferencesAdvanced">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Advanced</div> <div translate>Advanced</div>
</li> </li>
@ -78,7 +78,7 @@
<div ng-show ="!deleted"> <div ng-show ="!deleted">
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-click="$root.go('deleteWords')"> <li href ui-sref="deleteWords">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Delete recovery phrase</div> <div translate>Delete recovery phrase</div>
</li> </li>

24
public/views/preferencesAbout.html
View file

@ -1,5 +1,5 @@
<div <div
class="topbar-container" class="topbar-container"
ng-include="'views/includes/topbar.html'" ng-include="'views/includes/topbar.html'"
ng-init="titleSection='About Copay'; goBackToState = 'preferencesGlobal'; noColor = true"> ng-init="titleSection='About Copay'; goBackToState = 'preferencesGlobal'; noColor = true">
</div> </div>
@ -11,30 +11,30 @@
<li ng-conf> <li ng-conf>
<span translate>Version</span> <span translate>Version</span>
<span class="right text-gray"> <span class="right text-gray">
v{{v.version}} v{{v.version}}
</span> </span>
</li> </li>
<li ng-conf ng-click="$root.openExternalLink('https://github.com/bitpay/copay/tree/'+v.commitHash)"> <li ng-conf ng-click="$root.openExternalLink('https://github.com/bitpay/copay/tree/'+v.commitHash)">
<span translate>Commit hash</span> <span translate>Commit hash</span>
<span class="right text-gray"> <span class="right text-gray">
#{{v.commitHash}} #{{v.commitHash}}
</span> </span>
</li> </li>
</ul> </ul>
</div> </div>
<h4></h4> <h4></h4>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-click="$root.go('termOfUse')"> <li href ui-sref="termOfUse">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>Terms of Use</span> <span translate>Terms of Use</span>
</li> </li>
<li ng-click="$root.go('translators')"> <li href ui-sref="translators">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>Translators</span> <span translate>Translators</span>
</li> </li>
<li ng-conf ng-click="$root.go('logs')"> <li ng-conf href ui-sref="logs">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>Session log</span> <span translate>Session log</span>
</li> </li>
</ul> </ul>

30
public/views/preferencesAdvanced.html
View file

@ -1,5 +1,5 @@
<div <div
class="topbar-container" class="topbar-container"
ng-include="'views/includes/topbar.html'" ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Advanced'; goBackToState = 'preferences'"> ng-init="titleSection='Advanced'; goBackToState = 'preferences'">
</div> </div>
@ -7,35 +7,35 @@
<div class="content preferences" ng-controller="preferencesAdvancedController as preferences"> <div class="content preferences" ng-controller="preferencesAdvancedController as preferences">
<h4></h4> <h4></h4>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-click="$root.go('information')"> <li href ui-sref="information">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Wallet Information</div> <div translate>Wallet Information</div>
</li> </li>
<li ng-show="index.network == 'livenet'" ng-click="$root.go('paperWallet')"> <li ng-show="index.network == 'livenet'" href ui-sref="paperWallet">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Sweep paper wallet</div> <div translate>Sweep paper wallet</div>
</li> </li>
<li ng-click="$root.go('export')"> <li href ui-sref="export">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Export Wallet</div> <div translate>Export Wallet</div>
</li> </li>
<li ng-click="$root.go('preferencesBwsUrl')"> <li href ui-sref="preferencesBwsUrl">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div>Wallet Service URL</div> <div>Wallet Service URL</div>
</li> </li>
<li ng-click="$root.go('preferencesHistory')"> <li href ui-sref="preferencesHistory">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Transaction History</div> <div translate>Transaction History</div>
</li> </li>
<li ng-click="$root.go('delete')"> <li href ui-sref="delete">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Delete Wallet</div> <div translate>Delete Wallet</div>
</li> </li>

10
public/views/preferencesGlobal.html
View file

@ -6,7 +6,7 @@
<div class="content preferences" ng-controller="preferencesGlobalController as prefGlobal" ng-init="prefGlobal.init()"> <div class="content preferences" ng-controller="preferencesGlobalController as prefGlobal" ng-init="prefGlobal.init()">
<h4></h4> <h4></h4>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-click="$root.go('preferencesLanguage')"> <li href ui-sref="preferencesLanguage">
<div class="right text-gray"> <div class="right text-gray">
{{prefGlobal.currentLanguageName|translate}} {{prefGlobal.currentLanguageName|translate}}
<i class="icon-arrow-right3 size-24"></i> <i class="icon-arrow-right3 size-24"></i>
@ -17,7 +17,7 @@
<h4></h4> <h4></h4>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-click="$root.go('preferencesUnit')"> <li href ui-sref="preferencesUnit">
<div class="right text-gray"> <div class="right text-gray">
{{prefGlobal.unitName}} {{prefGlobal.unitName}}
<i class="icon-arrow-right3 size-24"></i> <i class="icon-arrow-right3 size-24"></i>
@ -25,7 +25,7 @@
<div translate>Unit</div> <div translate>Unit</div>
</li> </li>
<li ng-click="$root.go('preferencesAltCurrency')"> <li href ui-sref="preferencesAltCurrency">
<div class="right text-gray"> <div class="right text-gray">
{{prefGlobal.selectedAlternative.name}} {{prefGlobal.selectedAlternative.name}}
<i class="icon-arrow-right3 size-24"></i> <i class="icon-arrow-right3 size-24"></i>
@ -36,7 +36,7 @@
<h4></h4> <h4></h4>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-click="$root.go('preferencesFee')"> <li href ui-sref="preferencesFee">
<div class="right text-gray"> <div class="right text-gray">
{{prefGlobal.feeOpts[prefGlobal.currentFeeLevel]|translate}} {{prefGlobal.feeOpts[prefGlobal.currentFeeLevel]|translate}}
<i class="icon-arrow-right3 size-24"></i> <i class="icon-arrow-right3 size-24"></i>
@ -68,7 +68,7 @@
<h4></h4> <h4></h4>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-click="$root.go('about')"> <li href ui-sref="about">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>About Copay</div> <div translate>About Copay</div>
</li> </li>

18
public/views/preferencesInformation.html
View file

@ -1,5 +1,5 @@
<div <div
class="topbar-container" class="topbar-container"
ng-include="'views/includes/topbar.html'" ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Wallet Information'; goBackToState = 'preferencesAdvanced'"> ng-init="titleSection='Wallet Information'; goBackToState = 'preferencesAdvanced'">
</div> </div>
@ -56,7 +56,7 @@
</span> </span>
</li> </li>
<li class="line-b p20 oh"> <li class="line-b p20 oh">
<span translate>Derivation Strategy</span> <span translate>Derivation Strategy</span>
<span class="right text-gray"> <span class="right text-gray">
@ -77,7 +77,7 @@
No private key No private key
</span> </span>
</li> </li>
<li class="line-b p20 oh" ng-show="index.account"> <li class="line-b p20 oh" ng-show="index.account">
<span translate>Account</span> ({{derivationStrategy}}) <span translate>Account</span> ({{derivationStrategy}})
<span class="right text-gray"> <span class="right text-gray">
@ -110,13 +110,13 @@
</div> </div>
</li> </li>
</ul> </ul>
<div ng-show="addrs"> <div ng-show="addrs">
<h4 class="title m0" translate>Last Wallet Addresses</h4> <h4 class="title m0" translate>Last Wallet Addresses</h4>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-repeat="a in addrs" class="oh"> <li ng-repeat="a in addrs" class="oh">
<div class="enable_text_select ellipsis"> <div class="enable_text_select ellipsis">
{{a.address}} {{a.address}}
</div> </div>
<div class="text-gray size-12 right enable_text_select"> <div class="text-gray size-12 right enable_text_select">
{{a.path}} &middot; {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }} {{a.path}} &middot; {{a.createdOn *1000 | amDateFormat:'MMMM Do YYYY, h:mm a' }}
@ -128,7 +128,7 @@
</div> </div>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-style="{'color':index.backgroundColor}" ng-click="index.retryScan(); $root.go('walletHome')" translate> <li ng-style="{'color':index.backgroundColor}" href ui-sref="walletHome" ng-click="index.retryScan()" translate>
Scan addresses for funds Scan addresses for funds
</li> </li>
<li ng-style="{'color':index.backgroundColor}" ng-show="index.isCordova" ng-click="info.sendAddrs()" translate> <li ng-style="{'color':index.backgroundColor}" ng-show="index.isCordova" ng-click="info.sendAddrs()" translate>
@ -142,10 +142,10 @@
<h4 class="title m0" translate>Balance By Address</h4> <h4 class="title m0" translate>Balance By Address</h4>
<li class="line-b p20 oh" ng-repeat="a in index.balanceByAddress"> <li class="line-b p20 oh" ng-repeat="a in index.balanceByAddress">
<div class="enable_text_select ellipsis"> <div class="enable_text_select ellipsis">
{{a.address}} {{a.address}}
</div> </div>
<div class="text-gray text-right"> <div class="text-gray text-right">
{{(a.amount/1e8).toFixed(8)}} BTC {{(a.amount/1e8).toFixed(8)}} BTC
</div> </div>
</li> </li>
</div> </div>

7
public/views/walletHome.html
View file

@ -9,9 +9,9 @@
<div class="text-center text-warning m20b"> <div class="text-center text-warning m20b">
<i class="fi-alert"></i> <span translate>You do not have a wallet</span> <i class="fi-alert"></i> <span translate>You do not have a wallet</span>
</div> </div>
<button class="button black round expand" ng-click="$root.go('add')" translate>Create</button> <button class="button black round expand" href ui-sref="add" translate>Create</button>
<div class="text-center text-gray p20v" ng-click="$root.go('preferencesGlobal')"> <div class="text-center text-gray p20v" href ui-sref="preferencesGlobal">
<button class=" outline round dark-gray tiny" translate>Settings</button> <button class=" outline round dark-gray tiny" translate>Settings</button>
</div> </div>
</div> </div>
@ -269,8 +269,7 @@
<p class="text-gray m20b columns" translate> <p class="text-gray m20b columns" translate>
Before receiving funds, it is necessary backup your wallet. If you lose this device, it is impossible to access your funds without a backup. Before receiving funds, it is necessary backup your wallet. If you lose this device, it is impossible to access your funds without a backup.
</p> </p>
<button class="m20t button black expand round" <button class="m20t button black expand round" href ui-sref="backup" ng-style="{'background-color':index.backgroundColor}" >
ng-click="$root.go('backup')" ng-style="{'background-color':index.backgroundColor}" >
<span translate>Backup now</span> <span translate>Backup now</span>
</button> </button>
</div> </div>

8
src/js/controllers/backup.js
View file

@ -43,6 +43,14 @@ angular.module('copayApp.controllers').controller('backupController',
return false; return false;
}; };
self.backTo = function(state) {
console.log(state);
if (state == 'walletHome')
go.walletHome();
else
go.preferences();
};
self.goToStep = function(n) { self.goToStep = function(n) {
if (n == 1) if (n == 1)
init(); init();