diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 2ce2d56..6bd08d0 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -114,6 +114,32 @@ table { padding-right: 5px; } +.pagination > .paginate_button > a, .pagination > .paginate_button.disabled > a { + border: 1px solid black; +} + +ul.pagination { + justify-content: flex-start; + display: inline-block; +} + +ul.pagination > li { + display: inline; +} + +ul.pagination > li > a { + float: left; +} + +@media(max-width:576px){ + .dataTables_paginate { + font-size: 80%; + } + #marketChart { + display: none; + } +} + .tab-pane { margin-top: 5px; } diff --git a/views/address.pug b/views/address.pug index 35ca43a..6a75b76 100644 --- a/views/address.pug +++ b/views/address.pug @@ -35,11 +35,14 @@ block content thead tr if settings.show_sent_received == true - th.d-none.d-sm-table-cell #{settings.locale.total_sent} (#{settings.symbol}) + th.d-none.d-sm-table-cell #{settings.locale.total_sent} + span.small (#{settings.symbol}) if address.a_id !== 'coinbase' if settings.show_sent_received == true - th #{settings.locale.total_received} (#{settings.symbol}) - th #{settings.locale.rl_balance} (#{settings.symbol}) + th #{settings.locale.total_received} + span.small (#{settings.symbol}) + th #{settings.locale.rl_balance} + span.small (#{settings.symbol}) th #{settings.locale.a_qr} tbody tr diff --git a/views/block.pug b/views/block.pug index fc231d5..f629954 100644 --- a/views/block.pug +++ b/views/block.pug @@ -79,14 +79,15 @@ block content table.table.table-bordered.table-striped.summary-table thead tr - th #{settings.locale.tx_hash} + th.d-none.d-sm-table-cell #{settings.locale.tx_hash} th #{settings.locale.tx_recipients} - th #{settings.locale.mkt_amount} (#{settings.symbol}) + th #{settings.locale.mkt_amount} + span.small (#{settings.symbol}) th tbody each txn in txs tr - td + td.d-none.d-sm-table-cell a.breakWord(href='/tx/' + txn.txid) #{txn.txid} td #{txn.vout.length} if txn.vout.length > 0 diff --git a/views/claim_address.pug b/views/claim_address.pug index 1118174..05c1de2 100644 --- a/views/claim_address.pug +++ b/views/claim_address.pug @@ -57,11 +57,14 @@ block content thead tr if settings.show_sent_received == true - th.d-none.d-sm-block #{settings.locale.total_sent} (#{settings.symbol}) + th.d-none.d-sm-table-cell #{settings.locale.total_sent} + span.small (#{settings.symbol}) if address.a_id !== 'coinbase' if settings.show_sent_received == true - th.d-none.d-sm-block #{settings.locale.total_received} (#{settings.symbol}) - th #{settings.locale.rl_balance} (#{settings.symbol}) + th.d-none.d-sm-table-cell #{settings.locale.total_received} + span.small (#{settings.symbol}) + th #{settings.locale.rl_balance} + span.small (#{settings.symbol}) th #{settings.locale.a_qr} tbody tr diff --git a/views/includes/address_history.pug b/views/includes/address_history.pug index 340ddd0..3a4e255 100644 --- a/views/includes/address_history.pug +++ b/views/includes/address_history.pug @@ -29,6 +29,12 @@ script. ajax: { "url": '/ext/getaddresstxsajax/'+hashAddress }, + language: { + paginate: { + previous: '<', + next: '>' + } + }, rowCallback: function (row, data, index) { var timestamp = data[0]; //variables for better readability var txhash = data[1]; //variables for better readability @@ -37,7 +43,7 @@ script. var balance = (data[4] / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); //variables for better readability var balanceParts = balance.split('.'); $("td:eq(0)", row).html(format_unixtime(new Date(timestamp), true)); - $("td:eq(1)", row).html('' + txhash + '').addClass('breakWord'); + $("td:eq(1)", row).html('' + txhash + '').addClass('breakWord d-none d-sm-table-cell'); var amount = 0; var updown = ''; var rowclass = 'info'; @@ -72,7 +78,7 @@ table#address-txs.table.table-bordered.table-striped thead tr th #{settings.locale.timestamp} - th #{settings.locale.tx_hash} + th.d-none.d-sm-table-cell #{settings.locale.tx_hash} th #{settings.locale.mkt_amount} span.small (#{settings.symbol}) th #{settings.locale.rl_balance} diff --git a/views/includes/net_addnodes.pug b/views/includes/net_addnodes.pug index 7e0f12a..c210894 100644 --- a/views/includes/net_addnodes.pug +++ b/views/includes/net_addnodes.pug @@ -7,6 +7,12 @@ script. responsive: true, lengthChange: true, processing: true, + language: { + paginate: { + previous: '<', + next: '>' + } + }, ajax: { url: '/ext/connections', dataSrc: function (json) { @@ -31,6 +37,12 @@ script. responsive: true, lengthChange: true, processing: true, + language: { + paginate: { + previous: '<', + next: '>' + } + }, ajax: { url: '/ext/connections', dataSrc: function (json) { diff --git a/views/includes/net_list.pug b/views/includes/net_list.pug index ba0634a..595447c 100644 --- a/views/includes/net_list.pug +++ b/views/includes/net_list.pug @@ -7,6 +7,12 @@ script. responsive: true, lengthChange: true, processing: true, + language: { + paginate: { + previous: '<', + next: '>' + } + }, ajax: { url: '/ext/connections', dataSrc: function (json) { diff --git a/views/includes/rl_balance.pug b/views/includes/rl_balance.pug index 6f162f7..d95a0f1 100644 --- a/views/includes/rl_balance.pug +++ b/views/includes/rl_balance.pug @@ -7,7 +7,8 @@ th.text-center span.fa.fa-flag-checkered th #{settings.locale.tx_address} - th #{settings.locale.rl_balance} (#{settings.symbol}) + th #{settings.locale.rl_balance} + span.small (#{settings.symbol}) th.text-center % tbody - var count = 0; diff --git a/views/includes/rl_received.pug b/views/includes/rl_received.pug index d065867..8669f66 100644 --- a/views/includes/rl_received.pug +++ b/views/includes/rl_received.pug @@ -7,7 +7,8 @@ th.text-center span.fa.fa-flag-checkered th #{settings.locale.tx_address} - th #{settings.locale.rl_received} (#{settings.symbol}) + th #{settings.locale.rl_received} + span.small (#{settings.symbol}) tbody - var count = 0; each item in received diff --git a/views/index.pug b/views/index.pug index 268aff7..7eb367f 100644 --- a/views/index.pug +++ b/views/index.pug @@ -29,6 +29,12 @@ block content iDisplayLength: displayLengthMax, lengthMenu: lengthMenuOpts, ajax: '/ext/getlasttxsajax/0', + language: { + paginate: { + previous: '<', + next: '>' + } + }, rowCallback: function(row, data, index) { var blockindex = data[0]; //variables for better readability var blockhash = data[1]; //variables for better readability @@ -39,10 +45,10 @@ block content var amount = amountParts[0] + '.' + amountParts[1] + ''; var timestamp = data[5]; $("td:eq(0)", row).html('' + blockindex + ''); - $("td:eq(1)", row).html('' + txhash + '').addClass("text-center breakWord"); + $("td:eq(1)", row).html('' + txhash + '').addClass("text-center breakWord d-none d-sm-table-cell"); $("td:eq(2)", row).html(outputs).addClass("text-center"); $("td:eq(3)", row).html(amount); - $("td:eq(4)", row).html(format_unixtime(new Date(timestamp), true)); + $("td:eq(4)", row).html(format_unixtime(new Date(timestamp), true)).addClass("text-center d-none d-sm-table-cell"); }, }); setInterval( function () { @@ -67,9 +73,10 @@ block content thead tr th.text-center #{settings.locale.ex_block} - th.text-center #{settings.locale.tx_hash} + th.text-center.d-none.d-sm-table-cell #{settings.locale.tx_hash} th.text-center #{settings.locale.tx_recipients} - th.text-center #{settings.locale.mkt_amount} (#{settings.symbol}) - th.text-center #{settings.locale.timestamp} + th.text-center #{settings.locale.mkt_amount} + span.small (#{settings.symbol}) + th.text-center.d-none.d-sm-table-cell #{settings.locale.timestamp} tbody.text-center .footer-padding \ No newline at end of file diff --git a/views/layout.pug b/views/layout.pug index 7c1d15f..8264671 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -1,6 +1,7 @@ doctype html html head + meta(name='viewport' content='width=device-width, initial-scale=1') title= settings.title link(rel='stylesheet', href='/themes/' + settings.theme + '/bootstrap.min.css') link(rel='stylesheet', href='/vendor/jqplot/jquery.jqplot.css') @@ -48,8 +49,8 @@ html $("#difficulty").text(diffString); $("#difficultyHybrid").text(json.data[0].difficultyHybrid); $("#hashrate").text(hashrateString); - $("#lastPrice").text(parseFloat(json.data[0].lastPrice).toFixed(8) + ' #{settings.markets.exchange}'.toUpperCase()); - $("#marketCap").text((parseFloat(json.data[0].lastPrice).toFixed(8) * parseInt(parseFloat(json.data[0].supply).toFixed(0))).toLocaleString('en') + ' #{settings.markets.exchange}'.toUpperCase()); + $("#lastPrice").text(parseFloat(json.data[0].lastPrice).toFixed(8)); + $("#marketCap").html((parseFloat(json.data[0].lastPrice).toFixed(8) * parseInt(parseFloat(json.data[0].supply).toFixed(0))).toLocaleString('en') + '' + '#{settings.markets.exchange}'.toUpperCase() + ''); $("#lblConnections").text(json.data[0].connections + ' connections'); $("#lblBlockcount").text(json.data[0].blockcount + ' blocks'); $("#lblX1").text(' '); @@ -63,7 +64,13 @@ html $('.history-table').dataTable({ searching: false, ordering: false, - responsive: true + responsive: true, + language: { + paginate: { + previous: '<', + next: '>' + } + } }); } $('.iquidus').css('color',$('.table').css('color')); @@ -112,7 +119,7 @@ html var supplyType=''; if ('#{settings.index.difficulty}' == 'Hybrid') supplyType+='
'; if (#{settings.index.show_market_cap} == true && #{settings.index.show_market_cap_over_price} != true) supplyType+='
'; - return '
#{settings.locale.ex_supply} (#{settings.symbol})
'+supplyType+'
'; + return '
#{settings.locale.ex_supply} (#{settings.symbol})
'+supplyType+'
'; } function getPricePanel() { if (#{settings.index.show_market_cap} == true && #{settings.index.show_market_cap_over_price} == true) { @@ -120,7 +127,7 @@ html } else { var priceType=''; if ('#{settings.index.difficulty}' == 'Hybrid') priceType+='
'; - return '
#{settings.markets.exchange} Price
'+priceType+'
'; + return '
Price (#{settings.markets.exchange})
'+priceType+'
'; } } function getActivePanel(nPanelName) { diff --git a/views/market.pug b/views/market.pug index 86d80e0..e422129 100644 --- a/views/market.pug +++ b/views/market.pug @@ -99,7 +99,8 @@ block content if marketdata.data.summary.volume != null th #{settings.locale.mkt_volume} if marketdata.data.summary.volume_btc != null - th.d-none.d-xl-table-cell #{settings.locale.mkt_volume} (#{marketdata.exchange}) + th.d-none.d-xl-table-cell #{settings.locale.mkt_volume} + span.small (#{marketdata.exchange}) if marketdata.data.summary.bid != null th.d-none.d-md-table-cell #{settings.locale.mkt_top_bid} if marketdata.data.summary.ask != null @@ -141,7 +142,7 @@ block content else td.d-none.d-xl-table-cell.text-danger.font-weight-bold #{price_change} % if marketdata.data.chartdata != 'null' && marketdata.data.chartdata != '' && marketdata.data.chartdata != '[]' - .row + #marketChart.row .col-md-12.cardSpacer .card.card-default .card-header @@ -156,9 +157,12 @@ block content table.table.table-striped.table-bordered.order-table thead tr - th #{settings.locale.mkt_price} (#{marketdata.exchange}) - th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.d-none.d-sm-table-cell #{settings.locale.mkt_total} (#{marketdata.exchange}) + th #{settings.locale.mkt_price} + span.small (#{marketdata.exchange}) + th #{settings.locale.mkt_amount} + span.small (#{marketdata.coin}) + th.d-none.d-sm-table-cell #{settings.locale.mkt_total} + span.small (#{marketdata.exchange}) tbody each buy in marketdata.data.buys tr @@ -178,9 +182,12 @@ block content table.table.table-striped.table-bordered.order-table thead tr - th #{settings.locale.mkt_price} (#{marketdata.exchange}) - th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th.d-none.d-sm-table-cell #{settings.locale.mkt_total} (#{marketdata.exchange}) + th #{settings.locale.mkt_price} + span.small (#{marketdata.exchange}) + th #{settings.locale.mkt_amount} + span.small (#{marketdata.coin}) + th.d-none.d-sm-table-cell #{settings.locale.mkt_total} + span.small (#{marketdata.exchange}) tbody each sell in marketdata.data.sells tr @@ -201,9 +208,12 @@ block content table.table.table-hover.history-table.table-bordered(cellspacing='0') thead tr - th #{settings.locale.mkt_price} (#{marketdata.exchange}) - th #{settings.locale.mkt_amount} (#{marketdata.coin}) - th #{settings.locale.mkt_total} (#{marketdata.exchange}) + th #{settings.locale.mkt_price} + span.small (#{marketdata.exchange}) + th #{settings.locale.mkt_amount} + span.small (#{marketdata.coin}) + th #{settings.locale.mkt_total} + span.small (#{marketdata.exchange}) th.d-none.d-lg-table-cell #{settings.locale.mkt_time_stamp} tbody each order in marketdata.data.history diff --git a/views/movement.pug b/views/movement.pug index 933987d..99998ba 100644 --- a/views/movement.pug +++ b/views/movement.pug @@ -30,6 +30,12 @@ block content iDisplayLength: displayLengthMax, lengthMenu: lengthMenuOpts, ajax: '/ext/getlasttxsajax/#{min_amount}', + language: { + paginate: { + previous: '<', + next: '>' + } + }, rowCallback: function(row, data, index) { var blockindex = data[0]; //variables for better readability var blockhash = data[1]; //variables for better readability @@ -47,7 +53,7 @@ block content var total = ""; } $("td:eq(0)", row).html(format_unixtime(new Date(timestamp), true)); - $("td:eq(1)", row).html('' + txhash + '').addClass('breakWord'); + $("td:eq(1)", row).html('' + txhash + '').addClass('breakWord d-none d-sm-table-cell'); $("td:eq(2)", row).html(total); } }); @@ -63,7 +69,7 @@ block content thead tr th.text-center timestamp - th.text-center txid + th.text-center.d-none.d-sm-table-cell txid th.text-center amount tbody.text-center .footer-padding \ No newline at end of file diff --git a/views/network.pug b/views/network.pug index c7a251d..42ada40 100644 --- a/views/network.pug +++ b/views/network.pug @@ -2,17 +2,16 @@ extends layout block content .col-md-12(style='margin-bottom: 4%') - .row.text-center(style='margin-bottom:15px;') + .text-center(style='margin-bottom:15px;') i #{settings.locale.net_warning} - .card.card-default - .card-header - ul.nav.nav-tabs(role='tablist') - li.nav-item.active(role='presentation') - a.nav-link.show.active(href='#connections', aria-controls='connections', role='tab', data-toggle='tab') #{settings.locale.net_connections} - li.nav-item(role='presentation') - a.nav-link(href='#addnodes', aria-controls='addnodes', role='tab', data-toggle='tab') #{settings.locale.net_addnodes} + .tabpanel + ul.nav.nav-tabs(role='tablist', style='border-bottom:0;') + li.nav-item.active(role='presentation') + a.nav-link.show.active(href='#connections', aria-controls='connections', role='tab', data-toggle='tab') #{settings.locale.net_connections} + li.nav-item(role='presentation') + a.nav-link(href='#addnodes', aria-controls='addnodes', role='tab', data-toggle='tab') #{settings.locale.net_addnodes} .tab-content(style='margin-bottom:70px;') - #connections.card.card-default.tab-pane.active + #connections.card.card-default.tab-pane.active(style='margin-top:0;border-top:0;') include ./includes/net_list.pug - #addnodes.card.card-default.tab-pane + #addnodes.card.card-default.tab-pane(style='margin-top:0;border-top:0;') include ./includes/net_addnodes.pug \ No newline at end of file diff --git a/views/reward.pug b/views/reward.pug index 12acc49..ad495e9 100644 --- a/views/reward.pug +++ b/views/reward.pug @@ -5,12 +5,15 @@ block content .col-xs-12.col-md-12 .card.card-default.card-address-summary .card-header(style='position:relative;') - strong #{settings.locale.heavy_title} (#{settings.symbol}) + strong #{settings.locale.heavy_title} + span.small (#{settings.symbol}) table.table.table-bordered.table-striped.summary-table thead tr - th #{settings.locale.ex_supply} (#{settings.symbol}) - th #{settings.locale.heavy_cap} (#{settings.symbol}) + th #{settings.locale.ex_supply} + span.small (#{settings.symbol}) + th #{settings.locale.heavy_cap} + span.small (#{settings.symbol}) th #{settings.locale.heavy_phase} th #{settings.locale.heavy_maxvote} th #{settings.locale.heavy_reward} diff --git a/views/richlist.pug b/views/richlist.pug index 32817a2..0d6a555 100644 --- a/views/richlist.pug +++ b/views/richlist.pug @@ -52,7 +52,8 @@ block content thead tr th - th Amount (#{settings.symbol}) + th Amount + span.small (#{settings.symbol}) th.text-center % tbody tr diff --git a/views/tx.pug b/views/tx.pug index f5ebd4d..e02ab9b 100644 --- a/views/tx.pug +++ b/views/tx.pug @@ -16,7 +16,7 @@ block content thead tr th #{settings.locale.confirmations} - th #{settings.locale.tx_block_hash} + th.d-none.d-sm-table-cell #{settings.locale.tx_block_hash} th #{settings.locale.timestamp} th tbody @@ -24,7 +24,7 @@ block content if confirms >= confirmations tr.bg-success.text-dark td #{confirms} - td + td.d-none.d-sm-table-cell a.breakWord(href='/block/'+tx.blockhash) #{tx.blockhash} td #{time} td.view_tx @@ -34,7 +34,7 @@ block content if confirms < (confirmations / 2) tr.bg-danger td #{confirms} - td + td.d-none.d-sm-table-cell a.breakWord(href='/block/'+tx.blockhash) #{tx.blockhash} td #{time} td.view_tx @@ -43,7 +43,7 @@ block content else tr.table-warning td #{confirms} - td + td.d-none.d-sm-table-cell a.breakWord(href='/block/'+tx.blockhash) #{tx.blockhash} td #{time} td.view_tx @@ -65,7 +65,8 @@ block content th #{settings.locale.tx_address} if (tx.vin.length > 0) if tx.vin[0].addresses != 'coinbase' - th.d-xs-none #{settings.locale.mkt_amount} (#{settings.symbol}) + th.d-xs-none #{settings.locale.mkt_amount} + span.small (#{settings.symbol}) tbody if tx.vin.length > 0 each r in tx.vin @@ -78,15 +79,12 @@ block content tr td if r.addresses != 'private_tx' - a.loading(href='/address/' + r.addresses) + a.loading.breakWord(href='/address/' + r.addresses) =r.addresses else =settings.locale.hidden_sender td.bg-danger.d-xs-none #{ramountParts[0]}. span.decimal #{ramountParts[1]} - tr.d-lg-none.d-md-none - td.bg-danger #{ramountParts[0]}. - span.decimal #{ramountParts[1]} #{settings.symbol} else tr.table-info.text-center td #{settings.locale.proof_of_stake} @@ -98,7 +96,8 @@ block content thead tr th #{settings.locale.tx_address} - th #{settings.locale.mkt_amount} (#{settings.symbol}) + th #{settings.locale.mkt_amount} + span.small (#{settings.symbol}) tbody each r in tx.vout if tx.vout.length > 0