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

refactor

Browse source
This commit is contained in:
Javier 2016-02-19 13:29:41 -03:00
commit 8d591ab7ab
3 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/modals/txp-details.html
View file

@ -149,7 +149,7 @@
<li class="line-b p10" ng-if="!paymentExpired">
<span class="text-gray" translate>Expires</span>
<span class="right">
<time>{{tx.paypro.expires * 1000 | amTimeAgo }}</time>
<time>{{expires * 1000 | amTimeAgo }}</time>
</span>
</li>
<li class="line-b p10">

6
public/views/walletHome.html
View file

@ -175,7 +175,7 @@
<div translate>Updating transaction history. Please stand by.</div>
</div>
</div>
</div>
</div>
<div class="oh pr" ng-show="index.txHistory[0]">
<h4 class="title m0">
@ -365,7 +365,7 @@
ng-click="home.sendAll()"
translate> Send All
</a>
<div ng-show="!home.paymentExpired">
<div ng-show="!home.paymentExpired && home._paypro">
<span translate>Payment expires</span>
<time> {{home.timeToExpire * 1000 | amTimeAgo}}</time>
</div>
@ -477,7 +477,7 @@
<a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
</div>
<div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress || home.lockAmount)}">
<button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline || (home.paymentExpired && home.usePaypro)"
<button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline || (home.paymentExpired && home._paypro)"
ng-style="{'background-color':index.backgroundColor}" translate>
Send
</button>