Browse Source

Merge pull request #83 from pbca26/master

minor gui fixes and updates
master
pbca26 8 years ago
committed by GitHub
parent
commit
ff6c4cbcd1
  1. 0
      assets/images/cryptologo/WIRELESS.png
  2. 1
      assets/scripts/dashboard/DashboardEDEX.js
  3. 23
      assets/scripts/kmd_wallet_dashboard.js
  4. 2
      assets/scripts/sidebar.js

0
assets/images/cryptologo/wireless.png → assets/images/cryptologo/WIRELESS.png

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

1
assets/scripts/dashboard/DashboardEDEX.js

@ -719,6 +719,7 @@ function EdexListAllAddr(coin) {
function edexCoinBtnAction() { function edexCoinBtnAction() {
$('.edexcoin-logo').click(function() { $('.edexcoin-logo').click(function() {
$.each($('.nav-top-menu'), function(index, value) { $(value).removeClass('active'); });
$( '#edexcoin_send_coins_back_btn' ).trigger( 'click' ); $( '#edexcoin_send_coins_back_btn' ).trigger( 'click' );
$('#btn_edexcoin_dashboard').hide(); $('#btn_edexcoin_dashboard').hide();
$( $(

23
assets/scripts/kmd_wallet_dashboard.js

@ -241,13 +241,22 @@ function KMD_ProgressBar() {
if ( getinfotmp == 'activating') { if ( getinfotmp == 'activating') {
$('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(_lang[defaultLang].INDEX.ACTIVATING + '...'); $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(_lang[defaultLang].INDEX.ACTIVATING + '...');
} else { } else {
var sync_percent = parseFloat(parseInt(getinfotmp.blocks, 10) * 100) / parseInt(getinfotmp.longestchain, 10); if (getinfotmp.blocks === 0) {
//console.log(sync_percent); $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No blocks');
$('div[data-extcoin="' + extcoin + '"][id="extcoin-sync"]').width(parseFloat(sync_percent).toFixed(2) + '%'); $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' });
$('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(parseFloat(sync_percent).toFixed(2) + '%'); } else if (getinfotmp.blocks > 0 && getinfotmp.longestchain === 0) {
$('span[data-extcoin="' + extcoin + '"][id="extcoin-synced-blocks"]').text(getinfotmp.blocks); $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No longestchain');
$('span[data-extcoin="' + extcoin + '"][id="extcoin-longestchain"]').text(getinfotmp.longestchain); $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' });
$('span[data-extcoin="' + extcoin + '"][id="extcoin-connections"]').text(getinfotmp.connections); } else {
var sync_percent = parseFloat(parseInt(getinfotmp.blocks, 10) * 100) / parseInt(getinfotmp.longestchain, 10);
//console.log(sync_percent);
console.log('getinfotmp', getinfotmp);
$('div[data-extcoin="' + extcoin + '"][id="extcoin-sync"]').width(parseFloat(sync_percent).toFixed(2) + '%');
$('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(parseFloat(sync_percent).toFixed(2) + '%');
$('span[data-extcoin="' + extcoin + '"][id="extcoin-synced-blocks"]').text(getinfotmp.blocks);
$('span[data-extcoin="' + extcoin + '"][id="extcoin-longestchain"]').text(getinfotmp.longestchain);
$('span[data-extcoin="' + extcoin + '"][id="extcoin-connections"]').text(getinfotmp.connections);
}
$('#extcoin-wallet-activating-alert').hide(); $('#extcoin-wallet-activating-alert').hide();
} }
} }

2
assets/scripts/sidebar.js

@ -474,7 +474,7 @@ function assetchain_pax_menu_actions(coin) {
renderAssetGFX('supernet', 'jumblr', coin); renderAssetGFX('supernet', 'jumblr', coin);
break; break;
case 'MVP': case 'MVP':
renderAssetGFX('mpv', 'mpv', coin); renderAssetGFX('mvp', 'mvp', coin);
break; break;
case 'KV': case 'KV':
renderAssetGFX('supernet', 'jumblr', coin); renderAssetGFX('supernet', 'jumblr', coin);

Loading…
Cancel
Save