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-03-27 16:43:51 -03:00
commit 64fc2dd22b
13 changed files with 209 additions and 5827 deletions
Download patch file Download diff file Expand all files Collapse all files

132
index.html
View file

@ -5,32 +5,23 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width">
<title>Cosign - Multisignature Wallet</title>
<link rel="stylesheet" href="css/bootstrap.min.css">
<link rel="stylesheet" href="css/foundation.min.css">
<link rel="stylesheet" href="css/main.css">
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top" role="banner" ng-controller="HeaderController" ng-init="init()">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="./index.html">Cosign</a>
</div>
<div class="collapse navbar-collapse" ng-if="$root.isLogged">
<ul class="nav navbar-nav navbar-right">
<li><a href="" ng-click="signout()"><i class="glyphicon glyphicon-log-out"></i> Signout</a></li>
</ul>
</div>
</div>
</div>
<div class="container">
<div ng-view></div>
<div class="row">
<div class="large-12 columns" data-ng-init="init()" data-ng-controller="HeaderController">
<h1>cosign</h1>
<dl class="sub-nav">
<dd data-ng-repeat="item in menu" ui-route="/{{item.link}}" data-ng-class="{active: isActive(item)}">
<a href="{{item.link}}">{{item.title}}</a>
</dd>
</dl>
</div>
</div>
<div class="row">
<div class="large-12 columns" ng-view></div>
</div>
<!-- Templates -->
<script type="text/ng-template" id="signin.html">
@ -72,19 +63,102 @@
</div>
</script>
<!-- HOME -->
<script type="text/ng-template" id="home.html">
<h1>home</h1>
<div class="home" data-ng-controller="HomeController">
<h2>{{title}}</h2>
<accordion close-others="oneAtATime">
<accordion-group ng-repeat="addr in addrs">
<accordion-heading>
{{addr.addrStr}}
</accordion-heading>
<qrcode size="160" data="{{addr.addrStr}}"></qrcode>
</accordion-group>
</accordion>
</div>
</script>
<!-- TRANSACTIONS -->
<script type="text/ng-template" id="transactions.html">
<div class="transactions" data-ng-controller="TransactionsController">
<h2>{{title}}</h2>
<div class="row">
<div class="large-6 columns">
<h3>Input</h3>
<accordion close-others="oneAtATime">
<accordion-group ng-repeat="tx in txsinput">
<accordion-heading>
{{tx.fromAddr}} -> {{tx.toAddr}} : {{tx.amount}}
</accordion-heading>
<div class="row">
<div class="col-xs-6 col-md-4">ignore</div>
<div class="col-xs-6 col-md-4">(Required 3 cosign)</div>
<div class="col-xs-6 col-md-4">sign</div>
</div>
</accordion-group>
</accordion>
</div>
<div class="large-6 columns">
<h3>Output</h3>
<accordion close-others="oneAtATime">
<accordion-group ng-repeat="tx in txsoutput">
<accordion-heading>
{{tx.fromAddr}} <- {{tx.toAddr}} : {{tx.amount}}
</accordion-heading>
Details...
</accordion-group>
</accordion>
</div>
</div>
</script>
<!-- SEND -->
<script type="text/ng-template" id="send.html">
<div class="send" data-ng-controller="SendController">
<h2>{{title}}</h2>
<form>
<label for="address">To
<input type="text" id="address" placeholder="Send to">
</label>
<label for="amount">Amount
<input type="text" id="amount" placeholder="Amount">
<select class="form-control">
<option>mBTC</option>
<option>BTC</option>
</select>
</label>
<button type="submit" class="btn btn-default">send</button>
</form>
</div>
</script>
<!-- BACKUP -->
<script type="text/ng-template" id="backup.html">
<div class="backup" data-ng-controller="BackupController">
<h2>{{title}}</h2>
<div class="row">
<div class="col-xs-6 col-md-4">Download file</div>
<div class="col-xs-6 col-md-4">Backup to Dropbox</div>
<div class="col-xs-6 col-md-4">Backup to email</div>
</div>
</div>
</script>
<!-- NOT FOUND -->
<script type="text/ng-template" id="404.html">
<h1>404</h1>
<h2 class="text-center">404</h2>
<h3 class="text-center">Page not found</h3>
<p class="text-center"><a href="#/">go back...</a></p>
</script>
<script src="lib/angular/angular.min.js"></script>
<script src="lib/qrcode-generator/js/qrcode.js"></script>
<script src="lib/angular-qrcode/qrcode.js"></script>
<script src="lib/angular-route/angular-route.min.js"></script>
<script src="lib/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<script src="lib/peerjs/peer.min.js"></script>
<script src="lib/angular-foundation/mm-foundation.min.js"></script>
<script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
<script src="lib/peerjs/peer.js"></script>
<script src="js/app.js"></script>
<script src="js/config.js"></script>
@ -94,6 +168,10 @@
<script src="js/services/network.js"></script>
<script src="js/controllers/header.js"></script>
<script src="js/controllers/home.js"></script>
<script src="js/controllers/transactions.js"></script>
<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/join.js"></script>