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

Improve history with comments. Cleaning tx details popup

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-02-19 20:10:45 -03:00
commit 29ccee52d3
5 changed files with 60 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

12
css/src/desktop.css
View file

@ -26,10 +26,6 @@ a:hover {
color: #2980b9; color: #2980b9;
} }
.last-transactions-content:hover {
background: #eee;
}
a.button-setup.add-wallet:hover { a.button-setup.add-wallet:hover {
opacity: 1; opacity: 1;
} }
@ -51,11 +47,6 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus {
background: #16A085; background: #16A085;
} }
table tr:hover {
background-color: #eee;
cursor: pointer;
}
.button.outline.light-gray:hover { .button.outline.light-gray:hover {
background: rgba(206,213,220,0.40); background: rgba(206,213,220,0.40);
color: #4B6178; color: #4B6178;
@ -187,7 +178,4 @@ a.text-warning:hover {color: #FD7262;}
color: #fff; color: #fff;
} }
.last-transactions-content.active:hover {
background-color: #E4E8EC;
}

1
css/src/main.css
View file

@ -846,6 +846,7 @@ input[type=number]::-webkit-outer-spin-button {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
padding-top: 3px; padding-top: 3px;
line-height: 120%;
} }
ul.pagination li.current a { ul.pagination li.current a {

5
css/src/mobile.css
View file

@ -393,11 +393,6 @@
transform: none !important; transform: none !important;
} }
.button.secondary:hover, button.secondary:hover {
background: #008CC1;
color: #fff;
}
.move-right .close-menu { .move-right .close-menu {
cursor: pointer; cursor: pointer;
box-shadow: none; box-shadow: none;

27
views/history.html
View file

@ -21,27 +21,31 @@
<div ng-show="!paging" class="row" ng-if="blockchain_txs[0].txid"> <div ng-show="!paging" class="row" ng-if="blockchain_txs[0].txid">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel oh"> <div class="panel oh">
<div ng-repeat="btx in blockchain_txs | orderBy:'-ts'" ng-click="openTxModal(btx)" ng-class="{'line-b':!$last}" class="last-transactions-content"> <div ng-repeat="btx in blockchain_txs | orderBy:'-ts'"
ng-click="openTxModal(btx)"
ng-class="{'line-b':!$last}"
class="row last-transactions-content">
<div class="row"> <div class="large-6 medium-6 small-5 columns">
<div class="large-6 medium-6 small-12 columns size-16"> <div class="ellipsis">
<div class="ellipsis m10b"> {{btx.comment || btx.labelTo}} &nbsp;
</div>
<div class="m5t size-14 text-gray">
<time ng-if="btx.ts">{{btx.ts | amTimeAgo}}</time> <time ng-if="btx.ts">{{btx.ts | amTimeAgo}}</time>
<span class="label alert" ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)"> <span translate class="text-warning"
<span translate>Unconfirmed</span> ng-show="!btx.ts && (!btx.confirmations || btx.confirmations == 0)">
Unconfirmed
</span> </span>
</div> </div>
</div> </div>
<div class="large-6 medium-6 small-12 columns"> <div class="large-6 medium-6 small-7 columns">
<div class="text-right" ng-class="{ <div ng-if="!$root.updatingBalance" class="text-right" ng-class="{
'text-primary' : btx.action == 'received', 'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent', 'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}"> 'text-gray': btx.action == 'moved'}">
<span class="size-21"> <span class="size-18">
<span ng-if="!$root.updatingBalance">
<span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amount}} <span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amount}}
</span>
{{$root.wallet.settings.unitName}} {{$root.wallet.settings.unitName}}
</span> </span>
<span class="size-14 db m5t text-gray" ng-show="btx.alternativeAmount"> <span class="size-14 db m5t text-gray" ng-show="btx.alternativeAmount">
@ -53,7 +57,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="m10b" ng-show="blockchain_txs[0].txid"> <div class="m10b" ng-show="blockchain_txs[0].txid">
<div class="row"> <div class="row">
<div class="large-9 columns"> <div class="large-9 columns">

62
views/modals/tx-details.html
View file

@ -16,7 +16,7 @@
</span> </span>
</span> </span>
</div> </div>
<div class="size-48" ng-class="{ <div class="size-42" ng-class="{
'text-primary' : btx.action == 'received', 'text-primary' : btx.action == 'received',
'text-warning': btx.action == 'sent', 'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}"> 'text-gray': btx.action == 'moved'}">
@ -29,53 +29,53 @@
<a class="close-reveal-modal show-for-large-up" ng-click="cancel()"><i class="fi-x size-18"></i></a> <a class="close-reveal-modal show-for-large-up" ng-click="cancel()"><i class="fi-x size-18"></i></a>
</div> </div>
<div ng-if="btx.ts || btx.createdTs " class="m20v line-b"> <table>
<i>Date:</i> <tr ng-if="btx.ts || btx.createdTs">
<time >{{ (btx.ts || btx.createdTs ) | amCalendar}}</time> <td width="30"><i translate>Date:</i></td>
</div> <td><time>{{ (btx.ts || btx.createdTs ) | amCalendar}}</time></td>
</tr>
<div ng-show="btx.comment" class="line-b m20v lh140"> <tr ng-if="btx.comment">
<i>Note:</i> <td width="30"><i translate>Note:</i></td>
<span>{{btx.comment}}</span> <td class="">{{btx.comment}}</td>
</div> </tr>
<div ng-if="btx.merchant" class="lh140 m10v line-b"> <tr ng-if="btx.merchant">
<i>Merchant Message:</i> <td width="30"><i translate>Merchant Message:</i></td>
<p class="text-gray size-14">{{btx.merchant.pr.pd.memo}}</p> <td class="text-gray">{{btx.merchant.pr.pd.memo}}</td>
</div> </tr>
<div class="m10v line-b" ng-show="btx.ts"> <tr ng-if="btx.ts">
<i translate>Confirmations: </i> <td width="30"><i translate>Confirmations: </i></td>
<span class="label radius alert" ng-show="!btx.confirmations || btx.confirmations == 0" translate> <td><span class="text-warning" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
Unconfirmed Unconfirmed
</span> </span>
<span class="label radius" ng-show="btx.confirmations>0"> <span class="text-secondary" ng-show="btx.confirmations>0">
{{btx.confirmations}} {{btx.confirmations}}
</span> </span>
</div> </td>
</tr>
<div ng-if="btx.actionList[0]" class="m10v"> <tr ng-if="btx.actionList[0]">
<i>Signatures:</i> <td width="30"><i translate>Signatures:</i></td>
<ul class="tx-copayers m10t" ng-if="btx.actionList[0]"> <td>
<li ng-repeat="c in btx.actionList" ng-class="{'bottom-line-copayers':!$last}" ng-if="c.actions.rejected || c.actions.sign || c.actions.create"> <ul class="no-bullet size-10 m0" ng-if="btx.actionList[0]">
<li ng-repeat="c in btx.actionList" ng-class="{'m5b':!$last}" ng-if="c.actions.rejected || c.actions.sign || c.actions.create">
<span> <span>
<i ng-if="c.actions.rejected" class="fi-x icon-sign x"></i> <i ng-if="c.actions.rejected" class="fi-x icon-sign x"></i>
<i ng-if="c.actions.sign" class="fi-check icon-sign check"></i> <i ng-if="c.actions.sign" class="fi-check icon-sign check"></i>
</span> </span>
<span>
<i ng-if="c.actions.create" class="fi-crown icon-status icon-active m10r"></i>
</span>
<span>{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}</span> <span>{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}</span>
</li> </li>
</ul> </ul>
</div> </td>
</tr>
</table>
<small class="ellipsis text-gray m10v" ng-if="btx.txid" > ID: {{btx.txid}} </small> <small class="ellipsis text-gray m20b text-right" ng-if="btx.txid" > ID: {{btx.txid}} </small>
<div class="oh"> <a class="button outline light-gray tiny right" ng-click="$root.openExternalLink('http://' + getShortNetworkName() + '.insight.is/tx/' + btx.txid)" ng-if="btx.txid">
<a class="button outline light-gray tiny right" ng-click="$root.openExternalLink('http://' + getShortNetworkName() + '.insight.is/tx/' + btx.txid)" ng-if="btx.txid">
See it on the blockchain <i class="icon-arrow-right2 vm"></i> See it on the blockchain <i class="icon-arrow-right2 vm"></i>
</a> </a>
</div>
</div> </div>