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

Merge pull request #850 from bechi/feature/intermediate-screen

Browse source 
fix intermediate screen, waiting copayers
This commit is contained in:
Matias Alejo Garcia 2014-07-07 19:32:19 -03:00
commit e01b5039dc
1 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

55
index.html
View file

@ -103,35 +103,36 @@
</div> </div>
<div class="row m10t"> <div class="row m10t">
<div class="large-12 medium-12 small-12 columns "> <div class="large-12 medium-12 small-12 columns ">
<div class="box-setup-copayers"> <div class="box-setup-copayers panel">
<div class="box-setup-copayers-fix"> <div class="oh">
<h5>People on this wallet</h5> <h6 class="size-18 m15b">People on this wallet</h6>
<div class="setup" ng-repeat="c in $root.wallet.getRegisteredPeerIds()"> <div class="large-6 columns setup m15b" ng-repeat="c in $root.wallet.getRegisteredPeerIds()">
<video ng-if="$root.videoInfo[c.peerId]" <video ng-if="$root.videoInfo[c.peerId]"
avatar peer="{{c}}" avatar peer="{{c}}"
autoplay autoplay
ng-class="($root.wallet.getOnlinePeerIDs().indexOf(c.peerId) != -1) ? 'online' : 'offline'" ng-class="($root.wallet.getOnlinePeerIDs().indexOf(c.peerId) != -1) ? 'online' : 'offline'"
ng-src="{{getVideoURL(c.peerId)}}" ng-src="{{getVideoURL(c.peerId)}}"
></video> ></video>
<img ng-if="!$root.videoInfo[c.peerId]" <span class="left m10r">
avatar peer="{{c}}" <img ng-if="!$root.videoInfo[c.peerId]"
ng-class="($root.wallet.getOnlinePeerIDs().indexOf(c.peerId) != -1) ? 'online' : 'offline'" avatar peer="{{c}}"
src="./img/satoshi.gif" ng-class="($root.wallet.getOnlinePeerIDs().indexOf(c.peerId) != -1) ? 'online' : 'offline'"
/> src="./img/satoshi.gif"
<span ng-show="c.index==0"> />
you </span>
</span> <span ng-show="c.index==0">
<span ng-show="c.index>0"> <p><b>you</b></p>
{{c.nick}} </span>
[SIN: {{c.peerId}}] <span ng-show="c.index>0">
</span> <p><b>{{c.nick}}</b></p>
</div> <small>[SIN: {{c.peerId}}]</small>
</span>
</div>
<div class="m10" ng-if="!$root.wallet.publicKeyRing.isComplete()"> <div class="m10" ng-if="!$root.wallet.publicKeyRing.isComplete()">
<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i> <p> <i class="size-60 text-gray fi-bitcoin-circle icon-rotate spinner"></i>Waiting for other copayers to join</p>
Waiting for other copayers to join </div>
</div>
</div> </div>
</div> </div>