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

fix conflicts

Browse source
This commit is contained in:
Mario Colque 2014-04-17 09:35:46 -03:00
commit b95af5e53a
31 changed files with 1393 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

70
index.html
View file

@ -96,12 +96,53 @@
</div>
</script>
<script type="text/ng-template" id="setup.html">
<div ng-controller="SetupController">
<div class="panel callout radius" ng-show="loading">
Connecting to wallet...
</div>
<div ng-show="!loading">
<h2>Create new multisig wallet</h2>
<div class="row">
<div class="large-6 columns">
<h3>Select total number of copayers</h3>
<select ng-model="totalCopayers"
ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
</select>
</div>
</div>
<hr>
<div class="row">
<div class="large-6 columns">
<h3>Select required number of copayers</h3>
<select ng-model="requiredCopayers"
ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
</select>
</div>
<div class="large-3 columns">
<button class="button primary expand round" type="button"
ng-click="create(totalCopayers, requiredCopayers)">
Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
</button>
</div>
</div>
</div>
</div>
</script>
<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">
@ -109,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">
<li class="panel" ng-repeat="copayer in $root.wallet.network.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>
@ -156,17 +200,20 @@
<div class="row">
<div class="large-12 columns">
<h3>Pending Transactions <small>({{txsoutput.length}})</small></h3>
<div class="panel pending" ng-repeat="txp in txsoutput ">
<div class="panel pending" ng-repeat="txp in txsoutput">
{{txp}}
<div class="row">
<p class="large-5 columns"> Address 1</p>
<i class="large-2 columns fi-arrow-right size-16 text-center"></i>
<p class="large-5 columns"> Address 2</p>
<div class="large-12 columns m0">
<div class="large-12 columns m0" ng-show="txp.signedByUs"> YOU SIGNED! </div>
<div class="large-12 columns m0" ng-show="!txp.signedByUs">
<div class="line"></div>
<button class="primary round large-4 columns"><i class="large-2 columns fi-x size-16 text-center"></i> Ignore</button>
<small class="large-4 columns text-center">Faltan 3 cosigners</small>
<button class="secondary round large-4 columns"><i class="large-2 columns fi-check size-16 text-center"></i> Sign</button>
<button class="secondary round large-4 columns" ng-click="sign(txp.ntxid)"><i class="large-2 columns fi-check size-16 text-center"></i> Sign</button>
</div>
</div> <!-- end of row -->
</div> <!-- end of pending -->
@ -287,7 +334,7 @@
<script src="js/routes.js"></script>
<script src="js/directives.js"></script>
<script src="js/filters.js"></script>
<script src="js/services/network.js"></script>
<script src="js/services/walletFactory.js"></script>
<script src="js/controllers/header.js"></script>
<script src="js/controllers/home.js"></script>
@ -295,6 +342,7 @@
<script src="js/controllers/send.js"></script>
<script src="js/controllers/backup.js"></script>
<script src="js/controllers/signin.js"></script>
<script src="js/controllers/setup.js"></script>
<script src="js/controllers/peer.js"></script>
<script src="js/init.js"></script>