fix private message on tx proposal

This commit is contained in:
bechi 2014-09-25 18:19:09 -03:00
commit e2f6d52f34
3 changed files with 64 additions and 49 deletions

View file

@ -279,11 +279,11 @@ a:hover {
} }
.last-transactions-header { .last-transactions-header {
padding: 1rem 0; padding: 1rem;
} }
.last-transactions-footer { .last-transactions-footer {
padding: 1rem 0; padding: 1rem;
overflow: hidden; overflow: hidden;
} }
@ -325,6 +325,12 @@ a:hover {
color: #fff; color: #fff;
} }
.last-transactions-header .label, .last-transactions-footer .label {
white-space: normal;
text-align: left;
line-height: 1.2rem;
}
.input-note { .input-note {
margin-top: -10px; margin-top: -10px;
display: block; display: block;

View file

@ -1,4 +1,5 @@
<div class="last-transactions-header oh"> <div class="last-transactions-header">
<div class="row collapse">
<div class="hide-for-small-only large-1 medium-1 columns"> <div class="hide-for-small-only large-1 medium-1 columns">
<a class="text-black" ng-show="tx.comment"> <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> <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>
@ -8,26 +9,28 @@
</a> </a>
</div> </div>
<div class="show-for-small-only small-12 columns m10b" ng-show="tx.comment"> <div class="show-for-small-only small-12 columns m10b" ng-show="tx.comment">
<p class="size-14 label ellipsis text-left"> <p class="size-14 label ">
{{tx.comment}} Created by <strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong> {{tx.comment}} Created by <strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong>
</p> </p>
</div> </div>
<div class="large-8 medium-8 small-9 columns"> <div class="large-8 medium-8 small-9 columns">
<div ng-repeat="out in tx.outs"> <div class="row collapse" ng-repeat="out in tx.outs">
<div class="large-3 medium-3 small-4 columns"> <div class="large-3 medium-3 small-4 columns">
<p class="size-14 hide-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p> <p class="size-14 hide-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
<p class="size-12 show-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p> <p class="size-12 show-for-small-only">{{out.value | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
</div> </div>
<div class="large-1 medium-1 small-2 columns fi-arrow-right"></div> <div class="large-1 medium-1 small-1 columns fi-arrow-right"></div>
<div class="large-8 medium-8 small-7 columns ellipsis"> <div class="large-8 medium-8 small-7 columns ellipsis">
<contact address="{{out.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right" /> <contact address="{{out.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right" />
</div> </div>
</div> </div>
</div> </div>
<div class="large-3 medium-3 small-3 columns text-right"> <div class="large-3 medium-3 small-3 columns text-right">
<p class="size-12">{{tx.createdTs | amCalendar}}</p> <p class="size-12">{{tx.createdTs | amCalendar}}</p>
</div> </div>
</div> </div>
</div>
<div class="last-transactions-content"> <div class="last-transactions-content">
<div class="box-copayer" ng-repeat="c in tx.actionList"> <div class="box-copayer" ng-repeat="c in tx.actionList">

View file

@ -5,8 +5,10 @@
<div class="large-12" ng-show="wallet.isShared()"> <div class="large-12" ng-show="wallet.isShared()">
<div class="last-transactions" ng-repeat="tx in txs | paged"> <div class="last-transactions" ng-repeat="tx in txs | paged">
<div class="row collapse">
<div ng-include="'views/includes/transaction.html'"></div> <div ng-include="'views/includes/transaction.html'"></div>
</div> </div>
</div>
<p ng-show="txs.length == 0"><span translate>No transactions proposals yet.</span> <p ng-show="txs.length == 0"><span translate>No transactions proposals yet.</span>
</p> </p>
<pagination ng-show="txs.length > txpItemsPerPage" total-items="txs.length" items-per-page="txpItemsPerPage" page="txpCurrentPage" on-select-page="show()" class="pagination-small primary"></pagination> <pagination ng-show="txs.length > txpItemsPerPage" total-items="txs.length" items-per-page="txpItemsPerPage" page="txpCurrentPage" on-select-page="show()" class="pagination-small primary"></pagination>
@ -29,7 +31,8 @@
<div ng-if="!blockchain_txs[0].txid && !loading"> <div ng-if="!blockchain_txs[0].txid && !loading">
<em><strong translate>No transactions yet.</strong></em></div> <em><strong translate>No transactions yet.</strong></em></div>
<div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true"> <div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
<div class="last-transactions-header oh size-14"> <div class="last-transactions-header size-14">
<div class="row collapse">
<div class="large-8 medium-7 small-4 columns ellipsis"> <div class="large-8 medium-7 small-4 columns ellipsis">
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank"> <a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="_blank">
{{btx.txid}} {{btx.txid}}
@ -47,6 +50,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="last-transactions-content"> <div class="last-transactions-content">
<div class="large-5 medium-5 small-12 columns"> <div class="large-5 medium-5 small-12 columns">
<div ng-repeat="vin in btx.vinSimple"> <div ng-repeat="vin in btx.vinSimple">
@ -72,6 +76,7 @@
</div> </div>
</div> </div>
<div class="last-transactions-footer"> <div class="last-transactions-footer">
<div class="row collapse">
<div class="large-6 medium-6 small-6 columns"> <div class="large-6 medium-6 small-6 columns">
<p class="size-12"><span translate>Fee</span>: {{btx.fees | noFractionNumber}} {{$root.wallet.settings.unitName}}</p> <p class="size-12"><span translate>Fee</span>: {{btx.fees | noFractionNumber}} {{$root.wallet.settings.unitName}}</p>
<p class="size-12"><span translate>Confirmations</span>: {{btx.confirmations || 0}}</p> <p class="size-12"><span translate>Confirmations</span>: {{btx.confirmations || 0}}</p>
@ -85,3 +90,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>