diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/sessions/new.html | 2 | ||||
| -rw-r--r-- | views/users/wallet.html | 125 |
2 files changed, 76 insertions, 51 deletions
diff --git a/views/sessions/new.html b/views/sessions/new.html index c9923744..97bfce17 100644 --- a/views/sessions/new.html +++ b/views/sessions/new.html @@ -13,7 +13,7 @@ {{/notice}} {{#badpw}} -<p class="alert alert-danger">Cannot find username/password on file, please try again.</p> +<p class="alert alert-danger">Invalid username or password, please try again.</p> {{/badpw}} <form class="form-signin" action="login" method="post"> diff --git a/views/users/wallet.html b/views/users/wallet.html index 25564f5d..c8af3cd1 100644 --- a/views/users/wallet.html +++ b/views/users/wallet.html @@ -1,65 +1,90 @@ {{#yield-scripts}} + <script src="/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js"></script> + <script src="/jquery-serialize-object/dist/jquery.serialize-object.min.js"></script> <script src="/js/wallet.js"></script> {{/yield-scripts}} -<h1>Wallet</h1> +<div class="wallet" style="display: none"> + <h1>Wallet</h1> -<input type="hidden" id="username" name="username" value="{{user}}" /> -<input type="hidden" id="email" name="email" /> + <input type="hidden" id="username" name="username" value="{{user}}" /> + <input type="hidden" id="email" name="email" /> -<div class="form-group" style="display: none"> - <label>Balance:</label> - <b id="balance" class="lead">0</b> <b id="unit" class="lead"></b> - <b class="lead">(<b id="fiat" class="lead">0 CAD</b>)</b> -</div> + <div class="form-group"> + <label>Balance:</label> + <b id="balance" class="lead">0</b> <b id="unit" class="lead"></b> + <b class="lead">(<b id="fiat" class="lead">0 CAD</b>)</b> + </div> -<div> - <ul class="nav nav-tabs" role="tablist"> - <li role="presentation" class="active"><a href="#withdraw" aria-controls="withdraw" role="tab" data-toggle="tab">Withdraw</a></li> - <li role="presentation"><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">Settings</a></li> - </ul> + <div> + <ul class="nav nav-tabs" role="tablist"> + <li role="presentation" class="active"><a href="#withdraw" aria-controls="withdraw" role="tab" data-toggle="tab">Withdraw</a></li> + <li role="presentation"><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">Settings</a></li> + </ul> - <div class="tab-content"> - <div role="tabpanel" class="tab-pane active" id="withdraw"> - <form> - <div class="form-group"> - <label for="amount">Amount:</label> - <div class="input-group"> - <input type="number" id="amount" name="amount" class="form-control" min="0" /> - <span class="input-group-btn"> - <button id="currency_toggle" type="button" class="btn"></button> - </span> - <span class="input-group-btn"> - <button id="max" type="button" class="btn">Max</button> - </span> + <div class="tab-content"> + <div role="tabpanel" class="tab-pane active" id="withdraw"> + <form> + <div class="form-group"> + <label for="amount">Amount:</label> + <div class="input-group"> + <input type="number" id="amount" name="amount" class="form-control" min="0" /> + <span class="input-group-btn"> + <button id="currency_toggle" type="button" class="btn"></button> + </span> + <span class="input-group-btn"> + <button id="max" type="button" class="btn">Max</button> + </span> + </div> </div> - </div> - <div class="form-group"> - <label for="amount">Receiving Address:</label> - <div class="input-group"> - <input type="text" id="recipient" name="recipient" class="form-control" /> - <span class="input-group-btn"> - <button type="button" class="btn"><span class="glyphicon glyphicon-camera"></span></button> - </span> + <div class="form-group"> + <label for="amount">Receiving Address:</label> + <div class="input-group" style="width: 100%"> + <input type="text" id="recipient" name="recipient" class="form-control" /> + </div> + </div> + + <div class="form-group"> + <label for="priority">Fee Priority for Confirmation Time:</label> + <div class="input-group" style="width: 100%"> + <select id="priority" name="priority" class="form-control"> + <option value="low">Low</option> + <option value="medium">Medium</option> + <option value="high">High</option> + </select> + </div> </div> - </div> - <input id="send" class="btn btn-primary" type="button" value="Send Payment" /> - </form> - <div class="alert alert-success" style="display: none">Transaction sent</div> - <div class="alert alert-danger" style="display: none">Need private key</div> - </div> - <div role="tabpanel" class="tab-pane" id="settings"> - <form> - <div class="form-group"> - <label for="pubkey">Bitcoin Receiving Address or HD Wallet Pubkey:</label> - <textarea id="pubkey" name="pubkey" class="form-control" placeholder="xpub..." rows="3"></textarea> - <textarea id="privkey" name="privkey" class="form-control" placeholder="xpriv..." rows="3"></textarea> - </div> - <input class="btn btn-primary" type="button" value="Save" /> - </form> - <div class="alert alert-success" style="display: none">Settings updated</div> + + <input id="gsend" class="btn btn-primary" type="button" value="Calculate Fee and Confirm Transaction" /> + </form> + <div class="alert alert-success" style="display: none">Transaction sent</div> + <div class="alert alert-danger" style="display: none">Need private key</div> + </div> + <div role="tabpanel" class="tab-pane" id="settings"> + <form> + <div class="form-group"> + <label for="pubkey">Bitcoin Receiving Address or HD Wallet Pubkey:</label> + <textarea id="pubkey" name="pubkey" class="form-control" placeholder="xpub..." rows="3"></textarea> + <textarea id="privkey" name="privkey" class="form-control" placeholder="xpriv..." rows="3"></textarea> + </div> + <input class="btn btn-primary" type="button" value="Save" /> + </form> + <div class="alert alert-success" style="display: none">Settings updated</div> + </div> </div> </div> </div> +<div id="transaction" style="display: none"> + <div style="margin-bottom: 10px"> + <label>Amount:</label> <span class="amount"></span><br /> + <label>To:</label> <span class="address"></span> + </div> + <div> + <span id="change" style="display: none"> + <label>Change:</label> <span class="change"></span><br /> + </span> + <label>Fee:</label> <span class="fee"></span><br /> + </div> +</div> |