diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/layout.html | 1 | ||||
| -rw-r--r-- | views/sessions/new.html | 3 | ||||
| -rw-r--r-- | views/users/edit.html | 18 | ||||
| -rw-r--r-- | views/users/new.html | 7 | ||||
| -rw-r--r-- | views/users/profile.html | 2 | ||||
| -rw-r--r-- | views/users/wallet.html | 85 |
6 files changed, 46 insertions, 70 deletions
diff --git a/views/layout.html b/views/layout.html index a77f562f..f4a4e9c9 100644 --- a/views/layout.html +++ b/views/layout.html @@ -13,6 +13,7 @@ <script src="/bower/jquery-ui/jquery-ui.min.js"></script> <script src="/bower/bootstrap/dist/js/bootstrap.min.js"></script> <script src="/bower/bootstrap-validator/dist/validator.min.js"></script> + <script src="/bower/bootbox.js/bootbox.js"></script> <script src="/js/buffer.min.js"></script> <script src="/js/bitcoinjs.min.js"></script> <script src="/js/qrcode.js"></script> diff --git a/views/sessions/new.html b/views/sessions/new.html index 97bfce17..686ee8ed 100644 --- a/views/sessions/new.html +++ b/views/sessions/new.html @@ -1,6 +1,5 @@ {{#yield-scripts}} <link rel="stylesheet" href="/css/signin.css" /> - <script src="/js/jquery-1.8.2.min.js"></script> <script src="/js/signin.js"></script> {{/yield-scripts}} @@ -8,7 +7,7 @@ {{#notice}} <div class="alert alert-danger"> - <p>Looks like you're trying to access a page or account that doesn't exist. We had an issue with our server in May that caused us to lose account data. Please feel free to contact us at <a href="mailto:[email protected]">[email protected]</a> and we can help you get set up again or find what you're looking for.</p> + <p>Looks like you're trying to access a page or account that doesn't exist. Please contact us at <a href="mailto:[email protected]">[email protected]</a> so we can help you get set up again or find what you're looking for.</p> </div> {{/notice}} diff --git a/views/users/edit.html b/views/users/edit.html index 80b1e3c7..1a391b49 100644 --- a/views/users/edit.html +++ b/views/users/edit.html @@ -1,23 +1,5 @@ {{#yield-scripts}} -<script src="/js/jquery-1.8.2.min.js"></script> -<script src="/js/jquery-ui.min.js"></script> -<script src="/js/jquery.printElement.min.js"></script> <script src="/js/check_password.js"></script> -<script src="/js/bootstrap.min.js"></script> -<script src="/js/jsbn.js"></script> -<script src="/js/jsbn2.js"></script> -<script src="/js/crypto-min.js"></script> -<script src="/js/2.5.3-crypto-sha256.js"></script> -<script src="/js/sha512.js"></script> -<script src="/js/rfc1751.js"></script> -<script src="/js/bitcoinjs-min-1.0.2.js"></script> -<script src="/js/bitcoinjs-min.js"></script> -<script src="/js/modsqrt.js"></script> -<script src="/js/bip32.js"></script> -<script src="/js/secure_random.js"></script> -<script src="/js/qrcode.js"></script> -<script src="/js/aes.js"></script> -<script src="/js/key.js"></script> <script src="/js/setup.js"></script> {{/yield-scripts}} diff --git a/views/users/new.html b/views/users/new.html index c2b038d8..9bd22a25 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -1,8 +1,8 @@ {{#yield-scripts}} -<script src="/js/bip39.js"></script> +<script src="/js/bip39.min.js"></script> <script src="/js/check_email.js"></script> <script src="/js/check_password.js"></script> -<script src="/crypto-js/crypto-js.js"></script> +<script src="/bower/crypto-js/crypto-js.js"></script> <script src="/js/register.js"></script> {{/yield-scripts}} @@ -34,6 +34,9 @@ <input type="password" id="confirm" name="confirm" class="form-control" /> </div> + <input id="commission" name="commission" type="hidden" value="0" /> + <input id="unit" name="unit" type="hidden" value="BTC" /> + <input id="pubkey" name="pubkey" type="hidden" /> <input id="privkey" name="privkey" type="hidden" /> diff --git a/views/users/profile.html b/views/users/profile.html index 9fcdc03e..70f9acfc 100644 --- a/views/users/profile.html +++ b/views/users/profile.html @@ -1,6 +1,4 @@ {{#yield-scripts}} -<script src="/js/jquery-1.8.2.min.js"></script> -<script src="/js/bootstrap.min.js"></script> <script src="/js/profile.js"></script> {{/yield-scripts}} diff --git a/views/users/wallet.html b/views/users/wallet.html index e2a1140e..0a546864 100644 --- a/views/users/wallet.html +++ b/views/users/wallet.html @@ -13,92 +13,86 @@ <input type="hidden" id="username" name="username" value="{{user}}" /> <input type="hidden" id="email" name="email" /> - <div id="keys_updated" class="alert alert-success" style="display: none"> - <button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button> - Wallet keys updated - </div> - <div class="well"> <b id="balance" class="lead">0</b> <b id="unit" class="lead"></b> (<b id="fiat" class="lead">0 CAD</b>) <div class="pull-right"> - <button id="withdraw" type="button" class="btn btn-default" style="display: none" data-toggle="tooltip" data-placement="bottom" title="Withdraw"> + <button id="withdraw" type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Withdraw"> <i class="fa fa-btc fa-lg"></i> </button> <button id="manage" type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Manage Keys"> - <i class="fa fa-key fa-lg"></i> + <i class="fa fa-cog fa-lg"></i> </button> - <button id="backup" type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Download Backup"> + <button id="backup" type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Wallet Backup"> <i class="fa fa-download fa-lg"></i> </button> </div> </div> + <div id="keys_updated" class="alert alert-success" style="display: none"> + <button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button> + Wallet keys updated + </div> + + <div id="transaction_sent" class="alert alert-success" style="display: none"> + <button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button> + <p>Transaction sent!</p><br /> + <button id="blockchain" class="btn btn-success">View on Blockchain</button> + </div> + <div id="keys" style="display: none"> - <h3>Keys</h3> + <h3>Settings</h3> <form> - <div class="form-group"> - <div class="input-group" style="width: 100%"> - <label for="new_password">Password:</label> - <input id="new_password" name="new_password" type="password" class="form-control" /> - </div> - </div> - <div class="form-group has-feedback"> <div class="input-group" style="width: 100%"> - <label for="pubkey"> + <label for="key"> Address or Key: - <button id="types" type="button" class="btn btn-default" title="Supported Key Types" data-toggle="popover" data-placement="right"> - <i class="fa fa-question"></i> - </button> </label> - <textarea id="pubkey" name="pubkey" class="form-control" rows="3"></textarea> + <textarea id="key" name="key" class="form-control" rows="5" data-key="true"></textarea> </div> </div> - <div class="form-group" style="display: none"> - <div class="input-group" style="width: 100%"> - <label for="privkey">Key:</label> - <textarea id="privkey" name="privkey" class="form-control" rows="3"></textarea> - </div> - </div> + <input type="hidden" id="pubkey" name="pubkey" /> + <input type="hidden" id="privkey" name="privkey" /> - <div class="form-group has-feedback"> + <div class="form-group has-feedback" style="display: none"> <div class="input-group" style="width: 100%"> - <label for="type">Detected Type:</label> - <select id="type" name="type" class="form-control" disabled> + <label for="keytype">Detected Type:</label> + <select id="keytype" name="keytype" class="form-control"> <option value="unknown">Unknown</option> <option value="address">Bitcoin Address (starts with 1 or 3)</option> - <option value="private_key">Private Key (starts with 5 or L)</option> - <option value="xpub">HD Wallet pubkey (starts with xpub)</option> - <option value="xprv">HD Wallet private key (starts with xprv)</option> + <option value="wif">Private Key (starts with 5 or L or K)</option> + <option value="xpub">HD Wallet Pubkey (starts with xpub)</option> + <option value="xprv">HD Wallet Private Key (starts with xprv)</option> <option value="aes">AES Encrypted Private Key (starts with U)</option> <option value="bip38">BIP38 Encrypted Private Key (starts with 6)</option> - <option value="bip39">BIP39 Mnemonic (series of 12-24 english words)</option> + <option value="bip39">BIP39 Mnemonic (series of 12-24 words)</option> </select> </div> </div> - <button id="generate" class="btn btn-primary pull-right" type="button"><i class="fa fa-bolt"></i> Generate New HD Wallet</button> - <br class="clear" /> - <input class="btn btn-primary" type="button" value="Save" /> + <div class="form-group has-feedback"> + <div class="input-group" style="width: 100%"> + <label for="phrase">Passphrase:</label> + <input id="phrase" name="phrase" type="password" data-phrase="true" class="form-control" /> + </div> + </div> + + <button id="generate" class="btn btn-success pull-right" type="button"><i class="fa fa-bolt"></i> Create New Wallet</button> + + <input id="save" class="btn btn-primary" type="button" value="Save" /> + <input id="cancel" class="btn btn-default" type="button" value="Cancel" /> </form> </div> <div id="withdrawal" style="display: none"> <h3>Send Payment / Withdrawal</h3> - <div id="transaction_sent" class="alert alert-success" style="display: none"> - <button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button> - <p>Transaction sent!</p><br /> - <button id="blockchain" class="btn btn-success">View on Blockchain</button> - </div> - <div id="invalid_keys" class="alert alert-danger" style="display: none"> <button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button> - Invalid password or problem with private key + Invalid passphrase or problem with private key </div> <form> @@ -137,7 +131,7 @@ <div class="form-group has-feedback"> <div class="input-group" style="width: 100%"> - <label for="password">Password:</label> + <label for="password">Passphrase:</label> <input id="password" name="password" type="password" class="form-control" data-password="true" required /> </div> <div class="help-block with-errors"></div> @@ -154,5 +148,4 @@ <label>Fee:</label> <span class="fee"></span><br /> <label>To:</label> <span class="address"></span> </div> - </div> |