Merge pull request #1554 from cmgustavo/bug/05-import

Bug/import-backup
This commit is contained in:
Ivan Socolsky 2014-10-10 17:39:15 -03:00
commit 99ab79e1bf
11 changed files with 78 additions and 58 deletions

View file

@ -12,8 +12,10 @@
</div>
<div class="large-8 columns">
<div class="box-setup oh">
<img src="img/step-1.png" alt="Step 1" width="157" class="right m15t" ng-if="!isSetupWalletPage && !isMobile">
<img src="img/step-2.png" alt="Step 2" width="157" class="right m15t" ng-if="isSetupWalletPage && !isMobile">
<img src="img/step-1.png" alt="Step 1" width="157" class="right
m15t hide-for-small-only" ng-if="!isSetupWalletPage && !isMobile">
<img src="img/step-2.png" alt="Step 2" width="157" class="right
m15t hide-for-small-only" ng-if="isSetupWalletPage && !isMobile">
<h1 translate class="text-secondary line-sidebar-b">Create new wallet</h1>
<label ng-show="!isSetupWalletPage"><span translate>Wallet name</span>
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName">
@ -45,7 +47,7 @@
</div>
<a class="expand small" ng-click="hideAdv=!hideAdv">
<i class="fi-widget m3r"></i>
<i class="fi-widget m3r"></i>
<span translate ng-hide="!hideAdv">Show</span>
<span translate ng-hide="hideAdv">Hide</span>
<span translate>advanced options</span>
@ -54,7 +56,6 @@
<input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-checked="networkName == 'testnet' ? true : false">
<label for="network-name" translate>Use test network</label>
<p>
<input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="private">
</div>
@ -79,7 +80,7 @@
</div>
</div>
<p translate class="comment" ng-show="totalCopayers>1 && !isSetupWalletPage">(*) The limits are imposed by the bitcoin network.</p>
<div class="text-right">
<div class="text-right m20t">
<a ng-show="!isSetupWalletPage" class="back-button m20r" href="#!/">&laquo; <span translate>Back</span></a>
<a ng-show="isSetupWalletPage" class="back-button m20r" ng-click="setupWallet()">&laquo; <span translate>Back</span></a>
<button translate ng-show="isSetupWalletPage" type="submit" class="button secondary m0" ng-disabled="setupForm.$invalid || loading">