New design for transaction info

This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-03 15:11:23 -03:00
commit 69d83ec527
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 23 additions and 22 deletions

View file

@ -15,11 +15,11 @@
<div class="modal-content fix-modals-touch" <div class="modal-content fix-modals-touch"
ng-swipe-disable-mouse ng-swipe-disable-mouse
ng-swipe-right="cancel()"> ng-swipe-right="cancel()">
<div class="header-modal text-center"> <div class="header-modal size-36 text-center">
<div class="size-42" ng-show="btx.action != 'invalid'"> <div ng-show="btx.action != 'invalid'">
<span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amountStr}} <span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amountStr}}
</div> </div>
<div class="size-42" ng-show="btx.action == 'invalid'"> <div ng-show="btx.action == 'invalid'">
- -
</div> </div>
</div> </div>
@ -29,7 +29,7 @@
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<li ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)"> <li ng-if="!btx.hasMultiplesOutputs && btx.addressTo && btx.addressTo != 'N/A'" class="line-b p10 oh" ng-click="copyAddress(btx.addressTo)">
<span class="text-gray" translate>To</span>: <span class="text-gray" translate>To</span>
<span class="right"> <span class="right">
<span ng-if="btx.merchant"> <span ng-if="btx.merchant">
<span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span> <span ng-show="btx.merchant.pr.ca"><i class="fi-lock color-greeni"></i> {{btx.merchant.domain}}</span>
@ -44,7 +44,7 @@
<li ng-show="btx.hasMultiplesOutputs" class="line-b p10 oh" <li ng-show="btx.hasMultiplesOutputs" class="line-b p10 oh"
ng-click="showMultiplesOutputs = !showMultiplesOutputs"> ng-click="showMultiplesOutputs = !showMultiplesOutputs">
<span class="text-gray" translate>Recipients</span>: <span class="text-gray" translate>Recipients</span>
<span class="right">{{btx.recipientCount}} <span class="right">{{btx.recipientCount}}
<i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i> <i ng-show="showMultiplesOutputs" class="icon-arrow-up3 size-24"></i>
<i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i> <i ng-show="!showMultiplesOutputs" class="icon-arrow-down3 size-24"></i>
@ -57,7 +57,7 @@
</div> </div>
<li ng-show="btc.message" class="line-b p10 oh"> <li ng-show="btc.message" class="line-b p10 oh">
<span class="text-gray" translate>Note</span>: <span class="text-gray" translate>Note</span>
<span class="right">{{btx.message}}</span> <span class="right">{{btx.message}}</span>
</li> </li>
@ -66,28 +66,28 @@
This transaction has become invalid; possibly due to a double spend attempt. This transaction has become invalid; possibly due to a double spend attempt.
</span> </span>
<li ng-if="btx.time" class="line-b p10 oh"> <li ng-if="btx.time" class="line-b p10 oh">
<span class="text-gray" translate>Date</span>: <span class="text-gray" translate>Date</span>
<span class="right"> <span class="right">
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time> <time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
<time>({{ btx.time * 1000 | amTimeAgo}})</time> <time>({{ btx.time * 1000 | amTimeAgo}})</time>
</span> </span>
</li> </li>
<li class="line-b p10" ng-show="btx.action != 'received'"> <li class="line-b p10" ng-show="btx.action != 'received'">
<span class="text-gray" translate>Fee</span>: <span class="text-gray" translate>Fee</span>
<span class="right">{{btx.feeStr}}</span> <span class="right">{{btx.feeStr}}</span>
</li> </li>
<li class="line-b p10 oh" ng-if="btx.message && btx.action != 'received'"> <li class="line-b p10 oh" ng-if="btx.message && btx.action != 'received'">
<span class="text-gray" translate>Note</span>: <span class="text-gray" translate>Note</span>
<span class="right">{{btx.message}}</span> <span class="right">{{btx.message}}</span>
</li> </li>
<li ng-if="btx.merchant" class="line-b p10 oh"> <li ng-if="btx.merchant" class="line-b p10 oh">
<span class="text-gray" translate>Merchant message</span>: <span class="text-gray" translate>Merchant message</span>
<span class="right"> <span class="right">
{{btx.merchant.pr.pd.memo}} {{btx.merchant.pr.pd.memo}}
</span> </span>
</li> </li>
<li ng-if="btx.time" class="line-b p10 oh"> <li ng-if="btx.time" class="line-b p10 oh">
<span class="text-gray" translate>Confirmations</span>: <span class="text-gray" translate>Confirmations</span>
<span class="right" > <span class="right" >
<span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate> <span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
Unconfirmed Unconfirmed
@ -107,11 +107,12 @@
<h4 class="title m0" translate>Participants</h4> <h4 class="title m0" translate>Participants</h4>
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<li class="line-b p10 text-gray" ng-repeat="c in btx.actions"> <li class="line-b p10 text-gray" ng-repeat="c in btx.actions">
<span class="right"> <i class="icon-contact size-24"></i>
<i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i> <span class="right">
<i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i> <i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i>
</span> <i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i>
{{c.copayerName}} <span ng-if="c.copayerId == copayerId">({{'Me'|translate}})</span> </span>
{{c.copayerName}} <span ng-if="c.copayerId == copayerId">({{'Me'|translate}})</span>
</li> </li>
</ul> </ul>
</div> </div>

View file

@ -161,11 +161,11 @@
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<li class="line-b p10 text-gray" ng-repeat="ac in tx.actions"> <li class="line-b p10 text-gray" ng-repeat="ac in tx.actions">
<i class="icon-contact size-24"></i> <i class="icon-contact size-24"></i>
{{ac.copayerName}} <span ng-if="ac.copayerId == copayerId">({{'Me'|translate}})</span> <span class="right">
<span class="right tu"> <i ng-if="ac.type == 'reject'" class="fi-x icon-sign x db"></i>
<span ng-if="ac.type == 'reject'" class="text-warning"><i class="fi-x icon-sign x"></i>Rejected</span> <i ng-if="ac.type == 'accept'" class="fi-check icon-sign check db"></i>
<span ng-if="ac.type == 'accept'" class="text-success"><i class="fi-check icon-sign check"></i>Signed</span>
</span> </span>
{{ac.copayerName}} <span ng-if="ac.copayerId == copayerId">({{'Me'|translate}})</span>
</li> </li>
</ul> </ul>
</div> </div>

View file

@ -343,7 +343,8 @@ ul.tx-copayers {
padding: 0.2rem 0.3rem; padding: 0.2rem 0.3rem;
border-radius: 100%; border-radius: 100%;
color: #fff; color: #fff;
margin-right: 7px; font-size: 10px;
margin-top: 3px;
} }
.icon-sign.check { .icon-sign.check {
@ -625,7 +626,6 @@ input[type=number]::-webkit-outer-spin-button {
} }
.header-modal { .header-modal {
border-bottom: 1px solid #E2E7ED;
background: #fff; background: #fff;
width: 100%; width: 100%;
padding: 0.8rem; padding: 0.8rem;