From 2fcc3ad7e7d3e564840e8308a0d916c241cc96c3 Mon Sep 17 00:00:00 2001 From: satindergrewal Date: Sun, 10 Dec 2017 02:56:10 +1300 Subject: [PATCH] resize orderbook list height, charts pair inverted --- gui/css/custom.css | 6 +++--- gui/index.html | 16 ++++++++-------- gui/js/barterdexcharts.js | 4 ++-- gui/js/simpledexactions.js | 35 +++++++++++++++++++++++++++++------ 4 files changed, 42 insertions(+), 19 deletions(-) diff --git a/gui/css/custom.css b/gui/css/custom.css index 7ec4e8b..b29adf9 100644 --- a/gui/css/custom.css +++ b/gui/css/custom.css @@ -133,17 +133,17 @@ textarea { .exchange_trade_status_body { overflow: hidden; - height: 285px; + min-height: 285px; } #exchange_coin_asks, #exchange_coin_bids { overflow: hidden; - height: 431px; + min-height: 521px; } #exchange_coin_asks_togl, #exchange_coin_bids_togl { overflow: hidden; - max-height: 431px; + min-height: 521px; } .zeroconf_settings_table_div { diff --git a/gui/index.html b/gui/index.html index 9aa66cc..94a73b2 100644 --- a/gui/index.html +++ b/gui/index.html @@ -374,8 +374,8 @@
-
-
+
+

Your Balance

@@ -403,8 +403,8 @@
-
-
+
+
  • Trading Pair
    • @@ -536,8 +536,8 @@ -
    -
    +
    +
    @@ -582,8 +582,8 @@
    -
    - +
    +
    diff --git a/gui/js/barterdexcharts.js b/gui/js/barterdexcharts.js index 407075c..85a5266 100644 --- a/gui/js/barterdexcharts.js +++ b/gui/js/barterdexcharts.js @@ -188,7 +188,7 @@ function UpdateDexChart(chartbase, chartrel) { } } - gChart.showWaitingBar(); + //gChart.showWaitingBar(); clearChartData(); gChart.update(); @@ -219,7 +219,7 @@ function UpdateDexChart(chartbase, chartrel) { function parseBars(data, isIntraday) { var dataSeries = gChart.barDataSeries(); //data.reverse(); - + gChart.showWaitingBar(); $.each(data, function(index,value) { //console.log(index); //console.log(value); diff --git a/gui/js/simpledexactions.js b/gui/js/simpledexactions.js index ee662f8..37b7974 100644 --- a/gui/js/simpledexactions.js +++ b/gui/js/simpledexactions.js @@ -10,7 +10,18 @@ var bot_screen_coin_balance_Interval = null; var bot_screen_sellcoin_balance_Interval = null; var shell = require('electron').shell; +$(window).resize(function() { + $('.loginbody').css('height',$(window).height()); + $('#exchange_coin_asks_togl').css('max-height',$('.col1').height() + $('.col2').height() + $('.col3').height() - 470); + $('#exchange_coin_bids_togl').css('max-height',$('.col1').height() + $('.col2').height() + $('.col3').height() - 470); + $('#exchange_coin_asks').css('max-height',$('.col1').height() + $('.col2').height() + $('.col3').height() - 470); + $('#exchange_coin_bids').css('max-height',$('.col1').height() + $('.col2').height() + $('.col3').height() - 470); + $('.exchange_trade_status_body').css('height',$(window).height() - ($('.col1').height() + $('.col2').height() + 135)) + console.log($(window).height()); +}) + $(document).ready(function() { + $('.loginbody').css('height',$(window).height()) var mmstatus = ShepherdIPC({"command":"mmstatus"}); if (mmstatus !== 'closed') { var mypubkey = sessionStorage.getItem('mm_mypubkey'); @@ -162,6 +173,18 @@ $('.porfolio_coins_list tbody').on('click', '.btn-portfoliogo', function() { console.log($(this).data()); console.log($(this).data('coin')); $('.screen-portfolio').hide(); + setTimeout(function(){ + if ($(window).height() - ($('.col1').height() + $('.col2').height() + 135) <= 285) { + var trade_status_body_height = '285px'; + } else { + var trade_status_body_height = $(window).height() - ($('.col1').height() + $('.col2').height() + 135); + } + $('.exchange_trade_status_body').css('height',trade_status_body_height); + $('#exchange_coin_asks_togl').css('max-height',$('.col1').height() + $('.col2').height() + $('.col3').height() - 470); + $('#exchange_coin_bids_togl').css('max-height',$('.col1').height() + $('.col2').height() + $('.col3').height() - 470); + $('#exchange_coin_asks').css('max-height',$('.col1').height() + $('.col2').height() + $('.col3').height() - 470); + $('#exchange_coin_bids').css('max-height',$('.col1').height() + $('.col2').height() + $('.col3').height() - 470); + }, 10); $('#trading_mode_options_trademanual').trigger('click'); $('#trading_mode_options_tradebot').removeAttr("checked"); $('#trading_mode_options_trademanual').attr('checked','checked'); @@ -234,15 +257,15 @@ $('.porfolio_coins_list tbody').on('click', '.btn-portfoliogo', function() { var charts_instruments_data = {} if ($(this).data('coin') == 'KMD') { - charts_instruments_data.symbol = $(this).data('coin')+'/BTC' + charts_instruments_data.symbol = 'BTC/'+$(this).data('coin') charts_instruments_data.company = 'Komodo Platform'; ChartsInstruments(charts_instruments_data) - UpdateDexChart($(this).data('coin'), 'BTC'); + UpdateDexChart('BTC',$(this).data('coin')); } else { - charts_instruments_data.symbol = $(this).data('coin')+'/KMD' + charts_instruments_data.symbol = 'KMD/'+$(this).data('coin') charts_instruments_data.company = 'Komodo Platform'; ChartsInstruments(charts_instruments_data) - UpdateDexChart($(this).data('coin'), 'KMD'); + UpdateDexChart('KMD',$(this).data('coin')); } Refresh_active_StockChart_Interval = setInterval(Refresh_active_StockChart, 60000); @@ -2950,7 +2973,7 @@ $('.trading_pair_coin').on('change', function (e) { charts_instruments_data.symbol = $('.trading_pair_coin').selectpicker('val')+'/'+$('.trading_pair_coin2').selectpicker('val'); charts_instruments_data.company = 'Komodo Platform'; ChartsInstruments(charts_instruments_data) - UpdateDexChart($('.trading_pair_coin').selectpicker('val'), $('.trading_pair_coin2').selectpicker('val')); + UpdateDexChart($('.trading_pair_coin2').selectpicker('val'),$('.trading_pair_coin').selectpicker('val')); }); @@ -2984,7 +3007,7 @@ $('.trading_pair_coin2').on('change', function (e) { charts_instruments_data.symbol = $('.trading_pair_coin').selectpicker('val')+'/'+$('.trading_pair_coin2').selectpicker('val'); charts_instruments_data.company = 'Komodo Platform'; ChartsInstruments(charts_instruments_data) - UpdateDexChart($('.trading_pair_coin').selectpicker('val'), $('.trading_pair_coin2').selectpicker('val')); + UpdateDexChart($('.trading_pair_coin2').selectpicker('val'),$('.trading_pair_coin').selectpicker('val')); });
    Status Quote ID