mirror of https://github.com/BTCPrivate/copay.git
commit
ca99f3f194
|
@ -203,6 +203,11 @@ header .alt-currency {
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.col2_full {
|
||||||
|
width: 194px;
|
||||||
|
height: 62px;
|
||||||
|
}
|
||||||
|
|
||||||
.col3 a {
|
.col3 a {
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -607,14 +612,10 @@ a.button-setup {
|
||||||
color: #B6E9DF;
|
color: #B6E9DF;
|
||||||
}
|
}
|
||||||
|
|
||||||
.founds .locked {
|
.locked {
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
z-index: -99999;
|
|
||||||
background-color: #213140;
|
background-color: #213140;
|
||||||
position: absolute;
|
width: 100%;
|
||||||
top: 52px;
|
|
||||||
width: 250px;
|
|
||||||
left: 0;
|
|
||||||
padding: 0.3rem 0.7rem;
|
padding: 0.3rem 0.7rem;
|
||||||
color: white;
|
color: white;
|
||||||
border-bottom: 1px solid #374756;
|
border-bottom: 1px solid #374756;
|
||||||
|
@ -1128,8 +1129,6 @@ a:hover .photo-container {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.side-nav {padding-top: 50px;}
|
|
||||||
|
|
||||||
.side-nav li {
|
.side-nav li {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
|
|
|
@ -199,5 +199,9 @@
|
||||||
padding: 0.15rem 0.2rem;
|
padding: 0.15rem 0.2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.line-t {
|
||||||
|
border-top: 1px solid #3C5269;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,7 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
|
||||||
if ($rootScope.wallet) {
|
if ($rootScope.wallet) {
|
||||||
$rootScope.$watch('wallet.id', function() {
|
$rootScope.$watch('wallet.id', function() {
|
||||||
$scope.walletSelection = false;
|
$scope.walletSelection = false;
|
||||||
|
$scope.getWallets();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,6 +62,10 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
|
||||||
$scope.walletSelection = !$scope.walletSelection;
|
$scope.walletSelection = !$scope.walletSelection;
|
||||||
if (!$scope.walletSelection) return;
|
if (!$scope.walletSelection) return;
|
||||||
|
|
||||||
|
$scope.getWallets();
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.getWallets = function() {
|
||||||
$scope.wallets = [];
|
$scope.wallets = [];
|
||||||
var wids = _.pluck($rootScope.iden.listWallets(), 'id');
|
var wids = _.pluck($rootScope.iden.listWallets(), 'id');
|
||||||
_.each(wids, function(wid) {
|
_.each(wids, function(wid) {
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
<a href="#!/manage" class="button-setup add-wallet db p20h" title="Create"><i class="m5r fi-plus"></i> {{'Add Wallet' | translate }} </a>
|
<a href="#!/manage" class="button-setup add-wallet db p20h" title="Create"><i class="m5r fi-plus"></i> {{'Add Wallet' | translate }} </a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="line-sidebar-t" ng-show="!walletSelection" ng-click="refresh()">
|
<div class="line-t" ng-show="!walletSelection" ng-click="refresh()">
|
||||||
<a class="side-bar text-gray right" title="Manual Refresh"><i class="fi-refresh"></i></a>
|
<a class="side-bar text-gray right" title="Manual Refresh"><i class="fi-refresh"></i></a>
|
||||||
<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>
|
||||||
|
@ -73,12 +73,13 @@
|
||||||
<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>
|
||||||
</span>
|
</span>
|
||||||
<span ng-show="!$root.updatingBalance">{{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
|
<span ng-show="!$root.updatingBalance">
|
||||||
</span> <i class="fi-info medium" tooltip="{{'Balance locked in pending transaction proposals'|translate}}" tooltip-placement="bottom"></i>
|
{{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="line-sidebar-t p0"></div>
|
<div class="line-t p0"></div>
|
||||||
<ul class="off-canvas-list" ng-show="!walletSelection">
|
<ul class="off-canvas-list" ng-show="!walletSelection">
|
||||||
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
|
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" class="nav-item" data-ng-class="{active: isActive(item)}">
|
||||||
<a href="#!/{{item.link}}" class="db p20h">
|
<a href="#!/{{item.link}}" class="db p20h">
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<div ng-controller="SidebarController">
|
<div ng-controller="SidebarController" ng-init="getWallets()">
|
||||||
<header ng-show="$root.wallet">
|
<header ng-show="$root.wallet">
|
||||||
<div class="col1">
|
<div class="col1">
|
||||||
<div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
|
<div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col2">
|
<div class="col2" ng-class="{'col2_full':!wallets.0}">
|
||||||
<div class="oh m5t m10r">
|
<div class="oh m5t m10r">
|
||||||
<div class="right size-10">[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]</div>
|
<div class="right size-10">[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]</div>
|
||||||
<div class="name-wallet">
|
<div class="name-wallet">
|
||||||
|
@ -16,21 +16,10 @@
|
||||||
<div ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
|
<div ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
|
||||||
<b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
|
<b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
|
||||||
<span class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
|
<span class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="m10t locked" ng-show="lockedBalance">
|
|
||||||
|
|
||||||
<span class="text-gray">
|
|
||||||
<i class="fi-lock"></i> {{'Locked'|translate}}
|
|
||||||
</span>
|
|
||||||
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
|
|
||||||
<span ng-if="$root.wallet && !$root.updatingBalance" class="text-gray"><b>{{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} </b> - {{lockedBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}
|
|
||||||
</span>
|
|
||||||
<i class="fi-info medium right text-gray size-14" tooltip="{{'Balance locked in pending transaction proposals'|translate}}" tooltip-placement="bottom"></i>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col3">
|
<div class="col3" ng-if="wallets.0">
|
||||||
<a ng-class="{'selected':walletSelection}"
|
<a ng-class="{'selected':walletSelection}"
|
||||||
ng-click="toggleWalletSelection()">
|
ng-click="toggleWalletSelection()">
|
||||||
<span ng-show="!walletSelection">
|
<span ng-show="!walletSelection">
|
||||||
|
@ -42,14 +31,18 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
<div class="locked" ng-show="lockedBalance">
|
||||||
|
<span class="text-gray">
|
||||||
|
<i class="fi-lock"></i> {{'Locked'|translate}}
|
||||||
|
</span>
|
||||||
|
<span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
|
||||||
|
<span ng-if="$root.wallet && !$root.updatingBalance" class="text-gray"><b>{{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} </b> - {{lockedBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}
|
||||||
|
</span>
|
||||||
|
<i class="fi-info medium right text-gray size-14" tooltip="{{'Balance locked in pending transaction proposals'|translate}}" tooltip-placement="bottom"></i>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
<div ng-if="walletSelection">
|
<div ng-if="walletSelection">
|
||||||
<div class="side-nav wallets" ng-show="!wallets.0">
|
|
||||||
<p class="size-12" translate>You do not have another wallets. Creates one more from link below.</p>
|
|
||||||
<div class="text-center">
|
|
||||||
<i class="fi-arrow-down"></i>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<ul class="side-nav wallets" ng-show="wallets.0"
|
<ul class="side-nav wallets" ng-show="wallets.0"
|
||||||
ng-class="{'large':wallets.length > 4, 'medium':wallets.length > 2 && wallets.length < 5}">
|
ng-class="{'large':wallets.length > 4, 'medium':wallets.length > 2 && wallets.length < 5}">
|
||||||
<li data-ng-repeat="item in wallets track by $index" class="nav-item" ng-if="item.id != $root.wallet.id">
|
<li data-ng-repeat="item in wallets track by $index" class="nav-item" ng-if="item.id != $root.wallet.id">
|
||||||
|
|
Loading…
Reference in New Issue