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

Fixed layout, relative time. Standardize on use of timeService.

Browse source
This commit is contained in:
Andy Phillipson 2017-06-08 10:38:58 -04:00
commit ae777d6639
No known key found for this signature in database
GPG key ID: D813A67D567D6C88
10 changed files with 40 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
www/views/includes/cardActivity.html
View file

@ -1,5 +1,5 @@
<div class="item" ng-class="{'sent': tx.price.toString().indexOf('-') > -1 && !tx.pending, 'receive': tx.price.toString().indexOf('-') == -1 && !tx.pending, 'pending': tx.pending}">
<img class="tx-icon svg" ng-src="img/mcc-icons/{{tx.icon}}.svg" width="40">
<div class="item activity" ng-class="{'sent': tx.price.toString().indexOf('-') > -1 && !tx.pending, 'receive': tx.price.toString().indexOf('-') == -1 && !tx.pending, 'pending': tx.pending}">
<img class="tx-icon svg" ng-src="img/mcc-icons/{{tx.icon}}.svg">
<div class="tx-content">
<div class="tx-title">
<div class="ellipsis">

4
www/views/includes/txp.html
View file

@ -28,8 +28,8 @@
</span>
</span>
<div>
<time class="wallet-details__tx-time" ng-if="tx.createdOn && createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | amTimeAgo}}</time>
<time class="wallet-details__tx-time" ng-if="tx.createdOn && !createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | date:'MMMM d, y'}}</time>
<time class="wallet-details__tx-time" ng-if="tx.createdOn && createdWithinPastDay(tx.createdOn * 1000)">{{tx.createdOn * 1000 | amTimeAgo}}</time>
<time class="wallet-details__tx-time" ng-if="tx.createdOn && !createdWithinPastDay(tx.createdOn * 1000)">{{tx.createdOn * 1000 | date:'MMMM d, y'}}</time>
</div>
</span>
</div>

4
www/views/includes/walletHistory.html
View file

@ -64,8 +64,8 @@
</span>
</span>
<div>
<time class="wallet-details__tx-time" ng-if="btx.time && createdWithinPastDay(btx.time)">{{btx.time * 1000 | amTimeAgo}}</time>
<time class="wallet-details__tx-time" ng-if="btx.time && !createdWithinPastDay(btx.time)">
<time class="wallet-details__tx-time" ng-if="btx.time && createdWithinPastDay(btx.time * 1000)">{{btx.time * 1000 | amTimeAgo}}</time>
<time class="wallet-details__tx-time" ng-if="btx.time && !createdWithinPastDay(btx.time * 1000)">
{{btx.time * 1000 | amDateFormat:'MMM D, YYYY'}}
</time>
</div>