From 58576b22d6295274fd317f8a03946ebb8c90277d Mon Sep 17 00:00:00 2001 From: Joe Uhren Date: Thu, 19 Oct 2023 20:26:27 -0600 Subject: [PATCH] Core script and library updates -jQuery has been updated to v3.7.1 -Luxon has been updated to v3.4.3. Also updated the link to the documentation showing how to format dates in the settings.json.template and settings.js -Datatables has been updated to v1.13.6 -Font Awesome has been updated to v6.4.2 and all icons in the project have been updated to use the newest v6.x codes -OverlayScrollbars has been updated to v2.3.2 -flag-icons (previously called flag-icon-css) has been updated to v6.11.1 -Updated the main style.scss file with better color support for the new datatable loading animation color -Exor theme has been updated to v3.0.2 with a small fix to support the new datatable loading animation color --- README.md | 12 +-- lib/settings.js | 24 +++--- public/css/style.scss | 73 +++++++++++++++- public/css/themes/exor/_bootswatch.scss | 2 +- public/css/themes/exor/_variables.scss | 4 +- public/css/themes/exor/bootstrap.css | 2 +- public/css/themes/exor/bootstrap.min.css | 2 +- settings.json.template | 10 +-- views/address.pug | 2 +- views/block.pug | 10 +-- views/claim_address.pug | 8 +- views/includes/common.pug | 2 +- views/includes/rl_labels.pug | 4 +- views/index.pug | 4 +- views/layout.pug | 103 ++++++++++++----------- views/market.pug | 12 +-- views/masternodes.pug | 4 +- views/movement.pug | 2 +- views/network.pug | 10 +-- views/orphans.pug | 2 +- views/richlist.pug | 4 +- views/tx.pug | 8 +- 22 files changed, 188 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index b9a02d6..16ce716 100644 --- a/README.md +++ b/README.md @@ -71,17 +71,17 @@ Table of Contents - Built using the following scripts and technologies: - Node.js (v18.16.0 or newer recommended) - MongoDB (v6.0.6 or newer recommended) - - JQuery v3.6.0 + - jQuery v3.7.1 - Bootstrap v5.1.3 - - DataTables v1.11.3 - - FontAwesome v5.15.4 - - Luxon v2.1.1 + - DataTables v1.13.6 + - Font Awesome v6.4.2 + - Luxon v3.4.3 - Chart.js v4.4.0 - chartjs-plugin-crosshair v2.0.0 ([https://github.com/abelheinsbroek/chartjs-plugin-crosshair](https://github.com/abelheinsbroek/chartjs-plugin-crosshair)) - chartjs-chart-financial v0.1.1 ([https://github.com/chartjs/chartjs-chart-financial](https://github.com/chartjs/chartjs-chart-financial)) - chartjs-adapter-luxon v1.3.1 ([https://github.com/chartjs/chartjs-adapter-luxon](https://github.com/chartjs/chartjs-adapter-luxon)) - - OverlayScrollbars v1.13.3 - - flag-icon-css v4.1.4 ([https://github.com/lipis/flag-icon-css](https://github.com/lipis/flag-icon-css)) + - OverlayScrollbars v2.3.2 + - flag-icons v6.11.1 ([https://github.com/lipis/flag-icons](https://github.com/lipis/flag-icons)) - Intl.js (uses the v3.111.0 polyfill service to only download if using a browser that doesn't already support the ECMAScript Internationalization API) - Platform independent (tested to run on Windows, MacOS and Linux) **NOTE:** Most of the instructions in this guide were written for use with Linux and may need to be modified when using another OS - Mobile-friendly diff --git a/lib/settings.js b/lib/settings.js index 448cc29..4d66530 100644 --- a/lib/settings.js +++ b/lib/settings.js @@ -127,7 +127,7 @@ exports.shared_pages = { // date_time: a collection of settings that pertain to the date and time values displayed in the explorer "date_time": { // display_format: The format to use when displaying date/time values - // Date/time values are formatted using the Luxon library and must follow the correct syntax (read more: https://moment.github.io/luxon/docs/manual/formatting.html#table-of-tokens) + // Date/time values are formatted using the Luxon library and must follow the correct syntax (read more: https://moment.github.io/luxon/#/formatting?id=table-of-tokens) // Ex: LLL dd, yyyy HH:mm:ss ZZZZ = May 27, 2019 22:04:11 UTC "display_format": "LLL dd, yyyy HH:mm:ss ZZZZ", // timezone: All dates and times are stored as UTC dates and can either be displayed in UTC format or else they can be displayed in the local timezone according to a user's web browser settings @@ -1655,7 +1655,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.github == null ? false : json_settings.display.github), "tooltip_text": "Github", "url": "https://github.com/" + json_settings.github, - "fontawesome_class": "fab fa-github", + "fontawesome_class": "fa-brands fa-github", "image_path": "" }); // delete old settings @@ -1669,7 +1669,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.discord == null ? false : json_settings.display.discord), "tooltip_text": "Discord", "url": json_settings.discord, - "fontawesome_class": "fab fa-discord", + "fontawesome_class": "fa-brands fa-discord", "image_path": "" }); // delete old settings @@ -1683,7 +1683,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.telegram == null ? false : json_settings.display.telegram), "tooltip_text": "Telegram", "url": "https://t.me/" + json_settings.telegram, - "fontawesome_class": "fab fa-telegram", + "fontawesome_class": "fa-brands fa-telegram", "image_path": "" }); // delete old settings @@ -1697,7 +1697,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.reddit == null ? false : json_settings.display.reddit), "tooltip_text": "Reddit", "url": "https://reddit.com/r/" + json_settings.reddit, - "fontawesome_class": "fab fa-reddit", + "fontawesome_class": "fa-brands fa-reddit", "image_path": "" }); // delete old settings @@ -1711,7 +1711,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.youtube == null ? false : json_settings.display.youtube), "tooltip_text": "YouTube", "url": json_settings.youtube, - "fontawesome_class": "fab fa-youtube", + "fontawesome_class": "fa-brands fa-youtube", "image_path": "" }); // delete old settings @@ -1725,7 +1725,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.slack == null ? false : json_settings.display.slack), "tooltip_text": "Slack", "url": json_settings.slack, - "fontawesome_class": "fab fa-slack", + "fontawesome_class": "fa-brands fa-slack", "image_path": "" }); // delete old settings @@ -1739,7 +1739,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.twitter == null ? false : json_settings.display.twitter), "tooltip_text": "Twitter", "url": "https://twitter.com/" + json_settings.twitter, - "fontawesome_class": "fab fa-twitter", + "fontawesome_class": "fa-brands fa-twitter", "image_path": "" }); // delete old settings @@ -1753,7 +1753,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.facebook == null ? false : json_settings.display.facebook), "tooltip_text": "Facebook", "url": "https://www.facebook.com/" + json_settings.facebook, - "fontawesome_class": "fab fa-facebook", + "fontawesome_class": "fa-brands fa-facebook", "image_path": "" }); // delete old settings @@ -1767,7 +1767,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.googleplus == null ? false : json_settings.display.googleplus), "tooltip_text": "Google+", "url": "https://plus.google.com/" + json_settings.googleplus, - "fontawesome_class": "fab fa-google-plus", + "fontawesome_class": "fa-brands fa-google-plus", "image_path": "" }); // delete old settings @@ -1781,7 +1781,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.bitcointalk == null ? false : json_settings.display.bitcointalk), "tooltip_text": "Bitcointalk", "url": "https://bitcointalk.org/index.php?topic=" + json_settings.bitcointalk, - "fontawesome_class": "fab fa-btc", + "fontawesome_class": "fa-brands fa-btc", "image_path": "" }); // delete old settings @@ -1795,7 +1795,7 @@ exports.loadSettings = function loadSettings() { "enabled": (json_settings.display == null || json_settings.display.website == null ? false : json_settings.display.website), "tooltip_text": "Website", "url": json_settings.website, - "fontawesome_class": "fa fa-link", + "fontawesome_class": "fa-solid fa-link", "image_path": "" }); // delete old settings diff --git a/public/css/style.scss b/public/css/style.scss index 90a3852..f5dca44 100644 --- a/public/css/style.scss +++ b/public/css/style.scss @@ -726,6 +726,64 @@ $theme-name: to-lower-case(theme-selector.$theme-name); } } +@mixin loading-animation-color() { + @if $theme-name == "cerulean" { + background: cerulean.$primary; + } @else if $theme-name == "cosmo" { + background: cosmo.$primary; + } @else if $theme-name == "cyborg" { + background: cyborg.$primary; + } @else if $theme-name == "darkly" { + background: darkly.$primary; + } @else if $theme-name == "exor" { + background: exor.$primary; + } @else if $theme-name == "flatly" { + background: flatly.$primary; + } @else if $theme-name == "journal" { + background: journal.$primary; + } @else if $theme-name == "litera" { + background: litera.$primary; + } @else if $theme-name == "lumen" { + background: lumen.$primary; + } @else if $theme-name == "lux" { + background: lux.$primary; + } @else if $theme-name == "materia" { + background: materia.$primary; + } @else if $theme-name == "minty" { + background: minty.$primary; + } @else if $theme-name == "morph" { + background: morph.$primary; + } @else if $theme-name == "pulse" { + background: pulse.$primary; + } @else if $theme-name == "quartz" { + background: quartz.$primary; + } @else if $theme-name == "sandstone" { + background: sandstone.$primary; + } @else if $theme-name == "simplex" { + background: simplex.$primary; + } @else if $theme-name == "sketchy" { + background: sketchy.$primary; + } @else if $theme-name == "slate" { + background: slate.$secondary; + } @else if $theme-name == "solar" { + background: solar.$primary; + } @else if $theme-name == "spacelab" { + background: spacelab.$primary; + } @else if $theme-name == "superhero" { + background: superhero.$primary; + } @else if $theme-name == "united" { + background: united.$primary; + } @else if $theme-name == "vapor" { + background: vapor.$primary; + } @else if $theme-name == "yeti" { + background: yeti.$primary; + } @else if $theme-name == "zephyr" { + background: zephyr.$primary; + } @else { + background: rgb(13, 110, 253); + } +} + body { font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; } @@ -915,6 +973,10 @@ div.dataTables_scrollBody > table { } } +div.dataTables_processing > div:last-child > div { + @include loading-animation-color; +} + .card { box-shadow: none; } @@ -1337,6 +1399,7 @@ div#side-nav-bar { div.offcanvas-body { padding: 0; overflow-x: hidden; + align-items: normal; div#side-nav-bar { display: block; @@ -1353,6 +1416,10 @@ div.offcanvas-body { #sidebar-offcanvas-close { display: none; + + > a.nav-link > span { + line-height: 1; + } } .navbar-nav #sidebar-offcanvas-close .nav-link:hover, .navbar-nav #sidebar-offcanvas-close .nav-link:focus { @@ -1481,6 +1548,10 @@ div.navbar-expand-lg { } } +.navbar-collapse { + align-items: normal; +} + #search-navbar-collapse { &.collapse:not(.show) { display: none; @@ -1516,7 +1587,7 @@ div.navbar-expand-lg { @include header-button-dark; } -.os-content > .navbar-nav > li#markets > div.dropdown-menu { +div[data-overlayscrollbars-viewport="scrollbarHidden"] > .navbar-nav > li#markets > div.dropdown-menu { background-color: transparent !important; margin: 0; padding: 0; diff --git a/public/css/themes/exor/_bootswatch.scss b/public/css/themes/exor/_bootswatch.scss index 7883aa1..fe247d1 100644 --- a/public/css/themes/exor/_bootswatch.scss +++ b/public/css/themes/exor/_bootswatch.scss @@ -1,4 +1,4 @@ -// Exor 3.0.0 (Based on bootstrap 5.1.3) +// Exor 3.0.2 (Based on bootstrap 5.1.3) // Variables diff --git a/public/css/themes/exor/_variables.scss b/public/css/themes/exor/_variables.scss index ed352af..3643d8f 100644 --- a/public/css/themes/exor/_variables.scss +++ b/public/css/themes/exor/_variables.scss @@ -1,4 +1,4 @@ -// Exor 3.0.0 (Based on bootstrap 5.1.3) +// Exor 3.0.2 (Based on bootstrap 5.1.3) $theme: "exor" !default; @@ -31,7 +31,7 @@ $green: #00bc8c !default; $teal: #20c997 !default; $cyan: #3498db !default; -$primary: $blue !default; +$primary: #ffbd11 !default; $secondary: $gray-700 !default; $success: $green !default; $info: $cyan !default; diff --git a/public/css/themes/exor/bootstrap.css b/public/css/themes/exor/bootstrap.css index 5ffa413..71852d5 100644 --- a/public/css/themes/exor/bootstrap.css +++ b/public/css/themes/exor/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Exor 3.0.1 + * Exor 3.0.2 * Copyright 2020-2022 Joe Uhren * Licensed under MIT * Based on Bootstrap diff --git a/public/css/themes/exor/bootstrap.min.css b/public/css/themes/exor/bootstrap.min.css index 5c705f3..aa6b684 100644 --- a/public/css/themes/exor/bootstrap.min.css +++ b/public/css/themes/exor/bootstrap.min.css @@ -1,5 +1,5 @@ /*! - * Exor 3.0.1 + * Exor 3.0.2 * Copyright 2020-2022 Joe Uhren * Licensed under MIT * Based on Bootstrap diff --git a/settings.json.template b/settings.json.template index b4b494f..78d3376 100644 --- a/settings.json.template +++ b/settings.json.template @@ -126,7 +126,7 @@ // date_time: a collection of settings that pertain to the date and time values displayed in the explorer "date_time": { // display_format: The format to use when displaying date/time values - // Date/time values are formatted using the Luxon library and must follow the correct syntax (read more: https://moment.github.io/luxon/docs/manual/formatting.html#table-of-tokens) + // Date/time values are formatted using the Luxon library and must follow the correct syntax (read more: https://moment.github.io/luxon/#/formatting?id=table-of-tokens) // Ex: LLL dd, yyyy HH:mm:ss ZZZZ = May 27, 2019 22:04:11 UTC "display_format": "LLL dd, yyyy HH:mm:ss ZZZZ", // timezone: All dates and times are stored as UTC dates and can either be displayed in UTC format or else they can be displayed in the local timezone according to a user's web browser settings @@ -414,7 +414,7 @@ // url: The exact url that the social link should navigate to "url": "https://github.com/team-exor", // fontawesome_class: A string of css classes, separated by spaces that can be used to display a fontawesome icon for this social link. See https://fontawesome.com/ for more info - "fontawesome_class": "fab fa-github", + "fontawesome_class": "fa-brands fa-github", // image_path: The path to an image file that will be displayed for this social link // NOTE: The path root is /public "image_path": "" @@ -428,7 +428,7 @@ // url: The exact url that the social link should navigate to "url": "https://twitter.com/ExorOfficial", // fontawesome_class: A string of css classes, separated by spaces that can be used to display a fontawesome icon for this social link. See https://fontawesome.com/ for more info - "fontawesome_class": "fab fa-twitter", + "fontawesome_class": "fa-brands fa-twitter", // image_path: The path to an image file that will be displayed for this social link // NOTE: The path root is /public "image_path": "" @@ -442,7 +442,7 @@ // url: The exact url that the social link should navigate to "url": "https://discord.gg/dSuGm3y", // fontawesome_class: A string of css classes, separated by spaces that can be used to display a fontawesome icon for this social link. See https://fontawesome.com/ for more info - "fontawesome_class": "fab fa-discord", + "fontawesome_class": "fa-brands fa-discord", // image_path: The path to an image file that will be displayed for this social link // NOTE: The path root is /public "image_path": "" @@ -456,7 +456,7 @@ // url: The exact url that the social link should navigate to "url": "https://t.me/Exorofficial", // fontawesome_class: A string of css classes, separated by spaces that can be used to display a fontawesome icon for this social link. See https://fontawesome.com/ for more info - "fontawesome_class": "fab fa-telegram", + "fontawesome_class": "fa-brands fa-telegram", // image_path: The path to an image file that will be displayed for this social link // NOTE: The path root is /public "image_path": "" diff --git a/views/address.pug b/views/address.pug index c9a89a1..ad5ac6a 100644 --- a/views/address.pug +++ b/views/address.pug @@ -69,7 +69,7 @@ block content var vin = data[3]; //variables for better readability var balance = data[4].toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); //variables for better readability var balanceParts = balance.split('.'); - $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); + $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); $("td:eq(1)", row).html('' + txhash + '').addClass('breakWord d-none d-md-table-cell'); var amount = 0; var updown = ''; diff --git a/views/block.pug b/views/block.pug index 8c66e63..88a85ff 100644 --- a/views/block.pug +++ b/views/block.pug @@ -35,7 +35,7 @@ block content .alert.alert-warning.alert-dismissible.fade.show(role='alert') button.btn-close(type='button', data-bs-dismiss='alert') .cardSpacer - span.fas.fa-exclamation-triangle(style='margin-right:5px') + span.fa-solid.fa-triangle-exclamation(style='margin-right:5px') strong=settings.locale.ex_warning div="This is an orphaned block" if settings.block_page.page_header.show_img == true || settings.block_page.page_header.show_title == true || settings.block_page.page_header.show_description == true @@ -58,7 +58,7 @@ block content div(style='display: flex;flex-wrap: wrap;') if block.previousblockhash != null a(href='/block/' + block.previousblockhash) - span.fa.fa-chevron-left.block-last(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.block_previous, style='color: var(--bs-body-color);') + span.fa-solid.fa-chevron-left.block-last(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.block_previous, style='color: var(--bs-body-color);') strong.d-none.d-md-block #{settings.locale.tx_block_hash}: #{block.hash} strong.d-block.d-md-none #{settings.locale.ex_summary} else @@ -66,10 +66,10 @@ block content strong.d-block.d-md-none(style='margin-left:10px;') #{settings.locale.ex_summary} if block.nextblockhash != null a(href='/block/' + block.nextblockhash) - span.fa.fa-chevron-right.block-next(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.block_next, style='color: var(--bs-body-color);') + span.fa-solid.fa-chevron-right.block-next(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.block_next, style='color: var(--bs-body-color);') if settings.api_page.public_apis.rpc.getblock.enabled == true a.d-none.d-md-block(href='/api/getblock?hash=' + block.hash, style='margin-left:auto;', data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.view_raw_block_data) - span.fa.fa-info-circle(style='color: var(--bs-body-color);') + span.fa-solid.fa-circle-info(style='color: var(--bs-body-color);') table#block-summary.table.table-bordered.summary-table.bottom-border-0.single-row-table(style='border-top:0;margin-top:0 !important;') thead tr(class=theadClasses) @@ -125,7 +125,7 @@ block content tr td.text-center.d-table-cell.d-md-none a(href='/tx/' + txn.txid) - span.fa.fa-eye(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.view_tx) + span.fa-regular.fa-eye(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.view_tx) td.d-none.d-md-table-cell a.breakWord(href='/tx/' + txn.txid) #{txn.txid} td.text-center #{txn.vout.length} diff --git a/views/claim_address.pug b/views/claim_address.pug index 2db85b8..f95da9e 100644 --- a/views/claim_address.pug +++ b/views/claim_address.pug @@ -7,7 +7,7 @@ block content return '' + (msgText == null || msgText == '' ? '' : '' + msgText + '') + @@ -23,9 +23,9 @@ block content fixFooterHeightAndPosition(); } $('#claimInstructions').on('show.bs.collapse', function () { - $('#showClaimInstructions').html('Hide claim instructions'); + $('#showClaimInstructions').html('Hide claim instructions'); }).on('hide.bs.collapse', function () { - $('#showClaimInstructions').html('Show claim instructions'); + $('#showClaimInstructions').html('Show claim instructions'); }).on('shown.bs.collapse', function () { fixFooterHeightAndPosition(); }).on('hidden.bs.collapse', function () { @@ -87,7 +87,7 @@ block content strong Claim Wallet Address .card-body a#showClaimInstructions.badge.bg-primary(href='#claimInstructions', style='font-size:100%;margin-bottom:15px;', data-bs-toggle='collapse' role='button' aria-expanded='false' aria-controls='claimInstructions') - i.fas.fa-angle-up(style='margin-right:5px;') + i.fa-solid.fa-angle-up(style='margin-right:5px;') span Show claim instructions div#claimInstructions.collapse div.alert.alert-primary diff --git a/views/includes/common.pug b/views/includes/common.pug index db52276..e827618 100644 --- a/views/includes/common.pug +++ b/views/includes/common.pug @@ -1,5 +1,5 @@ script(type='text/javascript', src='https://polyfill.io/v3/polyfill.min.js?version=3.111.0&features=Intl') -script(type='text/javascript', src='https://cdn.jsdelivr.net/npm/luxon@2.1.1/build/global/luxon.min.js') +script(type='text/javascript', src='https://cdn.jsdelivr.net/npm/luxon@3.4.3/build/global/luxon.min.js') script. function format_unixtime(unixtime, alt) { if (alt == null) diff --git a/views/includes/rl_labels.pug b/views/includes/rl_labels.pug index da2b300..2146586 100644 --- a/views/includes/rl_labels.pug +++ b/views/includes/rl_labels.pug @@ -6,10 +6,10 @@ if settings.labels[address.a_id] != null && settings.labels[address.a_id].enable =settings.labels[address.a_id].label if settings.labels[address.a_id].url a(href=settings.labels[address.a_id].url, target='_blank', alt='Visit site', title='Visit site', data-bs-toggle='tooltip', data-bs-placement='top') - span.fa.fa-question-circle(style='margin-left:5px;') + span.fa-solid.fa-circle-question(style='margin-left:5px;') else label.badge.bg-default.float-end.d-none(class='d-' + (active == 'richlist' ? 'md' : (active == 'tx' ? 'lg' : 'sm')) + '-block', style='margin-left:15px;margin-bottom:0;') =settings.labels[address.a_id].label if settings.labels[address.a_id].url a(href=settings.labels[address.a_id].url, target='_blank', alt='Visit site', title='Visit site', data-bs-toggle='tooltip', data-bs-placement='top') - span.fa.fa-question-circle(style='margin-left:5px;') \ No newline at end of file + span.fa-solid.fa-circle-question(style='margin-left:5px;') \ No newline at end of file diff --git a/views/index.pug b/views/index.pug index cb88dec..cd3abbd 100644 --- a/views/index.pug +++ b/views/index.pug @@ -69,7 +69,7 @@ block content var amountParts = amount.split('.'); var amount = amountParts[0] + '.' + amountParts[1] + ''; var timestamp = data[5]; - $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); + $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); $("td:eq(1)", row).html('' + blockindex + ''); $("td:eq(2)", row).html('' + txhash + '').addClass("text-center breakWord d-none d-md-table-cell"); $("td:eq(3)", row).html(outputs).addClass("text-center d-none d-sm-table-cell"); @@ -125,7 +125,7 @@ block content .alert.alert-danger.alert-dismissible.fade.show(role='alert') button.btn-close(type='button', data-bs-dismiss='alert') .cardSpacer - span.fas.fa-exclamation-circle(style='margin-right:5px') + span.fa-solid.fa-circle-exclamation(style='margin-right:5px') strong #{settings.locale.ex_error} div #{error} .col-md-12.cardSpacer diff --git a/views/layout.pug b/views/layout.pug index 461382a..318b127 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -14,18 +14,18 @@ html(lang='en') if settings.shared_pages.favicons.favicon192 != '' link(rel='icon', href='/' + settings.shared_pages.favicons.favicon192, sizes='192x192') link(rel='stylesheet', href='/css/themes/' + settings.shared_pages.theme.toLowerCase() + '/bootstrap.min.css' + (themeHash == null ? '' : '?h=' + themeHash)) - link(rel='stylesheet', href='https://use.fontawesome.com/releases/v5.15.4/css/all.css') + link(rel='stylesheet', href='https://use.fontawesome.com/releases/v6.4.2/css/all.css') if active == 'network' - link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/4.1.4/css/flag-icons.min.css') - link(rel='stylesheet', type='text/css', href='https://cdn.datatables.net/v/bs5/dt-1.11.3/datatables.min.css') - link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/overlayscrollbars/1.13.3/css/OverlayScrollbars.min.css') + link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/flag-icons/6.11.1/css/flag-icons.min.css') + link(rel='stylesheet', type='text/css', href='https://cdn.datatables.net/v/bs5/dt-1.13.6/datatables.min.css') + link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/overlayscrollbars/2.3.2/styles/overlayscrollbars.min.css') link(rel='stylesheet', href='/css/style.min.css' + (styleHash == null ? '' : '?h=' + styleHash)) link(rel='stylesheet', href='/css/custom.min.css' + (customHash == null ? '' : '?h=' + customHash)) - script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js', integrity='sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==', crossorigin='anonymous', referrerpolicy='no-referrer') + script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js', integrity='sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==', crossorigin='anonymous', referrerpolicy='no-referrer') script(type='text/javascript', src='https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js', integrity='sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p', crossorigin='anonymous') script(type='text/javascript', src='/js/custom.js') - script(type='text/javascript', src='https://cdn.datatables.net/v/bs5/dt-1.11.3/datatables.min.js') - script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/overlayscrollbars/1.13.3/js/jquery.overlayScrollbars.min.js', integrity="sha512-PviP63d43OXLyLjCv3TawK1Rw4LQQsnH6yschHgK63LBvLpd1U1+7LM/OESlV/cSze5lFI3+f7JwKFEBEWNp1w==", crossorigin="anonymous", referrerpolicy="no-referrer") + script(type='text/javascript', src='https://cdn.datatables.net/v/bs5/dt-1.13.6/datatables.min.js') + script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/overlayscrollbars/2.3.2/browser/overlayscrollbars.browser.es6.min.js', integrity="sha512-jh4tHrf3Zaee6k2wOl1kVm4Gm5uIFbOQkUPfA419yLxADm1Q9jtihcGAJUl9ThBR8yc4/VYCOQCY/K87g14kSw==", crossorigin="anonymous", referrerpolicy="no-referrer") - var showPanels = false - var showNethashChart = false - var showDifficultyChart = false @@ -146,6 +146,7 @@ html(lang='en') var sideMarketVisible = false; var topMenuExpanded = false; var sideBarClasses = '!{sideBarClasses}'.replace(/,/g, " "); + const { OverlayScrollbars } = OverlayScrollbarsGlobal; /* Special thanks to the stackoverflow community for the getParameterByName function: https://stackoverflow.com/a/901144/3038650 */ function getParameterByName(name, url = window.location.href) { name = name.replace(/[\[\]]/g, '\\$&'); @@ -656,26 +657,26 @@ html(lang='en') }); function getNetworkPanel() { var hashRateType=''; - return '
#{settings.locale.network} '+getNetHashUnits()+'
'; + return '
#{settings.locale.network} '+getNetHashUnits()+'
'; } function getDifficultyPanel() { var difficultyType=''; - if ('#{settings.shared_pages.difficulty}' == 'Hybrid') difficultyType+='
'; - return '
#{settings.locale.difficulty}
'; + if ('#{settings.shared_pages.difficulty}' == 'Hybrid') difficultyType+='
'; + return '
#{settings.locale.difficulty}
'; } function getMasternodesPanel() { - return '
#{settings.locale.masternodecount}
'; + return '
#{settings.locale.masternodecount}
'; } function getCoinSupplyPanel() { var supplyType=''; - return `
#{settings.locale.ex_supply} (${"#{settings.coin.symbol}".replace(/"/g, '"')})
`; + return `
#{settings.locale.ex_supply} (${"#{settings.coin.symbol}".replace(/"/g, '"')})
`; } function getPricePanel() { var priceType=''; - return '
Price (#{settings.markets_page.default_exchange.trading_pair.split('/')[1]})
'; + return '
Price (#{settings.markets_page.default_exchange.trading_pair.split('/')[1]})
'; } function getMarketCapPanel() { - return '
Market Cap (#{settings.markets_page.default_exchange.trading_pair.split('/')[1]})
'; + return '
Market Cap (#{settings.markets_page.default_exchange.trading_pair.split('/')[1]})
'; } function getLogoPanel() { return `${`; @@ -796,8 +797,8 @@ html(lang='en') $('nav.side-nav').css('overflow', 'visible'); $('div#side-nav-bar').removeClass(sideBarClasses); - if ($('div#side-offcanvas > div.offcanvas-body div.os-content').length > 0) { - $('div#body-container > div#side-nav-bar').appendTo('div#side-offcanvas > div.offcanvas-body div.os-content'); + if ($('div#side-offcanvas > div.offcanvas-body > div[data-overlayscrollbars-viewport="scrollbarHidden"]').length > 0) { + $('div#body-container > div#side-nav-bar').appendTo('div#side-offcanvas > div.offcanvas-body > div[data-overlayscrollbars-viewport="scrollbarHidden"]'); hasScrollbar = true; } else $('div#body-container > div#side-nav-bar').appendTo('div#side-offcanvas > div.offcanvas-body'); @@ -811,7 +812,7 @@ html(lang='en') $('div#side-market-menu').removeClass('dropdown-menu dropdown-menu-dark').addClass('collapse'); if (!hasScrollbar) - $('div#side-offcanvas > div.offcanvas-body').overlayScrollbars({overflowBehavior: {x: 'hidden'}}); + OverlayScrollbars($('div#side-offcanvas > div.offcanvas-body')[0], {overflow: {x: 'hidden'}}); fixSidebarHeight(); } @@ -848,7 +849,7 @@ html(lang='en') $('div#side-nav-bar').toggleClass('activating'); $('div#side-nav-bar').toggleClass('show-menu'); var showMenu = $('div#side-nav-bar').hasClass('show-menu'); - $('div#side-header-toggle > span').toggleClass('fas far fa-window-close fa-bars').attr('data-bs-original-title', (showMenu ? 'Shrink Menu' : 'Expand Menu')).attr('alt', (showMenu ? 'Shrink Menu' : 'Expand Menu')); + $('div#side-header-toggle > span').toggleClass('fa-regular fa-solid fa-rectangle-xmark fa-bars').attr('data-bs-original-title', (showMenu ? 'Shrink Menu' : 'Expand Menu')).attr('alt', (showMenu ? 'Shrink Menu' : 'Expand Menu')); hideMarketDropdown(); if ($().tooltip) { @@ -980,7 +981,7 @@ html(lang='en') }); $('#navbar-collapse').on('shown.bs.collapse', function (e) { // initialize the scrollbar only after the navbar collapse has finished since it goes too slow if initialized before - $('#navbar-collapse').overlayScrollbars({}); + OverlayScrollbars($('#navbar-collapse')[0], {}); }); $('#navbar-collapse').on('hide.bs.collapse', function (e) { topMenuExpanded = false; @@ -1075,38 +1076,38 @@ html(lang='en') ul.navbar-nav(style='width:100%;') li#home.nav-item a.nav-link(href='/') - span.fas.fa-cubes + span.fa-solid.fa-cubes span.margin-left-5 #{settings.locale.menu_explorer} if settings.blockchain_specific.heavycoin.enabled == true && settings.blockchain_specific.heavycoin.reward_page.enabled == true li#reward.nav-item a.nav-link(href='/reward') - span.fa.fa-star + span.fa-solid.fa-star span.margin-left-5 #{settings.locale.menu_reward} if settings.masternodes_page.enabled == true li#masternodes.nav-item a.nav-link(href='/masternodes') - span.fa.fa-share-alt + span.fa-solid.fa-share-nodes span.margin-left-5 Masternodes if settings.movement_page.enabled == true li#movement.nav-item a.nav-link(href='/movement') - span.far.fa-money-bill-alt + span.fa-regular.fa-money-bill-1 span.margin-left-5 #{settings.locale.menu_movement} if settings.network_page.enabled == true li#network.nav-item a.nav-link(href='/network') - span.fas.fa-network-wired + span.fa-solid.fa-network-wired span.margin-left-5 #{settings.locale.menu_network} if settings.richlist_page.enabled == true li#richlist.nav-item a.nav-link(href='/richlist') - span.fab.fa-btc + span.fa-brands.fa-btc span.margin-left-5 #{settings.locale.menu_richlist} if settings.markets_page.enabled == true if settings.markets_page.show_market_dropdown_menu == true && settings.market_count > 1 li#markets.dropdown.nav-item a.nav-link.dropdown-toggle(data-bs-toggle='dropdown', href='#') - span.fas.fa-chart-line + span.fa-solid.fa-chart-line span.margin-left-5 #{settings.locale.menu_markets} div.navbar(class=dropdownClasses) each mkt in settings.market_data @@ -1117,40 +1118,40 @@ html(lang='en') if mkt.alt_logo != null && mkt.alt_logo != '' img.market-logo(src='data:image/png;base64,' + mkt.alt_logo, title=mkt.alt_name + ' (' + pair.pair + ')', alt=mkt.alt_name + ' (' + pair.pair + ')') else - i.market-logo.fas.fa-question-circle + i.market-logo.fa-solid.fa-circle-question span #{mkt.alt_name} span.small.fw-normal (#{pair.pair}) else if mkt.logo != null && mkt.logo != '' img.market-logo(src='data:image/png;base64,' + mkt.logo, title=mkt.name + ' (' + pair.pair + ')', alt=mkt.name + ' (' + pair.pair + ')') else - i.market-logo.fas.fa-question-circle + i.market-logo.fa-solid.fa-circle-question span #{mkt.name} span.small.fw-normal (#{pair.pair}) else li#markets.nav-item a.nav-link(href='/markets/' + settings.markets_page.default_exchange.exchange_name + '/' + settings.markets_page.default_exchange.trading_pair) - span.fas.fa-chart-line + span.fa-solid.fa-chart-line span.margin-left-5 #{settings.locale.menu_markets} if settings.api_page.enabled == true li#info.nav-item a.nav-link(href='/info') - span.fa.fa-info-circle + span.fa-solid.fa-circle-info span.margin-left-5 #{settings.locale.menu_api} if settings.claim_address_page.show_header_menu == true && settings.claim_address_page.enabled == true li#claim-address.nav-item a.nav-link(href='/claim') - span.far.fa-address-card + span.fa-regular.fa-address-card span.margin-left-5 #{settings.locale.menu_claim_address} if settings.orphans_page.enabled == true li#orphans.nav-item a.nav-link(href='/orphans') - span.far.fa-window-close + span.fa-regular.fa-rectangle-xmark span.margin-left-5 #{settings.locale.menu_orphans} if settings.shared_pages.page_header.search.enabled == true && settings.shared_pages.page_header.search.position.toString().toLowerCase() == 'inside-header' span#search-header-span(alt='Search', title='Search', data-bs-toggle='tooltip', data-bs-placement='left') button#search-header-button(data-bs-toggle='collapse', data-bs-target='#search-navbar-collapse') - span.fas.fa-search + span.fa-solid.fa-magnifying-glass if settings.shared_pages.page_header.search.enabled == true && settings.shared_pages.page_header.search.position.toString().toLowerCase() == 'inside-header' div#search-navbar-collapse.collapse div.navbar-nav.align-items-lg-center.search-box-custom(style='width:100%;') @@ -1170,11 +1171,11 @@ html(lang='en') a(href='/', alt=settings.coin.name + ' Home', title=settings.coin.name + ' Home', style='order:-1;', data-bs-toggle='tooltip', data-bs-placement='bottom') img.logo-main(src=(settings.shared_pages.page_header.home_link_logo == null || settings.shared_pages.page_header.home_link_logo == '' ? settings.shared_pages.logo : settings.shared_pages.page_header.home_link_logo), style='margin:0;max-height:' + settings.shared_pages.page_header.home_link_logo_height + 'px;') div#side-header-toggle.side-header-toggle - span.fas.fa-bars(alt='Expand Menu', title='Expand Menu', data-bs-toggle='tooltip', data-bs-placement='right') + span.fa-solid.fa-bars(alt='Expand Menu', title='Expand Menu', data-bs-toggle='tooltip', data-bs-placement='right') if settings.shared_pages.page_header.search.enabled == true && settings.shared_pages.page_header.search.position.toString().toLowerCase() == 'inside-header' span#search-header-span(alt='Search', title='Search', data-bs-toggle='tooltip', data-bs-placement='left') button#search-header-button(data-bs-toggle='collapse', data-bs-target='#search-navbar-collapse') - span.fas.fa-search + span.fa-solid.fa-magnifying-glass if settings.shared_pages.page_header.search.enabled == true && settings.shared_pages.page_header.search.position.toString().toLowerCase() == 'inside-header' div#search-navbar-collapse.collapse.flexGrow1 div.navbar-nav.align-items-lg-center.search-box-custom(style='width:100%;') @@ -1189,41 +1190,41 @@ html(lang='en') ul.navbar-nav li#sidebar-offcanvas-close.nav-item.text-end a.nav-link.d-inline(href='#', alt='Close Menu', title='Close Menu', data-bs-toggle='tooltip', data-bs-placement='right') - span.fa-2x.far.fa-window-close(type='button', data-bs-dismiss='offcanvas' aria-label='Close') + span.fa-2xl.fa-regular.fa-rectangle-xmark(type='button', data-bs-dismiss='offcanvas' aria-label='Close') li#home.nav-item(alt=settings.locale.menu_explorer, title=settings.locale.menu_explorer, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/') - span.nav-icon.fas.fa-cubes + span.nav-icon.fa-solid.fa-cubes span.margin-left-5 #{settings.locale.menu_explorer} if settings.blockchain_specific.heavycoin.enabled == true && settings.blockchain_specific.heavycoin.reward_page.enabled == true li#reward.nav-item(alt=settings.locale.menu_reward, title=settings.locale.menu_reward, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/reward') - span.nav-icon.fa.fa-star + span.nav-icon.fa-solid.fa-star span.margin-left-5 #{settings.locale.menu_reward} if settings.masternodes_page.enabled == true li#masternodes.nav-item(alt="Masternodes", title="Masternodes", data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/masternodes') - span.nav-icon.fa.fa-share-alt + span.nav-icon.fa-solid.fa-share-nodes span.margin-left-5 Masternodes if settings.movement_page.enabled == true li#movement.nav-item(alt=settings.locale.menu_movement, title=settings.locale.menu_movement, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/movement') - span.nav-icon.far.fa-money-bill-alt + span.nav-icon.fa-regular.fa-money-bill-1 span.margin-left-5 #{settings.locale.menu_movement} if settings.network_page.enabled == true li#network.nav-item(alt=settings.locale.menu_network, title=settings.locale.menu_network, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/network') - span.nav-icon.fas.fa-network-wired + span.nav-icon.fa-solid.fa-network-wired span.margin-left-5 #{settings.locale.menu_network} if settings.richlist_page.enabled == true li#richlist.nav-item(alt=settings.locale.menu_richlist, title=settings.locale.menu_richlist, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/richlist') - span.nav-icon.fab.fa-btc + span.nav-icon.fa-brands.fa-btc span.margin-left-5 #{settings.locale.menu_richlist} if settings.markets_page.enabled == true if settings.markets_page.show_market_dropdown_menu == true && settings.market_count > 1 li#markets.dropend.nav-item.side-market-menu(alt=settings.locale.menu_markets, title=settings.locale.menu_markets, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link.dropdown-toggle(href='#') - span.nav-icon.fas.fa-chart-line + span.nav-icon.fa-solid.fa-chart-line span.margin-left-5 #{settings.locale.menu_markets} div#side-market-menu.navbar(class=dropdownClasses) each mkt in settings.market_data @@ -1234,45 +1235,45 @@ html(lang='en') if mkt.alt_logo != null && mkt.alt_logo != '' img.market-logo(src='data:image/png;base64,' + mkt.alt_logo, title=mkt.alt_name + ' (' + pair.pair + ')', alt=mkt.alt_name + ' (' + pair.pair + ')') else - i.market-logo.fas.fa-question-circle + i.market-logo.fa-solid.fa-circle-question span #{mkt.alt_name} span.small.fw-normal (#{pair.pair}) else if mkt.logo != null && mkt.logo != '' img.market-logo(src='data:image/png;base64,' + mkt.logo, title=mkt.name + ' (' + pair.pair + ')', alt=mkt.name + ' (' + pair.pair + ')') else - i.market-logo.fas.fa-question-circle + i.market-logo.fa-solid.fa-circle-question span #{mkt.name} span.small.fw-normal (#{pair.pair}) else li#markets.nav-item(alt=settings.locale.menu_markets, title=settings.locale.menu_markets, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/markets/' + settings.markets_page.default_exchange.exchange_name + '/' + settings.markets_page.default_exchange.trading_pair) - span.nav-icon.fas.fa-chart-line + span.nav-icon.fa-solid.fa-chart-line span.margin-left-5 #{settings.locale.menu_markets} if settings.api_page.enabled == true li#info.nav-item(alt=settings.locale.menu_api, title=settings.locale.menu_api, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/info') - span.nav-icon.fa.fa-info-circle + span.nav-icon.fa-solid.fa-circle-info span.margin-left-5 #{settings.locale.menu_api} if settings.claim_address_page.show_header_menu == true && settings.claim_address_page.enabled == true li#claim-address.nav-item(alt=settings.locale.menu_claim_address, title=settings.locale.menu_claim_address, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/claim') - span.nav-icon.far.fa-address-card + span.nav-icon.fa-regular.fa-address-card span.margin-left-5 #{settings.locale.menu_claim_address} if settings.orphans_page.enabled == true li#orphans.nav-item(alt=settings.locale.menu_orphans, title=settings.locale.menu_orphans, data-bs-toggle='tooltip', data-bs-placement='right') a.nav-link(href='/orphans') - span.nav-icon.far.fa-window-close + span.nav-icon.fa-regular.fa-rectangle-xmark span.margin-left-5 #{settings.locale.menu_orphans} div#side-offcanvas.offcanvas.offcanvas-start(tabindex='-1') - div.offcanvas-body.d-block.navbar(class=sideBarClasses) + div.offcanvas-body.navbar(class=sideBarClasses) div#main-container(class=mainContainerClasses) div#main-child-container(class=mainContainerChildClasses) if showSync != null && showSync == true .col-lg-12 .alert.alert-warning .cardSpacer - span.fas.fa-exclamation-triangle(style='margin-right:5px;') + span.fa-solid.fa-triangle-exclamation(style='margin-right:5px;') strong #{settings.locale.ex_warning} div #{settings.locale.initial_index_alert} if showPanels == true || (settings.shared_pages.page_header.search.enabled == true && settings.shared_pages.page_header.search.position.toString().toLowerCase() == 'below-header') diff --git a/views/market.pug b/views/market.pug index 77b8ab8..2d4c221 100644 --- a/views/market.pug +++ b/views/market.pug @@ -139,14 +139,14 @@ block content if mkt.alt_logo != null && mkt.alt_logo != '' img.align-top.market-logo(src='data:image/png;base64,' + mkt.alt_logo, title=mkt.alt_name + ' (' + pair.pair + ')', alt=mkt.alt_name + ' (' + pair.pair + ')') else - i.market-logo.fas.fa-question-circle + i.market-logo.fa-solid.fa-circle-question span #{mkt.alt_name} span.small.fw-normal (#{pair.pair}) else if mkt.logo != null && mkt.logo != '' img.align-top.market-logo(src='data:image/png;base64,' + mkt.logo, title=mkt.name + ' (' + pair.pair + ')', alt=mkt.name + ' (' + pair.pair + ')') else - i.market-logo.fas.fa-question-circle + i.market-logo.fa-solid.fa-circle-question span #{mkt.name} span.small.fw-normal (#{pair.pair}) else @@ -156,14 +156,14 @@ block content if mkt.alt_logo != null && mkt.alt_logo != '' img.align-top.market-logo(src='data:image/png;base64,' + mkt.alt_logo, title=mkt.alt_name + ' (' + pair.pair + ')', alt=mkt.alt_name + ' (' + pair.pair + ')') else - i.market-logo.fas.fa-question-circle + i.market-logo.fa-solid.fa-circle-question span #{mkt.alt_name} span.small.fw-normal (#{pair.pair}) else if mkt.logo != null && mkt.logo != '' img.align-top.market-logo(src='data:image/png;base64,' + mkt.logo, title=mkt.name + ' (' + pair.pair + ')', alt=mkt.name + ' (' + pair.pair + ')') else - i.market-logo.fas.fa-question-circle + i.market-logo.fa-solid.fa-circle-question span #{mkt.name} span.small.fw-normal (#{pair.pair}) if marketdata.data != null && ((marketdata.data.buys != null && marketdata.data.buys.length > 0) || (marketdata.data.sells != null && marketdata.data.sells.length > 0) || (marketdata.data.history != null && marketdata.data.history.length > 0)) @@ -290,7 +290,7 @@ block content span.small.fw-normal (#{marketdata.coin}/#{marketdata.exchange}) strong - #{settings.locale.mkt_hours} if marketdata.data.chartdata == null || marketdata.data.chartdata == 'null' || marketdata.data.chartdata == '' || marketdata.data.chartdata == '[]' - span.fas.fa-chart-line.float-end.view-chart-disabled.market-toggle(style='cursor: pointer;color: var(--bs-body-color);', data-bs-toggle='tooltip', data-bs-placement='bottom', title=settings.locale.mkt_no_chart) + span.fa-solid.fa-chart-line.float-end.view-chart-disabled.market-toggle(style='cursor: pointer;color: var(--bs-body-color);', data-bs-toggle='tooltip', data-bs-placement='bottom', title=settings.locale.mkt_no_chart) table#market-summary.table.table-bordered.bottom-border-0.summary-table.single-row-table(style='border-top:0;margin-top:0 !important;') thead tr(class=theadClasses) @@ -536,6 +536,6 @@ block content .alert.alert-danger.alert-dismissible.fade.show(role='alert') button.btn-close(type='button', data-bs-dismiss='alert') .cardSpacer - span.fas.fa-exclamation-circle(style='margin-right:5px') + span.fa-solid.fa-circle-exclamation(style='margin-right:5px') strong #{marketdata.market_name} #{settings.locale.ex_error} div This market has no data to display. \ No newline at end of file diff --git a/views/masternodes.pug b/views/masternodes.pug index 5fd3b96..f0f3215 100644 --- a/views/masternodes.pug +++ b/views/masternodes.pug @@ -66,9 +66,9 @@ block content if (labels[addr] != null && labels[addr].enabled == true) { if (labels[addr].type) - json[i]['addr'] = '
' + json[i]['addr']; + json[i]['addr'] = '
' + json[i]['addr']; else - json[i]['addr'] = '
' + json[i]['addr']; + json[i]['addr'] = '
' + json[i]['addr']; } } diff --git a/views/movement.pug b/views/movement.pug index 86dcc87..85ccc9b 100644 --- a/views/movement.pug +++ b/views/movement.pug @@ -69,7 +69,7 @@ block content var amountStr = amountParts[0] + '.' + amountParts[1] + ''; var timestamp = data[5]; //variables for better readability var total = ""; - $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); + $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); $("td:eq(1)", row).html('' + txhash + '').addClass('breakWord d-none d-md-table-cell'); $("td:eq(2)", row).html(total).addClass('text-center'); $("td:eq(3)", row).html('' + format_unixtime(timestamp) + '').addClass('text-center'); diff --git a/views/network.pug b/views/network.pug index 45faf6c..c940af9 100644 --- a/views/network.pug +++ b/views/network.pug @@ -90,7 +90,7 @@ block content var flagBlock = ''; if (data['country_code'].length > 1) { - flagBlock = '
'; + flagBlock = ''; } $("td:eq(0)", row).html(data['address']).addClass('breakWord'); @@ -158,7 +158,7 @@ block content }, data: addNodeRows, rowCallback: function(row, data, index) { - $("td:eq(0)", row).css('white-space', 'nowrap').html(` ${data.nodes}`); + $("td:eq(0)", row).css('white-space', 'nowrap').html(` ${data.nodes}`); }, fnDrawCallback: function(settings) { fixDataTableColumns(); @@ -218,7 +218,7 @@ block content }, data: oneTryRows, rowCallback: function(row, data, index) { - $("td:eq(0)", row).css('white-space', 'nowrap').html(` ${data.nodes}`); + $("td:eq(0)", row).css('white-space', 'nowrap').html(` ${data.nodes}`); }, fnDrawCallback: function(settings) { fixDataTableColumns(); @@ -265,10 +265,10 @@ block content tmp.remove(); btn.tooltip({title: 'Copied!', placement: 'top', trigger: 'manual'}).tooltip('show'); - btn.html(''); + btn.html(''); setTimeout(function() { - btn.html(''); + btn.html(''); btn.tooltip('dispose'); }, 1500); } diff --git a/views/orphans.pug b/views/orphans.pug index 90e6eaf..79ea8f6 100644 --- a/views/orphans.pug +++ b/views/orphans.pug @@ -47,7 +47,7 @@ block content var good_blockhash = data[2]; var prev_blockhash = data[3]; var next_blockhash = data[4]; - $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); + $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); $("td:eq(1)", row).html('' + orphan_blockhash + '').addClass('breakWord d-none d-md-table-cell'); $("td:eq(2)", row).html('' + blockindex.toString() + '').addClass('text-center'); $("td:eq(3)", row).html('' + (blockindex - 1).toString() + '').addClass('text-center'); diff --git a/views/richlist.pug b/views/richlist.pug index 8be9fa3..12eabfd 100644 --- a/views/richlist.pug +++ b/views/richlist.pug @@ -109,7 +109,7 @@ block content thead tr(class=theadClasses) th.text-center - span.fa.fa-flag-checkered + span.fa-solid.fa-flag-checkered th #{settings.locale.tx_address} th.text-center #{settings.locale.rl_balance} span.small.fw-normal (#{settings.coin.symbol}) @@ -142,7 +142,7 @@ block content thead tr(class=theadClasses) th.text-center - span.fa.fa-flag-checkered + span.fa-solid.fa-flag-checkered th #{settings.locale.tx_address} th.text-center #{settings.locale.rl_received} span.small.fw-normal (#{settings.coin.symbol}) diff --git a/views/tx.pug b/views/tx.pug index 01bac56..2ddd896 100644 --- a/views/tx.pug +++ b/views/tx.pug @@ -22,7 +22,7 @@ block content .alert.alert-warning.alert-dismissible.fade.show(role='alert') button.btn-close(type='button', data-bs-dismiss='alert') .cardSpacer - span.fas.fa-exclamation-triangle(style='margin-right:5px') + span.fa-solid.fa-triangle-exclamation(style='margin-right:5px') strong=settings.locale.ex_warning div="This is an orphaned transaction" if settings.transaction_page.page_header.show_img == true || settings.transaction_page.page_header.show_title == true || settings.transaction_page.page_header.show_description == true @@ -45,7 +45,7 @@ block content strong=settings.locale.tx_hash + ': ' + tx.txid if settings.api_page.public_apis.rpc.getrawtransaction.enabled == true a.d-none.d-md-inline(href=`/api/getrawtransaction?txid=${tx.txid}&decrypt=1`, style='color: var(--bs-body-color);') - span.fa.fa-info-circle.float-end(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.view_raw_tx_data) + span.fa-solid.fa-circle-info.float-end(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.view_raw_tx_data) table#tx-table.table.table-bordered.table-striped.summary-table.mobile-border-right thead tr(class=theadClasses) @@ -60,7 +60,7 @@ block content tr td.text-center.d-table-cell.d-md-none a(href='/block/' + tx.blockhash) - span.fa.fa-eye(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.view_block) + span.fa-regular.fa-eye(data-bs-toggle='tooltip', data-bs-placement='top', title=settings.locale.view_block) td.d-none.d-md-table-cell a.breakWord(href='/block/' + tx.blockhash) #{tx.blockhash} if settings.transaction_page.show_op_return == true @@ -82,7 +82,7 @@ block content .card.card-default.border-0 .card-header strong #{settings.locale.tx_contributors} - span.fa.fa-arrow-right.float-end.d-none.d-md-block + span.fa-solid.fa-arrow-right.float-end.d-none.d-md-block table.table.table-bordered.table-striped.table-hover.summary-table.mobile-border-right thead tr(class=theadClasses)