lots of of small changes; bug fixes, extra validation, warning of large fee, a mediation section and more

This commit is contained in:
OutCast3k
2015-09-12 18:38:34 +00:00
parent fe141b0b8a
commit ab395a82f2
2 changed files with 194 additions and 8 deletions
+95 -2
View File
@@ -301,8 +301,20 @@
<div class="tab-pane tab-content" id="newMultiSig">
<h2>New Multisig Address <small>Secure multisig address</small></h2>
<p>Public keys can be <a href="#newAddress">generated in your browser</a> or from your bitcoin client</a>.</p>
<p>Enter the public keys of all the participants, to create a <a href="https://en.bitcoin.it/wiki/Address#Multi-signature_addresses" target="_blank">multi signature address</a>. Maximum of 15 allowed. Compressed and uncompressed public keys are accepted.</p>
<div class="row">
<div class="col-md-8">
<p>Public keys can be <a href="#newAddress">generated in your browser</a> or from your bitcoin client</a>.</p>
<p>Enter the public keys of all the participants, to create a <a href="https://en.bitcoin.it/wiki/Address#Multi-signature_addresses" target="_blank">multi signature address</a>. Maximum of 15 allowed. Compressed and uncompressed public keys are accepted.</p>
</div>
<div class="col-md-3">
<p class="alert alert-info"><span class="glyphicon glyphicon-info-sign"></span> <a href="javascript:;" data-toggle="modal" data-target="#modalMediator"><abbr>Need a Mediator?</abbr></a></p>
</div>
<div class="col-md-1">
</div>
</div>
<div id="multisigPubKeys" class="row">
<div class="form-horizontal">
@@ -542,6 +554,8 @@
<br>
<div id="transactionCreateStatus" class="alert alert-danger hidden"></div>
<div id="transactionCreate" class="alert alert-success hidden">
<label>Transaction</label>
<button class="qrcodeBtn btn btn-default" type="button" data-toggle="modal" data-target="#modalQrcode" style="float:right;"><span class="glyphicon glyphicon-qrcode"></span></button>
@@ -778,6 +792,7 @@
<div class="tab-pane tab-content" id="broadcast">
<h2>Broadcast Transaction <small>into the bitcoin network</small></h2>
<a href="#settings" style="float:right;"><span class="glyphicon glyphicon-cog"></span></a>
<p>Enter your hex encoded bitcoin transaction</p>
<textarea class="form-control" style="height:125px" id="rawTransaction"></textarea>
<br>
@@ -992,6 +1007,84 @@
</div>
<!-- qrcode scanner modal -->
<!-- mediator modal -->
<div class="modal fade" id="modalMediator" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Transaction Mediation</h4>
</div>
<div class="modal-body">
<p>You can add a public key when creating a <i>2-of-3 multi signature address</i> and for a low fee your mediator will help with the recovery of the funds should any disputes arise.</p>
<p>Should a dispute arise please contact the below address for further information</p>
<div class="row">
<div class="col-md-5">
<label>Mediator:</label>
<!--
You need to contact us before adding your pubkey
and submitting a pull request on github.
format is: pubkey;email;fee
-->
<select id="mediatorList" class="form-control">
<option value="02b6231cc602740c29436eafbb6448880f4058cc3d2745c709deee313104678277;support@coinb.in;1">Coinb.in</option>
</select>
</div>
<div class="col-md-5">
<label>Address:</label> <span class="text-muted">(for disputes)</span>
<input id="mediatorEmail" type="text" class="form-control address" value="" readonly>
</div>
<div class="col-md-2">
<label>Fee (%):</label>
<input id="mediatorFee" type="text" class="form-control address" value="" readonly>
</div>
</div>
<br>
<label>Public Key:</label>
<input id="mediatorPubkey" type="text" class="form-control address" value="" readonly>
<br>
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="button" id="mediatorAddKey">Add Public Key</button>
<button type="button" class="btn btn-default" data-dismiss="modal" id="mediatorClose">Close</button>
</div>
</div>
</div>
</div>
<!-- mediator modal -->
<!-- warning (fee) modal -->
<div class="modal fade" id="modalWarningFee" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title"><b>Warning High Fee!</b></h4>
</div>
<div class="modal-body">
Please be aware that you have created a transaction with what seems to be a very high fee of <span id="modalWarningFeeAmount"></span> BTC!
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal" id="warningFeeClose">OK, I've got it!</button>
</div>
</div>
</div>
</div>
<!-- warning (fee) modal -->
<div class="hidden" id="entropybucket"></div>
</body>
</html>