Merge pull request #3293 from cmgustavo/ref/pref-styling

Fix pref styling: export and paper wallet
This commit is contained in:
Matias Alejo Garcia 2015-10-08 15:28:48 -03:00
commit a8093149ea
2 changed files with 91 additions and 76 deletions

View file

@ -6,44 +6,52 @@
<div class="content p20v" ng-controller="backupController as backup">
<div class="row">
<div class="columns" ng-show="!backup.backupWalletPlainText">
<div class="content preferences" ng-controller="backupController as backup">
<h4></h4>
<div ng-show="!backup.backupWalletPlainText">
<div class="text-warning size-14 m20b" ng-show="backup.error">
<i class="fi-alert size-12"></i>
<span translate> Failed to export </span>
</div>
<div class="text-warning size-14 m20b" ng-show="backup.isEncrypted">
<i class="fi-alert size-12"></i>
<span translate> The private key for this wallet is encrypted. Exporting keep the private key encrypted in the export archive.</span>
<div class="row">
<div class="columns">
<div class="text-warning size-14 m20b" ng-show="backup.isEncrypted">
<i class="fi-alert size-12"></i>
<span translate> The private key for this wallet is encrypted. Exporting keep the private key encrypted in the export archive.</span>
</div>
<label for="password" translate>Set up a Export Password </label>
<div class="input">
<input type="password" class="form-control"
placeholder="{{'Your export password'|translate}}"
name="password" ng-model="backup.password">
</div>
<label for="password" translate>Repeat password</label>
<div class="input">
<input type="password" class="form-control"
placeholder="{{'Repeat password'|translate}}"
name="password" ng-model="backup.repeatpassword">
</div>
<div class="row" ng-hide="index.isPrivKeyExternal">
<div class="large-12 columns">
<label for="no-sign" class="line-b oh">
<span translate>Do not include private key</span>
<switch id="no-sign" name="noSign" ng-model="noSign" class="green right m5t m10b"></switch>
</label>
</div>
</div>
</div>
<form>
<div class="row">
<div class="columns">
<label for="password" translate>Set up a Export Password </label>
<div class="input">
<input type="password" class="form-control"
placeholder="{{'Your export password'|translate}}"
name="password" ng-model="backup.password">
</div>
<label for="password" translate>Repeat password</label>
<div class="input">
<input type="password" class="form-control"
placeholder="{{'Repeat password'|translate}}"
name="password" ng-model="backup.repeatpassword">
</div>
</div>
</div>
</form>
<h4></h4>
<ul class="no-bullet m0" ng-hide="index.isPrivKeyExternal">
<li>
<switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch>
<span translate>Do not include private key</span>
</li>
</ul>
<div class="box-notification" ng-show="index.isPrivKeyExternal">
<span class="text-warning size-14">
@ -65,28 +73,32 @@
</div>
<button class="black round expand m0" ng-click="backup.downloadWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-show="!index.isSafari && !index.isCordova"><i class="fi-download"></i>
<span translate>Download</span></button>
<button class="black round expand m0" ng-click="backup.viewWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-show="index.isSafari && !index.isCordova"><i class="fi-eye"></i>
<span translate>View</span></button>
<div ng-show="index.isCordova">
<h4 translate>Export options</h4>
<button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-click="backup.copyWalletBackup()"><i class="fi-clipboard-pencil"></i>
<span translate>Copy to clipboard</span></button>
<button class="black round expand m0" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-click="backup.sendWalletBackup()"><i class="fi-mail"></i>
<span translate>Send by email</span></button>
<div class="row">
<div class="columns">
<button class="black round expand m20t" ng-click="backup.downloadWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-show="!index.isSafari && !index.isCordova"><i class="fi-download"></i>
<span translate>Download</span></button>
<button class="black round expand m20t" ng-click="backup.viewWalletBackup()"
ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-show="index.isSafari && !index.isCordova"><i class="fi-eye"></i>
<span translate>View</span></button>
<div ng-show="index.isCordova">
<h4 translate>Export options</h4>
<button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-click="backup.copyWalletBackup()"><i class="fi-clipboard-pencil"></i>
<span translate>Copy to clipboard</span></button>
<button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
ng-style="{'background-color':index.backgroundColor}"
ng-click="backup.sendWalletBackup()"><i class="fi-mail"></i>
<span translate>Send by email</span></button>
</div>
</div>
</div>
</div>
</div>
<div class="row" ng-show="backup.backupWalletPlainText">

View file

@ -4,7 +4,8 @@
ng-init="titleSection='Sweep paper wallet'; goBackToState = 'preferencesAdvanced';">
</div>
<div class="content p20v" ng-controller="paperWalletController as paperWallet">
<div class="content preferences" ng-controller="paperWalletController as paperWallet">
<h4 ng-show="!paperWallet.error"></h4>
<div class="onGoingProcess" ng-show="paperWallet.scanning || paperWallet.sending">
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
<div class="spinner">
@ -22,33 +23,35 @@
<i class="fi-alert size-12"></i>
<span>{{paperWallet.error|translate}}</span>
</div>
<div ng-show="!paperWallet.balance" class="row">
<div class="large-12 medium-12 columns">
<div class="input">
<label for="inputData" translate>Paper Wallet Private Key</label>
<input type="text" placeholder="{{'Paste your paper wallet private key here'|translate}}" ng-model="inputData" id="inputData" ng-change="paperWallet.onData(inputData)">
<div class="qr-scanner-input">
<qr-scanner on-scan="paperWallet.onQrCodeScanned(data)"></qr-scanner>
</div>
<div ng-show="paperWallet.isPkEncrypted">
<label for="passphrase">
<span translate>Passphrase</span>
</label>
<input id="passphrase" type="password" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
<p ng-show="index.isCordova" translate class="size-12 text-gray">
Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open.
</p>
</div>
<button
ng-disabled="paperWallet.scanning || !paperWallet.scannedKey"
ng-style="{'background-color':index.backgroundColor}"
class="button black round expand"
ng-click="paperWallet.scanFunds()"
translate>Scan Wallet Funds
</button>
</div>
<form ng-show="!paperWallet.balance" class="oh">
<div class="row">
<div class="large-12 medium-12 columns">
<div class="input">
<label for="inputData" translate>Paper Wallet Private Key</label>
<input type="text" placeholder="{{'Paste your paper wallet private key here'|translate}}" ng-model="inputData" id="inputData" ng-change="paperWallet.onData(inputData)">
<div class="qr-scanner-input">
<qr-scanner on-scan="paperWallet.onQrCodeScanned(data)"></qr-scanner>
</div>
<div ng-show="paperWallet.isPkEncrypted">
<label for="passphrase">
<span translate>Passphrase</span>
</label>
<input id="passphrase" type="password" name="passphrase" placeholder="{{'Passphrase'|translate}}" ng-model="passphrase">
<p ng-show="index.isCordova" translate class="size-12 text-gray">
Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open.
</p>
</div>
<button
ng-disabled="paperWallet.scanning || !paperWallet.scannedKey"
ng-style="{'background-color':index.backgroundColor}"
class="button black round expand"
ng-click="paperWallet.scanFunds()"
translate>Scan Wallet Funds
</button>
</div>
</div>
</div>
</div>
</form>
<div ng-show="paperWallet.balance" class="row">
<div class="large-12 medium-12 columns">
<div class="text-center m20b">