Reworked the "Market Cap" top panel feature

-Added a new setting for "marketcappnl" which shows a "Market Cap" top panel box
-Removed "show_market_cap" and "show_market_cap_over_price" settings
This commit is contained in:
joeuhren
2020-12-27 17:26:01 -07:00
parent 581018dda2
commit 102bc3f75d
4 changed files with 33 additions and 25 deletions
+13 -5
View File
@@ -369,21 +369,29 @@ app.set('social_link_percent_height_tablet', settings.social_link_percent_height
app.set('social_link_percent_height_mobile', settings.social_link_percent_height_mobile);
// determine panel offset based on which panels are enabled
var paneltotal=5;
var panelcount=(settings.display.networkpnl > 0 ? 1 : 0)+(settings.display.difficultypnl > 0 ? 1 : 0)+(settings.display.masternodespnl > 0 ? 1 : 0)+(settings.display.coinsupplypnl > 0 ? 1 : 0)+(settings.display.pricepnl > 0 ? 1 : 0);
app.set('paneloffset', paneltotal+1-panelcount);
var paneltotal = 5;
var panelcount = (settings.display.networkpnl > 0 ? 1 : 0) +
(settings.display.difficultypnl > 0 ? 1 : 0) +
(settings.display.masternodespnl > 0 ? 1 : 0) +
(settings.display.coinsupplypnl > 0 ? 1 : 0) +
(settings.display.pricepnl > 0 ? 1 : 0) +
(settings.display.marketcappnl > 0 ? 1 : 0);
app.set('paneloffset', paneltotal + 1 - panelcount);
// determine panel order
var panelorder = new Array();
if (settings.display.networkpnl > 0) panelorder.push({name: 'networkpnl', val: settings.display.networkpnl});
if (settings.display.difficultypnl > 0) panelorder.push({name: 'difficultypnl', val: settings.display.difficultypnl});
if (settings.display.masternodespnl > 0) panelorder.push({name: 'masternodespnl', val: settings.display.masternodespnl});
if (settings.display.coinsupplypnl > 0) panelorder.push({name: 'coinsupplypnl', val: settings.display.coinsupplypnl});
if (settings.display.pricepnl > 0) panelorder.push({name: 'pricepnl', val: settings.display.pricepnl});
if (settings.display.marketcappnl > 0) panelorder.push({name: 'marketcappnl', val: settings.display.marketcappnl});
panelorder.sort(function(a,b) { return a.val - b.val; });
for (var i=1; i<6; i++) {
for (var i=1; i<6; i++)
app.set('panel'+i.toString(), ((panelorder.length >= i) ? panelorder[i-1].name : ''));
}
// Dynamically populate market data
var market_data = [];
+2 -3
View File
@@ -99,7 +99,8 @@ exports.display = {
"difficultypnl": 2,
"masternodespnl": 3,
"coinsupplypnl": 4,
"pricepnl": 5
"pricepnl": 5,
"marketcappnl": 0
};
//API view
@@ -136,8 +137,6 @@ exports.movement = {
//index
exports.index = {
"show_hashrate": false,
"show_market_cap": false,
"show_market_cap_over_price": false,
"difficulty": "POS",
"last_txs": 100,
"txs_per_page": 10
+6 -7
View File
@@ -92,7 +92,6 @@
"locale": "locale/en.json",
// menu and panel settings
// set a number to pnl variables to change the panel display order. lowest # = far left panel, highest # = far right panel, 0 = do not show panel
"display": {
"api": true,
"markets": true,
@@ -123,21 +122,21 @@
// table_header_bgcolor: change the background color of all table headers
// valid options: light, dark or leave blank ( "" ) for default colors
"table_header_bgcolor": "",
// A maximum of 5 top panels can be shown across the top of the page
// Determine which panels are shown and in what order by giving panels a number from 1-5
// Lowest # = far left panel, Highest # = far right panel
// Set disabled panels to a value of 0 to prevent them from being shown
"networkpnl": 1,
"difficultypnl": 2,
"masternodespnl": 3,
"coinsupplypnl": 4,
"pricepnl": 5
"pricepnl": 5,
"marketcappnl": 0
},
// index page (valid options for difficulty are POW, POS or Hybrid)
"index": {
"show_hashrate": true,
// Show Market Cap in header
"show_market_cap": false,
// Show Market Cap in place of price box
"show_market_cap_over_price": false,
"difficulty": "POS",
"last_txs": 100,
"txs_per_page": 10
+12 -10
View File
@@ -139,12 +139,13 @@ html(lang='en')
$("#lblX1").text(' ');
$("#supply").text(supplyString);
splitValue = Number(parseFloat(json.data[0].lastPrice).toFixed(8) * parseInt(parseFloat(json.data[0].supply).toFixed(0))).toLocaleString('en');
splitParts = splitValue.split('.');
$("#marketCap").html(splitParts[0] + '.<span class="decimal">' + splitParts[1] + '</span><span class="small" style="margin-right:0;">' + '#{settings.markets.exchange}'.toUpperCase() + '</span>');
showTopPanelData('supplypanel', 'supplyPanelLoading');
$("#marketCap").html(splitParts[0] + '.<span class="decimal">' + splitParts[1] + '</span>');
showTopPanelData('marketCapPanel', 'marketCapPanelLoading');
splitParts = diffString.split('.');
$("#difficulty").html(splitParts[0] + '.<span class="decimal">' + splitParts[1] + '</span>');
@@ -217,17 +218,15 @@ html(lang='en')
function getCoinSupplyPanel() {
var supplyType='<label id="supply"></label>';
if ('#{settings.index.difficulty}' == 'Hybrid') supplyType+='<br /><label id="lblX1"></label>';
if (#{settings.index.show_market_cap} == true && #{settings.index.show_market_cap_over_price} != true) supplyType+='<br /><span class="glyphicon fas fa-chart-line"></span><label>(</label><label id="marketCap">-</label><label>)</label>';
return '<div class="card-header"><strong>#{settings.locale.ex_supply} <span class="small">(#{settings.symbol})</span></strong></div><div class="card-body"><div id="supplyPanelLoading" class="header-panel"><i class="fa fa-spinner fa-pulse"></i></div><div id="supplypanel" class="header-panel" style="display:none;"><span class="glyphicon fa fa-chart-pie"></span>'+supplyType+'</div></div>';
}
function getPricePanel() {
if (#{settings.index.show_market_cap} == true && #{settings.index.show_market_cap_over_price} == true) {
return '<div class="card-header"><strong>Market Cap</strong></div><div class="card-body"><div id="pricePanelLoading" class="header-panel"><i class="fa fa-spinner fa-pulse"></i></div><div id="pricepanel" class="header-panel" style="display:none;"><span class="glyphicon fas fa-chart-line"></span><label id="marketCap"></label></div></div>';
} else {
var priceType='<label id="lastPrice">-</label>';
if ('#{settings.index.difficulty}' == 'Hybrid') priceType+='<br /><label id="lblX1"></label>';
return '<div class="card-header"><strong>Price <span class="small">(#{settings.markets.exchange})</span></strong></div><div class="card-body"><div id="pricePanelLoading" class="header-panel"><i class="fa fa-spinner fa-pulse"></i></div><div id="pricepanel" class="header-panel" style="display:none;"><span class="glyphicon fa fa-rocket"></span>'+priceType+'</div></div>';
}
var priceType='<label id="lastPrice">-</label>';
if ('#{settings.index.difficulty}' == 'Hybrid') priceType+='<br /><label id="lblX1"></label>';
return '<div class="card-header"><strong>Price <span class="small">(#{settings.markets.exchange})</span></strong></div><div class="card-body"><div id="pricePanelLoading" class="header-panel"><i class="fa fa-spinner fa-pulse"></i></div><div id="pricepanel" class="header-panel" style="display:none;"><span class="glyphicon fa fa-rocket"></span>'+priceType+'</div></div>';
}
function getMarketCapPanel() {
return '<div class="card-header"><strong>Market Cap <span class="small">(#{settings.markets.exchange})</span></strong></div><div class="card-body"><div id="marketCapPanelLoading" class="header-panel"><i class="fa fa-spinner fa-pulse"></i></div><div id="marketCapPanel" class="header-panel" style="display:none;"><span class="glyphicon fas fa-chart-line"></span><label id="marketCap"></label></div></div>';
}
function getActivePanel(nPanelName) {
var sReturn='';
@@ -247,6 +246,9 @@ html(lang='en')
case "pricepnl":
sReturn=getPricePanel();
break;
case "marketcappnl":
sReturn=getMarketCapPanel();
break;
}
return sReturn;
}