Merge pull request #2282 from cmgustavo/ux/receive-01

Fix generate address button on receive
This commit is contained in:
Matias Alejo Garcia 2015-01-07 11:13:41 -03:00
commit a8923d2a69
1 changed files with 10 additions and 13 deletions

View File

@ -5,20 +5,17 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row" ng-if="addr">
<!-- Address--> <!-- Address-->
<div class="large-12 columns" ng-if="addr"> <div class="large-12 columns">
<div class="panel"> <div class="panel">
<h2 class="line-b" translate>My Bitcoin address:</h2> <h2 class="line-b" translate>My Bitcoin address:</h2>
<div class="text-center" ng-if="!loading"> <div class="text-center">
<qrcode size="220" data="bitcoin:{{addr}}"></qrcode> <qrcode size="220" data="bitcoin:{{addr}}"></qrcode>
<div class="m10t"> <div class="m10t">
<h4 class="size-12">{{addr}}</h4> <h4 class="size-12">{{addr}}</h4>
</div> </div>
</div> </div>
<div class="text-center" ng-if="loading">
Generating new address...
</div>
<div class="line-t m10t size-12"> <div class="line-t m10t size-12">
Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them. Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them.
</div> </div>
@ -51,17 +48,17 @@
</div> </div>
<div class="large-12 columns"> <div class="large-12 columns">
<div class="row"> <div class="row">
<div class="large-6 medium-6 small-6 columns"> <div class="large-6 medium-6 small-6 columns text-left">
<a class="button secondary tiny text-center right" ng-click="newAddr()" ng-disabled="loading"> <a class="button secondary tiny" ng-click="toggleShowAll()">
Generate new address
</a>
</div>
<div class="large-6 medium-6 small-6 columns">
<a class="button secondary tiny text-center" ng-click="toggleShowAll()" ng-disabled="loading">
<span ng-show="!showAll" translate>Show all my addresses</span> <span ng-show="!showAll" translate>Show all my addresses</span>
<span ng-show="showAll" translate>Hide them</span> <span ng-show="showAll" translate>Hide them</span>
</a> </a>
</div> </div>
<div class="large-6 medium-6 small-6 columns text-right">
<a class="button secondary tiny" ng-click="newAddr()" ng-disabled="loading">
Generate new address
</a>
</div>
</div> </div>
</div> </div>
</div> </div>