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

Added date of transaction

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-09-29 18:50:19 -03:00
commit adae23ed74
2 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
css/src/main.css
View file

@ -333,12 +333,26 @@ table.last-transactions-content {
}
.private-message {
white-space: normal;
text-align: left;
width: 100%;
background-color: #008cba;
padding: 5px 10px;
margin-bottom: 10px;
padding-bottom: 5px;
border-bottom: 1px solid #fff;
line-height: 20px;
}
.header-message {
background-color: #F8F8FB;
height: 18px;
}
.date-message {
background-color: #3C4E60;
color: #fff;
font-size: 12px;
padding: 2px 5px;
-webkit-border-radius: 0 5px 0 0;
-moz-border-radius: 0 5px 0 0;
-ms-border-radius: 0 5px 0 0;
border-radius: 0 5px 0 0;
}
.input-note {

31
views/includes/transaction.html
View file

@ -1,20 +1,25 @@
<div class="show-for-small-only header-message">
<span class="date-message">{{tx.createdTs | amCalendar}}</span>
</div>
<div class="last-transactions-header" ng-init="txIndex = $index">
<h4 class="show-for-small-only">{{tx.createdTs | amCalendar}}</h4>
<div class="show-for-small-only private-message">
<i class="fi-comment-quotes"></i> {{tx.comment}}
</div>
<div class="row collapse">
<div class="show-for-large-up large-1 columns">
<a class="text-black" ng-show="tx.comment">
<i class="fi-comment-quotes size-24" popover-animation="true" popover="{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}" popover-title="{{tx.comment}}" popover-placement="right" popover-trigger="mouseenter"></i>
<a class="text-black"
ng-show="tx.comment"
popover-animation="true"
popover="{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}"
popover-title="{{tx.comment}}"
popover-placement="right"
popover-trigger="mouseenter">
<i class="fi-comment-quotes size-24"></i>
</a>
<a class="disable" ng-show="!tx.comment">
<i class="fi-comment-quotes size-24 text-gray"></i>
</a>
</div>
<div class="hide-for-large-up small-12 medium-12 columns m10b" ng-show="tx.comment">
<div class="private-message">
{{tx.comment}} <small>Created by
<strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong></small>
</div>
</div>
<div class="large-8 medium-8 small-12 columns">
<div class="row collapse" ng-repeat="out in tx.outs">
<div class="large-3 medium-3 small-4 columns">
@ -46,7 +51,7 @@
</div>
</div>
</div>
<table class="last-transactions-content show-for-small-only" summary="{{tx.createdTs | amCalendar}}">
<table class="last-transactions-content show-for-small-only">
<tbody>
<tr ng-repeat="c in tx.actionList">
<td class="copayer-name" width="100%">{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
@ -116,11 +121,11 @@
<i class="fi-x" ></i> <span translate>Reject</span>
</button>
</div>
<div class="show-for-small-only row m10b">
<button class="primary small-5 columns" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<div class="show-for-small-only row">
<button class="primary small-5 columns m10b" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<i class="fi-check"></i> <span translate>Sign</span>
</button>
<button class="warning small-5 columns" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<button class="warning small-5 columns m10b" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<i class="fi-x" ></i> <span translate>Reject</span>
</button>
</div>