diff options
| author | Adam Soltys <[email protected]> | 2015-12-10 14:22:22 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2015-12-10 15:21:12 -0800 |
| commit | 52a2a9a0eb82548ef88df03d1c43650d374ac179 (patch) | |
| tree | 2504eee9f0841606364aebe99563d98db664fe0b /views | |
| parent | bcb889f59b461cf9aef82d6349a46f0941683a87 (diff) | |
| download | coinos-server-52a2a9a0eb82548ef88df03d1c43650d374ac179.tar.gz coinos-server-52a2a9a0eb82548ef88df03d1c43650d374ac179.zip | |
Move bower components and remove them from git
Diffstat (limited to 'views')
| -rw-r--r-- | views/layout.html | 16 | ||||
| -rw-r--r-- | views/users/wallet.html | 27 |
2 files changed, 25 insertions, 18 deletions
diff --git a/views/layout.html b/views/layout.html index fb6b9e30..a77f562f 100644 --- a/views/layout.html +++ b/views/layout.html @@ -4,15 +4,15 @@ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1" /> <title>CoinOS</title> <link href="/img/favicon.ico" rel="shortcut icon" /> - <link rel="stylesheet" href="/jquery-ui/themes/ui-lightness/jquery-ui.min.css" /> - <link rel="stylesheet" href="/bootstrap/dist/css/bootstrap.min.css" /> - <link rel="stylesheet" href="/bootstrap/dist/css/bootstrap.min.css" /> - <link rel="stylesheet" href="/bootstrap/dist/css/bootstrap-theme.min.css" /> - <link rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" /> + <link rel="stylesheet" href="/bower/jquery-ui/themes/ui-lightness/jquery-ui.min.css" /> + <link rel="stylesheet" href="/bower/bootstrap/dist/css/bootstrap.min.css" /> + <link rel="stylesheet" href="/bower/bootstrap/dist/css/bootstrap-theme.min.css" /> + <link rel="stylesheet" href="/bower/font-awesome/css/font-awesome.min.css" /> <link rel="stylesheet" href="/css/coinos.css" /> - <script src="/jquery/dist/jquery.min.js"></script> - <script src="/jquery-ui/jquery-ui.min.js"></script> - <script src="/bootstrap/dist/js/bootstrap.min.js"></script> + <script src="/bower/jquery/dist/jquery.min.js"></script> + <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="/js/buffer.min.js"></script> <script src="/js/bitcoinjs.min.js"></script> <script src="/js/qrcode.js"></script> diff --git a/views/users/wallet.html b/views/users/wallet.html index fb978dcd..c251dd3b 100644 --- a/views/users/wallet.html +++ b/views/users/wallet.html @@ -2,7 +2,7 @@ <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="/crypto-js/crypto-js.js"></script> - <script src="/js/bip39.js"></script> + <script src="/js/bip39.min.js"></script> <script src="/js/wallet.js"></script> {{/yield-scripts}} @@ -12,18 +12,25 @@ <input type="hidden" id="username" name="username" value="{{user}}" /> <input type="hidden" id="email" name="email" /> - <div id="keys_updated" class="alert alert-success alert-dismissible" style="display: none"> - <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">×</span></button> + <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"><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></button> - <button id="backup" type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Download Backup"><i class="fa fa-download fa-lg"></i></button> + <button id="withdraw" type="button" class="btn btn-default" style="display: none" 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> + </button> + <button id="backup" type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Download Backup"> + <i class="fa fa-download fa-lg"></i> + </button> </div> </div> @@ -55,14 +62,14 @@ <div id="withdrawal"> <h3>Send Payment / Withdrawal</h3> - <div id="transaction_sent" class="alert alert-success alert-dismissible" style="display: none"> - <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">×</span></button> + <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_password" class="alert alert-danger alert-dismissible" style="display: none"> - <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">×</span></button> + <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 </div> |
