Fix profile table, address book table and transaction proposal table

This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-15 04:04:05 -03:00
commit 9b7e574968
6 changed files with 62 additions and 55 deletions

View file

@ -352,17 +352,9 @@ a:hover {
overflow: hidden;
}
.last-transactions-content {
overflow: hidden;
padding: 1rem;
background: #CED3DB;
}
table.last-transactions-content {
padding: 0;
border: 0;
background-color: #F8F8FB;
margin: 10px 0;
margin-bottom: 10px;
}
.last-transactions-content .box-status {
@ -836,22 +828,42 @@ label small.has-error {
font-size: 11px;
}
table { border-collapse: collapse; text-align: left; width: 100%; border: none;
table {
border-collapse: collapse; text-align: left; width: 100%; border: none;
box-shadow: -2px 1px 9px 1px #DDDDDD;
-webkit-box-shadow: -2px 1px 5px 1px #DDDDDD;
-moz-box-shadow: -2px 1px 5px 1px #DDDDDD;
-o-box-shadow: -2px 1px 5px 1px #DDDDDD;
-webkit-box-shadow: -2px 1px 5px 1px #DDDDDD;
-moz-box-shadow: -2px 1px 5px 1px #DDDDDD;
-o-box-shadow: -2px 1px 5px 1px #DDDDDD;
}
thead tr{ text-transform: uppercase; border-top: 1px solid #FFFFFF; height: 46px}
table td, table th { padding: 15px 15px; height: 58px} }
table thead th {background-color: #F5F5F8; color:#949BAD; font-size: 13px; font-weight: normal; !important}
table tbody td { color: #000000; font-size: 14px;border-bottom: 1px solid #F1F1F3; }
table tbody tr:last-child td { border-bottom: none; }
thead tr{
text-transform: uppercase;
border-top: 1px solid #FFFFFF;
height: 46px
}
table tr.active {
background: #CBECE6;
table tr td, table tr th {
padding: 15px;
}
table.last-transactions-content tr td,
table.last-transactions-content tr th {
padding: 5px;
}
table tfoot tr td, table tfoot tr th, table thead tr td, table thead tr th {
background-color: #F5F5F8;
color:#949BAD;
font-weight: normal
}
table tbody td {
color: #666;
border-bottom: 1px solid #F1F1F3;
}
table tbody tr:last-child td {
border-bottom: none;
}
table tr.deleting {
@ -1247,6 +1259,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.text-secondary {color: #3498DB;}
.text-white {color: #fff;}
.text-warning {color: #CA5649;}
.text-success {color: #1ABC9C;}
a.text-gray:hover {color: #2C3E50;}
a.text-black:hover {color: #213140;}

View file

@ -123,14 +123,6 @@
padding: 0 5px;
}
table.last-transactions-content td {
text-align: center;
}
table.last-transactions-content td.copayer-name {
text-align: left;
}
table.last-transactions-content .icon-status {
border-radius: 0;
padding: 0.1rem 0.3rem;

View file

@ -70,7 +70,7 @@
</div>
</div>
<div ng-show="btx.showDetails">
<div ng-show="btx.showDetails" class="m10t">
<table class="last-transactions-content" ng-if="btx.actionList.0">
<tbody>
<tr ng-repeat="c in btx.actionList">

View file

@ -24,7 +24,7 @@
<table class="last-transactions-content">
<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)}}
<td width="100%">{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}
</td>
<td>
<i ng-if="c.actions.create" class="fi-crown icon-status icon-active"></i>

View file

@ -42,51 +42,49 @@
<div class="row" ng-init="getWallets()">
<div class="large-12 columns">
<h2>Manage wallets</h2>
<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Status</th>
<th class="hide-for-small-only">Status</th>
<th>Balance</th>
<th>Actions</th>
<th class="text-right">Actions</th>
</tr>
</thead>
<tbody>
<tr
data-ng-repeat="item in wallets | orderBy:'name'"
ng-init="isReady = item.isReady();
networkName = item.getNetworkName()"
ng-class="{'deleting':loading==item.id}">
data-ng-repeat="item in wallets | orderBy:'name'"
ng-init="isReady = item.isReady();
networkName = item.getNetworkName()"
ng-class="{'deleting':loading==item.id}">
<td>{{item.name || item.id }}</td>
<td>{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}</td>
<td>{{isReady ? 'Complete' : 'Waiting for copayers...'}}</td>
<td class="hide-for-small-only">
{{isReady ? 'Complete' : 'Waiting for copayers...'}}
</td>
<td>
<span ng-if="!isReady">-</span>
<span ng-if="isReady">
{{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}}
</span>
</td>
<td class="text-center">
<td class="text-right">
<div ng-show="loading != item.id">
<a title="Download Backup" class="text-gray" ng-click="downloadWalletBackup(item)"
ng-show="!isSafari"><i class="fi-download size-18 m10r"></i></a>
ng-show="!isSafari"><i class="fi-download size-18 m10r"></i></a>
<a title="View Backup" ng-click="viewWalletBackup(item)"
ng-show="isSafari"><i class="fi-eye"></i></a>
&nbsp; &nbsp;
ng-show="isSafari"><i class="fi-eye"></i></a>
&nbsp;
<a title="Delete Wallet" ng-really-message="{{'Are you sure you want to delete the wallet'}} {{(item.name || item.id)}}"
ng-really-click="deleteWallet(item)"
ng-show="loading != item.id"><i class="fi-trash text-gray size-18"></i></a>
ng-really-click="deleteWallet(item)"
ng-show="loading != item.id"><i class="fi-trash text-gray size-18"></i></a>
</div>
<span ng-show="loading == item.id"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
</td>
</tr>
</tbody>
</table>
<span ng-show="loading == item.id"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>

View file

@ -194,7 +194,7 @@
<th translate>Address</th>
<th ng-class="{'hide-for-small-only' : $root.wallet.isShared()}" ng-show="$root.wallet.isShared()" translate>Creator</th>
<th class="hide-for-small-only" translate>Date</th>
<th class="hide-for-small-only">&nbsp;</th>
<th class="hide-for-small-only">Enable</th>
</tr>
</thead>
<tbody>
@ -205,8 +205,12 @@
<td class="size-12">{{addr}} <span class="btn-copy" clip-copy="addr"></span></td>
<td ng-show="$root.wallet.isShared()" ng-class="{'hide-for-small-only' : $root.wallet.isShared()}">{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
<td class="hide-for-small-only"><time>{{info.createdTs | amCalendar}}</time></td>
<td class="hide-for-small-only" width="5"><a ng-click="toggleAddressBookEntry(addr)">{{info.hidden ?
'Enable' : 'Disable'}}</a></td>
<td class="hide-for-small-only">
<a ng-click="toggleAddressBookEntry(addr)" title="{{ info.hidden ? 'Enable' : 'Disable'}} address">
<i class="fi-checkbox"
ng-class="{'text-success':!info.hidden, 'text-gray':info.hidden}"></i>
</a>
</td>
</tr>
</tbody>
</table>