From 6b3100e506c49ec490ca06ae032462bbd5dbf04d Mon Sep 17 00:00:00 2001 From: joeuhren <46763106+joeuhren@users.noreply.github.com> Date: Fri, 20 Nov 2020 17:13:30 -0700 Subject: [PATCH] Use separate CSS class for digits after decimal place --- public/stylesheets/style.css | 4 ++++ views/address.pug | 16 +++++++++++----- views/block.pug | 8 ++++++-- views/includes/address_history.pug | 24 ++++++++++++++++++------ views/includes/rl_balance.pug | 9 ++++----- views/includes/rl_received.pug | 9 ++++----- views/index.pug | 5 +++-- views/tx.pug | 24 +++++++++++++++++------- 8 files changed, 67 insertions(+), 32 deletions(-) diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 2fced8a..d7bd4d0 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -202,4 +202,8 @@ tr { .logo-main { padding: 0 15px 0 30px; } +} + +.decimal { + font-size: 0.7em; } \ No newline at end of file diff --git a/views/address.pug b/views/address.pug index 8584b74..6ca434a 100644 --- a/views/address.pug +++ b/views/address.pug @@ -2,8 +2,11 @@ extends layout block content - var balance = ((address.received - address.sent) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - - var sent = (address.sent /100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}) - - var received = (address.received / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}) + - var balanceParts = balance.split('.'); + - var sent = (address.sent /100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var sentParts = sent.split('.'); + - var received = (address.received / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var receivedParts = received.split('.'); img.qrcode.pull-right.hidden-xs(src='/qr/' + address.a_id) .col-xs-12.col-md-10.col-md-offset-1 .panel.panel-default.panel-address-summary @@ -34,11 +37,14 @@ block content tbody tr if settings.show_sent_received == true - td #{sent} + td #{sentParts[0]}. + span.decimal #{sentParts[1]} if address.a_id !== 'coinbase' if settings.show_sent_received == true - td #{received} - td #{balance} + td #{receivedParts[0]}. + span.decimal #{receivedParts[1]} + td #{balanceParts[0]}. + span.decimal #{balanceParts[1]} .panel.panel-default .panel-heading strong #{settings.locale.ex_latest_transactions} diff --git a/views/block.pug b/views/block.pug index 15d28f3..8a41aad 100644 --- a/views/block.pug +++ b/views/block.pug @@ -92,10 +92,14 @@ block content td #{txn.vout.length} if txn.vout.length > 0 - var total = (txn.total / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - td #{total} + - var totalParts = total.split('.') + td #{totalParts[0]}. + span.decimal #{totalParts[1]} else - var total = (txn.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - td #{total} + - var totalParts = total.split('.') + td #{totalParts[0]}. + span.decimal #{totalParts[1]} td.view_tx a(href='/tx/' + txn.txid) span.glyphicon.glyphicon-eye-open diff --git a/views/includes/address_history.pug b/views/includes/address_history.pug index cb9f0bf..8c11028 100644 --- a/views/includes/address_history.pug +++ b/views/includes/address_history.pug @@ -27,31 +27,43 @@ script. var vin = data[3]; //variables for better readability 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(timestamp); $("td:eq(1)", row).html('' + txhash + ''); var amount = 0; + var updown = ""; + var rowclass = "info"; if(out > 0 && vin > 0) { amount = (out - vin) / 100000000 if (amount < 0) { amount = (amount * -1).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - $("td:eq(2)", row).html("-" + amount).addClass("info"); + updown = "-"; + //- $("td:eq(2)", row).html("-" + amount).addClass("info"); } else if (amount > 0) { amount = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - $("td:eq(2)", row).html("+" + amount).addClass("info"); + updown = "+"; + //- $("td:eq(2)", row).html("+" + amount).addClass("info"); } else { amount = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - $("td:eq(2)", row).html(amount).addClass("info"); + //- $("td:eq(2)", row).html(amount).addClass("info"); } } else if (out > 0) { amount = (out / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - $("td:eq(2)", row).html("+" + amount).addClass("success"); + updown = "+"; + rowclass = "success"; + //- $("td:eq(2)", row).html("+" + amount).addClass("success"); } else { amount = (vin / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - $("td:eq(2)", row).html("-" + amount).addClass("danger"); + updown = "-"; + rowclass = "danger"; + //- $("td:eq(2)", row).html("-" + amount).addClass("danger"); } - $("td:eq(3)", row).html(balance); + var amountParts = amount.split('.'); + $("td:eq(2)", row).html(updown + amountParts[0] + '.' + amountParts[1] + '').addClass(rowclass); + $("td:eq(3)", row).html(balanceParts[0] + '.' + balanceParts[1] + ''); }, }); diff --git a/views/includes/rl_balance.pug b/views/includes/rl_balance.pug index 383b4e5..7a2824d 100644 --- a/views/includes/rl_balance.pug +++ b/views/includes/rl_balance.pug @@ -1,7 +1,7 @@ table.table.table-hover.table-bordered(cellspacing="0") thead tr - th(style='text-align:center;') + th(style='text-align:center;') span.fa.fa-flag-checkered th #{settings.locale.tx_address} th.hidden-xs #{settings.locale.rl_balance} (#{settings.symbol}) @@ -11,8 +11,7 @@ table.table.table-hover.table-bordered(cellspacing="0") each item in balance - count = count + 1 - var itemFixed = (parseInt(item.balance) / 100000000); - - var itemFixedParts = itemFixed.toFixed(0).toString().split("."); - - var itemFixedStr = itemFixedParts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",") + (itemFixedParts[1] ? "." + itemFixedParts[1] : ""); + - var itemFixedParts = itemFixed.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}).split("."); - var percentage = (itemFixed / stats.supply) * 100; tr td(style='text-align:center;') @@ -20,7 +19,7 @@ table.table.table-hover.table-bordered(cellspacing="0") td a(href='/address/' + item.a_id) #{item.a_id} include ./rl_labels.pug - td.hidden-xs - =itemFixedStr + td.hidden-xs #{itemFixedParts[0]}. + span.decimal #{itemFixedParts[1]} td.hidden-xs(style='text-align:center;') =percentage.toFixed(2) \ No newline at end of file diff --git a/views/includes/rl_received.pug b/views/includes/rl_received.pug index 045797d..e3f29df 100644 --- a/views/includes/rl_received.pug +++ b/views/includes/rl_received.pug @@ -9,14 +9,13 @@ table.table.table-hover.table-bordered(cellspacing="0") - var count = 0 each item in received - count = count + 1; - - var itemFixed = (parseInt(item.received) / 100000000); - - var itemFixedParts = itemFixed.toFixed(0).toString().split("."); - - var itemFixedStr = itemFixedParts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",") + (itemFixedParts[1] ? "." + itemFixedParts[1] : ""); + - var itemFixed = (parseInt(item.received) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}) + - var itemFixedParts = itemFixed.split("."); tr td(style='text-align:center;') =count td a(href='/address/' + item.a_id) #{item.a_id} include ./rl_labels.pug - td.hidden-xs - =itemFixedStr \ No newline at end of file + td.hidden-xs #{itemFixedParts[0]}. + span.decimal #{itemFixedParts[1]} \ No newline at end of file diff --git a/views/index.pug b/views/index.pug index cbbf5ae..5636280 100644 --- a/views/index.pug +++ b/views/index.pug @@ -50,8 +50,9 @@ block content json.data[i]['timestamp'] = new Date((json.data[i]['timestamp']) * 1000).toUTCString(); json.data[i]['txid'] = "" + json.data[i]['txid'] + ""; json.data[i]['blockindex'] = "" + json.data[i]['blockindex'] + ""; - var amount = json.data[i]['total'] / 100000000; - json.data[i]['total'] = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + var amount = (json.data[i]['total'] / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + var amountParts = amount.split('.'); + json.data[i]['total'] = amountParts[0] + '.' + amountParts[1] + ''; json.data[i]['recipients'] = json.data[i]['vout'].length; } return json.data; diff --git a/views/tx.pug b/views/tx.pug index d64ee39..3e358ec 100644 --- a/views/tx.pug +++ b/views/tx.pug @@ -72,6 +72,7 @@ block content td #{settings.locale.new_coins} else - var ramount = (r.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}) + - var ramountParts = ramount.split('.') tr td if r.addresses != 'private_tx' @@ -79,9 +80,11 @@ block content =r.addresses else =settings.locale.hidden_sender - td.danger.hidden-xs #{ramount} + td.danger.hidden-xs #{ramountParts[0]}. + span.decimal #{ramountParts[1]} tr.hidden-lg.hidden-md - td.danger #{ramount} #{settings.symbol} + td.danger #{ramountParts[0]}. + span.decimal #{ramountParts[1]} #{settings.symbol} else tr.info(style='text-align:center') td #{settings.locale.proof_of_stake} @@ -98,28 +101,35 @@ block content each r in tx.vout if tx.vout.length > 0 - var ramount = (r.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}) + - var ramountParts = ramount.split('.') tr if r.addresses != 'private_tx' td a.loading(href='/address/' + r.addresses) =r.addresses - td.success.hidden-xs #{ramount} + td.success.hidden-xs #{ramountParts[0]}. + span.decimal #{ramountParts[1]} else if r.amount > 0 td =settings.locale.hidden_recipient - td.success.hidden-xs #{ramount} + td.success.hidden-xs #{ramountParts[0]}. + span.decimal #{ramountParts[1]} else td(colspan='2') =settings.locale.hidden_recipient tr.hidden-lg.hidden-md - td.success #{ramount} #{settings.symbol} + td.success #{ramountParts[0]}. + span.decimal #{ramountParts[1]} #{settings.symbol} else - var ramount = (r.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}) + - var ramountParts = ramount.split('.') tr td a.loading(href='/address/' + r.addresses) =r.addresses - td.success.hidden-xs #{ramount} + td.success.hidden-xs #{ramountParts[0]}. + span.decimal #{ramountParts[1]} tr.hidden-lg.hidden-md - td.success #{ramount} #{settings.symbol} + td.success #{ramountParts[0]}. + span.decimal #{ramountParts[1]} #{settings.symbol} .footer-padding \ No newline at end of file