BTCPrivate
/
BarterDEX
mirror of https://github.com/BTCPrivate/BarterDEX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

resize orderbook list height, charts pair inverted

This commit is contained in:
satindergrewal 2017-12-10 02:56:10 +13:00
parent 1c49cda6ad
commit 2fcc3ad7e7
4 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/css/custom.css
View File

@ -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 {

16
gui/index.html
View File

@ -374,8 +374,8 @@
<div class="col-md-5 col-lg-4" style="padding: 2px;">
<div class="row">
<div class="col-sm-12">
<div class="panel panel-default">
<div class="col-sm-12 col1">
<div class="panel panel-default" style="margin-bottom: 5px;">
<div class="panel-heading">
<h3 class="panel-title"><strong>Your Balance</strong></h3>
<!--<button class="btn btn-xs btn-info btn-activatecoins portfolio" style="float: right; margin: -20px -8px;">ADD COINS <span class="glyphicon glyphicon-plus" aria-hidden="true"></span></button>-->
@ -403,8 +403,8 @@
</div>
<div class="col-sm-12">
<div class="panel with-nav-tabs panel-default">
<div class="col-sm-12 col2">
<div class="panel with-nav-tabs panel-default" style="margin-bottom: 5px;">
<div class="panel-heading">
<ul class="nav nav-tabs">
<li class="active"><a href="#exchange_trading_pair" data-toggle="tab">Trading Pair <button class="btn btn-xs btn-refreshtrading_pair coinexchange" data-coin="COIN"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></button></a></li>
@ -536,8 +536,8 @@
<div class="col-sm-12">
<div class="panel with-nav-tabs panel-default">
<div class="col-sm-12 col3">
<div class="panel with-nav-tabs panel-default" style="margin-bottom: 5px;">
<div class="panel-heading">
<!--<button class="btn btn-xs btn-exchangeclose coinexchange" data-coin="COIN" style="float: right; margin: 6px 6px 0px 3px;">BACK</button>
<button class="btn btn-xs btn-exchangerefresh coinexchange" data-coin="COIN" style="float: right; margin: 6px 6px 0px 3px;"><span class="glyphicon glyphicon-refresh"></span></button>-->
@ -582,8 +582,8 @@
</div>
<div class="tab-pane fade in active" id="exchange_tradestatus">
<div class="exchange_trade_status_body">
<table class="table table-striped exchange_swap_status_tbl fixed_headers" width="100%" style="margin-bottom: 0;">
<div class="exchange_trade_status_body mCustomScrollbar" data-mcs-theme="minimal-dark">
<table class="table table-striped exchange_swap_status_tbl" width="100%" style="margin-bottom: 0;">
<thead>
<th>Status</th>
<th>Quote ID</th>

4
gui/js/barterdexcharts.js
View File

@ -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);

35
gui/js/simpledexactions.js
View File

@ -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'));
});