mirror of https://github.com/BTCPrivate/copay.git
Fixes transactions and send pages
This commit is contained in:
parent
d7adc854c9
commit
5921a1f1ae
10
css/main.css
10
css/main.css
|
@ -251,7 +251,7 @@ a:hover {
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box-note {
|
.send-note {
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
color: gray;
|
color: gray;
|
||||||
background-color: #EDEDF5;
|
background-color: #EDEDF5;
|
||||||
|
@ -259,6 +259,14 @@ a:hover {
|
||||||
width: 400px;
|
width: 400px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.box-note {
|
||||||
|
text-align: center;
|
||||||
|
clear: both;
|
||||||
|
font-style: italic;
|
||||||
|
color: gray;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.button-setup a {
|
.button-setup a {
|
||||||
display: block;
|
display: block;
|
||||||
padding: 20px 30px;
|
padding: 20px 30px;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<qrcode size="160" data="{{address.address}}"></qrcode>
|
<qrcode size="160" data="{{address.address}}"></qrcode>
|
||||||
<h2>{{address.address}}</h2>
|
<h4>{{address.address}}</h4>
|
||||||
<div>
|
<div>
|
||||||
<span ng-if="$root.updatingBalance">
|
<span ng-if="$root.updatingBalance">
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
||||||
|
|
|
@ -103,7 +103,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="large-6 columns">
|
<div class="large-6 columns">
|
||||||
<div class="box-note">
|
<div class="send-note">
|
||||||
<h6>Send to</h6>
|
<h6>Send to</h6>
|
||||||
<p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}">
|
<p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}">
|
||||||
{{address}}
|
{{address}}
|
||||||
|
@ -124,7 +124,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="large-12 columns line-dashed">
|
<div class="large-12 columns line-dashed">
|
||||||
<h3>Address Book</h3>
|
<h2>Address Book</h2>
|
||||||
<p class="text-gray" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
|
<p class="text-gray" ng-hide="showAddressBook()">Empty. Create an alias for your addresses</p>
|
||||||
<table ng-show="showAddressBook()">
|
<table ng-show="showAddressBook()">
|
||||||
<thead>
|
<thead>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<div class="transactions" data-ng-controller="TransactionsController">
|
<div class="transactions" data-ng-controller="TransactionsController">
|
||||||
<div class="row" ng-show='$root.wallet.isReady()'>
|
<div ng-show='$root.wallet.isReady()'>
|
||||||
|
<h1 ng-show="wallet.totalCopayers > 1"> Transaction proposals <small>({{txs.length}})</small></h1>
|
||||||
|
<div class="row">
|
||||||
<div class="large-12 columns" ng-show="wallet.totalCopayers > 1">
|
<div class="large-12 columns" ng-show="wallet.totalCopayers > 1">
|
||||||
<h1> Transaction proposals <small>({{txs.length}})</small></h1>
|
|
||||||
|
|
||||||
<ul class="inline-list">
|
<ul class="inline-list">
|
||||||
<li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
|
<li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
|
||||||
<li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
|
<li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
|
||||||
|
@ -104,16 +104,17 @@
|
||||||
<p ng-show="!onlyPending && txs.length == 0">No transactions proposals yet.</p>
|
<p ng-show="!onlyPending && txs.length == 0">No transactions proposals yet.</p>
|
||||||
<pagination ng-show="!onlyPending && 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="!onlyPending && txs.length > txpItemsPerPage" total-items="txs.length" items-per-page="txpItemsPerPage" page="txpCurrentPage" on-select-page="show()" class="pagination-small primary"></pagination>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="large-12 columns line-dashed-h" ng-hide="wallet.totalCopayers == 1"></div>
|
<h1 ng-class="{'line-dashed': wallet.totalCopayers > 1}">
|
||||||
|
|
||||||
<div class="large-12 columns">
|
|
||||||
<h1>
|
|
||||||
Last transactions
|
Last transactions
|
||||||
<small ng-hide="wallet.totalCopayers > 1 || !loading">
|
<small ng-hide="wallet.totalCopayers > 1 || !loading">
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
||||||
</small>
|
</small>
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="large-12 columns">
|
||||||
<div class="m10b size-12" ng-hide="wallet.totalCopayers == 1">
|
<div class="m10b size-12" ng-hide="wallet.totalCopayers == 1">
|
||||||
<a class="text-gray active" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-hide="lastShowed && !loading">[ Show ]</a>
|
<a class="text-gray active" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-hide="lastShowed && !loading">[ Show ]</a>
|
||||||
<a class="text-gray" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-show="lastShowed && !loading">[ Hide ]</a>
|
<a class="text-gray" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-show="lastShowed && !loading">[ Hide ]</a>
|
||||||
|
@ -178,4 +179,5 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue