BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4931 from gabrielbazan7/ref/txpTimeline1 

change complete date format to time ago
This commit is contained in:
Matias Alejo Garcia 2016-10-27 12:41:47 -03:00 committed by GitHub
parent a97d1385cb 2f78ae04e8
commit 2ce9e4bf23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/views/modals/tx-details.html
View File

@ -41,6 +41,12 @@
<div>{{wallet.name}}</div>
</div>
</div>
<div class="item single-line">
<span class="label" translate>Created by</span>
<span class="item-note">
{{btx.creatorName}} <time>{{ (btx.ts || btx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
</span>
</div>
<a class="item single-line item-icon-right" ng-hide="insuffientFunds" ng-click="showCommentPopup()">
<span class="label" translate>Memo</span>
<span class="item-note m10l">
@ -54,7 +60,6 @@
{{btx.feeStr}}
</span>
</div>
<div ng-if="actionList[0]">
<div class="item item-divider" translate>Timeline</div>
<div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList | orderBy: 'time' :true track by $index">
@ -72,7 +77,7 @@
</div>
<div>
<span class="item-note">
<time>{{ a.time * 1000 | amDateFormat:'hh:mm a'}}</time>
<time>{{ a.time * 1000 | amTimeAgo}}</time>
</span>
</div>
</div>

12
www/views/modals/txp-details.html
View File

@ -79,8 +79,14 @@
<div>{{wallet.name}}</div>
</div>
</div>
<div class="item" ng-show="tx.message">
{{'Memo'|translate}}
<div class="item single-line">
<span class="label" translate>Created by</span>
<span class="item-note">
{{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
</span>
</div>
<div class="item single-line" ng-show="tx.message">
<span class="label" translate>{{'Memo'|translate}}</span>
<span class="item-note">
{{tx.message}}
</span>
@ -135,7 +141,7 @@
</div>
<div>
<span class="item-note">
<time>{{ a.time * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
<time>{{ a.time * 1000 | amTimeAgo}}</time>
</span>
</div>
</div>