Merge pull request #63 from bechi/feature/copayers-page

copayers-page
This commit is contained in:
Ryan X. Charles 2014-04-16 22:00:02 -03:00
commit 73e7b0d0e0
2 changed files with 26 additions and 7 deletions

View File

@ -135,7 +135,6 @@ h3 {
span.panel-res {
float: right;
width: 3%;
padding: 0.4rem 0.55rem;
margin: 0 1rem;
border-radius: 1rem;
@ -160,6 +159,11 @@ span.panel-res {
margin: 0.5rem 0 1rem;
}
.share-wallet.panel {
background-color: #111;
color: #FBE500;
}
button.primary { background-color: #111; }
button.secondary { background-color: #FAE448 !important; }
@ -180,3 +184,8 @@ button.secondary:hover { background-color: #FFDF00 !important;}
.size-60 { font-size: 60px; }
.size-72 { font-size: 72px; }
.m10t {margin-top: 10px;}
.p0r {padding-right: 0;}
.p70r {padding-right: 70px;}
.p70l {padding-left: 70px;}
.p5h {padding: 0 5px;}
.br100 {border-radius: 100%;}

View File

@ -132,10 +132,17 @@
<script type="text/ng-template" id="peer.html">
<div class="row" ng-controller="PeerController" ng-init="init()">
<div class="large-6 columns">
<h1>I am <p class="text-muted">{{$root.wallet.network.peerId}}</p></h1>
<ul class="no-bullet">
<div class="large-6 columns p70r line-dashed-v">
<h3>I am </h3>
<div class="row">
<div class="large-10 columns p0r">
<p class="panel share-wallet">{{$root.wallet.network.peerId}}</p>
</div>
<div class="large-2 columns">
<p class="panel panel-sign"> <i class="fi-page-copy size-22"></i> </p>
</div>
</div>
<ul class="no-bullet" style="font-size: 0.7rem;">
<li> [DEBUG] Pubkeys that you have: {{$root.wallet.publicKeyRing.registeredCopayers()}}
<li> [DEBUG] WalletId: {{$root.wallet.id}}
<li class="panel" style="word-wrap: break-word;" ng-repeat="pub in $root.wallet.publicKeyRing.copayersBIP32">
@ -143,16 +150,19 @@
</li>
</ul>
</div>
<div class="large-6 columns">
<div class="large-6 columns p70l">
<h3 class="panel-title">Copayers ({{$root.wallet.network.connectedPeers.length}}/{{$root.wallet.publicKeyRing.requiredCopayers}})</h3>
<ul class="no-bullet">
<li class="panel" ng-repeat="copayer in $root.connectedPeers">
<span ng-if="copayer == $root.peerId"> You ({{$root.peerId}})<i class="fi-check size-24"></i></span>
<span ng-if="copayer != $root.peerId">{{copayer}}</span>
<span>
<i class="fi-check size-16 panel-sign right p5h br100"></i>
</span>
</li>
</ul>
<div class="text-center">
<button href="#/home" class="button secondary round large expand">Go to home</button>
<button href="#/home" class="button secondary round right">Go to home</button>
</div>
</div>
</div>