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

Merge pull request #3741 from bechi/feat/reorder-buttons

Browse source 
ordered buttons on receive section
This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-05 17:31:43 -03:00
commit 7386bb2bb8
1 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
public/views/walletHome.html
View file

@ -324,9 +324,9 @@
<div class="large-12 columns"> <div class="large-12 columns">
<h2 class="text-center m10t" translate>My Bitcoin address</h2> <h2 class="text-center m10t" translate>My Bitcoin address</h2>
<div class="text-center" ng-click="home.copyAddress(home.addr[index.walletId])" ng-show="home.addr[index.walletId] || home.generatingAddress"> <div class="text-center" ng-click="home.copyAddress(home.addr[index.walletId])" ng-show="home.addr[index.walletId] || home.generatingAddress">
<qrcode size="220" data="bitcoin:{{home.addr[index.walletId]}}"></qrcode> <qrcode size="180" data="bitcoin:{{home.addr[index.walletId]}}"></qrcode>
<div ng-show="home.generatingAddress" style="position:relative; top:-226px; height:0px"> <div ng-show="home.generatingAddress" style="position:relative; top:-226px; height:0px">
<div style="height:220px; width:220px; margin:auto; background: url(img/qr.png) white"> <div style="height:180px; width:180px; margin:auto; background: url(img/qr.png) white">
<div class="spinner" style="margin-top:80px"> <div class="spinner" style="margin-top:80px">
<div class="rect1"></div> <div class="rect1"></div>
<div class="rect2"></div> <div class="rect2"></div>
@ -343,34 +343,33 @@
</h4> </h4>
</div> </div>
</div> </div>
<div class="text-center m20b size-12 text-gray">
<a ng-click="home.setAddress(true)"
ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
Generate new address
</a>
</div>
<div ng-show="home.addr[index.walletId]"> <div ng-show="home.addr[index.walletId]">
<div class="m10t text-center" ng-show="index.isCordova"> <div class="line-t size-10 text-gray m10b" translate>
<span class="button outline dark-gray tiny round"
ng-click="home.shareAddress(home.addr[index.walletId])">
<i class="fi-share"></i>
<span translate>Share address</span>
</span>
</div>
<div class="line-t size-12" translate>
Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them. Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row m20t"> <div class="row m20t">
<div class="large-12 columns"> <div class="small-12 columns" ng-show="!home.generatingAddress && home.addr[index.walletId]">
<button class="button black expand round m0" ng-click="home.setAddress(true)" <a class="button expand small round m10b" ng-click="home.openCustomizedAmountModal(home.addr[index.walletId])"
ng-style="{'background-color':index.backgroundColor}" ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate> ng-style="{'background-color':index.backgroundColor}">
Generate new address <span translate>Request a specific amount</span>
</button> </a>
</div>
<div class="small-12 columns" ng-show="index.isCordova">
<span class="button outline light-gray small round expand"
ng-click="home.shareAddress(home.addr[index.walletId])">
<span translate>Share address</span>
</span>
</div> </div>
</div>
<div class="m20t text-center" ng-show="!home.generatingAddress && home.addr[index.walletId]">
<a class="size-12 text-gray" ng-click="home.openCustomizedAmountModal(home.addr[index.walletId])">
<i class="fi-bitcoin"></i>
<span translate>Request a specific amount</span>
</a>
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div> <div class="extra-margin-bottom"></div>