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

orderbook info button added to rows, bid/ask changed back to buy/sell in english translation

This commit is contained in:
satindergrewal 2018-02-07 16:47:06 +13:00
parent 45200f620a
commit ff47ebfaa3
6 changed files with 78 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/bin/osx/marketmaker
View File

Binary file not shown.

24
assets/languages/en_US.json
View File

@ -146,23 +146,23 @@
"exchange_trading_pair_coin_price_input_placeholder": "Price e.g. 0.01",
"exchange_trading_pair_coin_volume_input_placeholder": "Amount e.g. 12.5",
"exchange_speed_mode_settings": "Speed Mode Settings",
"exchange_btn_buy_caps": "BID",
"exchange_btn_sell_caps": "ASK",
"exchange_btn_buy_caps": "BUY",
"exchange_btn_sell_caps": "SELL",
"exchange_btn_trade_bot": "OFFER BOT",
"exchange_btn_manual_trade": "MANUAL OFFER",
"exchange_btn_portfolio": "PORTFOLIO",
"exchange_lbl_one_max": "Max",
"exchange_lbl_one_min": "Min",
"exchange_lbl_one_price_to": "Price to",
"exchange_lbl_buy_small": "Bid",
"exchange_lbl_sell_small": "Ask",
"exchange_lbl_buy_small": "Buy",
"exchange_lbl_sell_small": "Sell",
"exchange_trade_with_selected_trader": "Trade with selected trader only (optional)",
"exchange_coin_price_max": "Max",
"exchange_destpubkey_yes": " Yes",
"exchange_lbl_two_max": "Max",
"exchange_lbl_two_min": "Min",
"exchange_lbl_two_buy_small": "Bid",
"exchange_lbl_two_sell_small": "Ask",
"exchange_lbl_two_buy_small": "Buy",
"exchange_lbl_two_sell_small": "Sell",
"exchange_lbl_amount_to": "Amount to",
"exchange_dont_auto_repeat_order": "Do not auto-repeat order",
"exchange_enable_auto_repeat_this_trade": "Enable auto-repeat for this trade",
@ -185,8 +185,8 @@
"exchange_trade_status": "Trade Status",
"exchange_th_my_orders_base": "Base",
"exchange_th_my_orders_rel": "Rel",
"exchange_th_my_orders_bid": "Bid",
"exchange_th_my_orders_ask": "Ask",
"exchange_th_my_orders_bid": "Buy",
"exchange_th_my_orders_ask": "Sell",
"exchange_th_bot_list_tradebot_info": "TradeBot Info",
"exchange_th_bot_list_progress_info": "Progress Info",
"exchange_th_bot_list_actions": "Actions",
@ -284,10 +284,10 @@
"exchange_botstatus_td_result": "Result",
"exchange_botstatus_td_trade_attempts": "Trades Attempts",
"exchange_botstatus_dialog_change_this_auto_traders_settings": "Change Settings for this Auto Trade",
"exchange_botstatus_dialog_buyselltext_buy": "Bid",
"exchange_botstatus_dialog_buyselltext_sell": "Ask",
"exchange_botstatus_dialog_buyselltext_bought": "Bid",
"exchange_botstatus_dialog_buyselltext_sold": "Ask",
"exchange_botstatus_dialog_buyselltext_buy": "Buy",
"exchange_botstatus_dialog_buyselltext_sell": "Sell",
"exchange_botstatus_dialog_buyselltext_bought": "Buy",
"exchange_botstatus_dialog_buyselltext_sold": "Sell",
"exchange_botstatus_dialog_new": "New",
"exchange_botstatus_dialog_price_to": "Price to",
"exchange_botstatus_dialog_new_max_amount_to": "New Max Amount to",

9
gui/index.html
View File

@ -684,10 +684,10 @@
<th>Sum(<span class="orderbook_rel_coin"></span>)</th>-->
<th class="language" data-langstr="exchange_th_orderbook_avg_volume"></th>
<th class="language" data-langstr="exchange_th_orderbook_depth"></th>
<th class="language" data-langstr="exchange_th_orderbook_trader_addr">Address</th>
<th class="language" data-langstr="exchange_th_orderbook_age"></th>
<th class="language" data-langstr="exchange_th_orderbook_utxos"></th>
<th class="language" data-langstr="exchange_th_orderbook_zcredits"></th>
<th class="language" data-langstr="exchange_th_orderbook_info">Info</th>
</thead>
<tbody></tbody>
</table>
@ -717,10 +717,10 @@
<th>Max <span class="orderbook_rel_coin"></span></th>-->
<th class="language" data-langstr="exchange_th_orderbook_avg_volume"></th>
<th class="language" data-langstr="exchange_th_orderbook_depth"></th>
<th class="language" data-langstr="exchange_th_orderbook_trader_addr">Address</th>
<th class="language" data-langstr="exchange_th_orderbook_age"></th>
<th class="language" data-langstr="exchange_th_orderbook_utxos"></th>
<th class="language" data-langstr="exchange_th_orderbook_zcredits"></th>
<th class="language" data-langstr="exchange_th_orderbook_info">Info</th>
</thead>
<tbody></tbody>
</table>
@ -750,10 +750,10 @@
<th>Sum(<span class="orderbook_rel_coin"></span>)</th>-->
<th class="language" data-langstr="exchange_th_orderbook_avg_volume"></th>
<th class="language" data-langstr="exchange_th_orderbook_depth"></th>
<th class="language" data-langstr="exchange_th_orderbook_trader_addr">Address</th>
<th class="language" data-langstr="exchange_th_orderbook_age"></th>
<th class="language" data-langstr="exchange_th_orderbook_utxos"></th>
<th class="language" data-langstr="exchange_th_orderbook_zcredits"></th>
<th class="language" data-langstr="exchange_th_orderbook_info">Info</th>
</thead>
<tbody></tbody>
</table>
@ -772,10 +772,10 @@
<th>Max <span class="orderbook_rel_coin"></span></th>-->
<th class="language" data-langstr="exchange_th_orderbook_avg_volume"></th>
<th class="language" data-langstr="exchange_th_orderbook_depth"></th>
<th class="language" data-langstr="exchange_th_orderbook_trader_addr">Address</th>
<th class="language" data-langstr="exchange_th_orderbook_age"></th>
<th class="language" data-langstr="exchange_th_orderbook_utxos"></th>
<th class="language" data-langstr="exchange_th_orderbook_zcredits"></th>
<th class="language" data-langstr="exchange_th_orderbook_info">Info</th>
</thead>
<tbody></tbody>
</table>
@ -859,6 +859,7 @@
<script src="js/jquery.mCustomScrollbar.concat.min.js" type="text/javascript"></script>
<script src="js/jquery.marquee.min.js" type="text/javascript"></script>
<script src="js/HoldOn.min.js" type="text/javascript"></script>
<script src="js/BootstrapMenu.min.js" type="text/javascript"></script>
<!-- Crypto Dependencies -->
<script src="js/wordlist.js" type="text/javascript"></script>
<script src="js/passphrasegenerator.js" type="text/javascript"></script>

16
gui/js/BootstrapMenu.min.js vendored Executable file
View File

File diff suppressed because one or more lines are too long

2
gui/js/charts/Toolbar_html.js
View File

@ -421,7 +421,7 @@ var Toolbar_html = `
<div class="scxToolbar-btn scxToolbarSaveImage" title="Save as Image..."></div>
<div class="scxToolbarViewMode scxToolbarButton scxToolbarButtonWithDropdown scxToolbarCanFireFromHead" data-type="scxToolbarViewMode" title="View Mode">
<div class="scxToolbarViewMode scxToolbarButton scxToolbarButtonWithDropdown scxToolbarCanFireFromHead" data-type="scxToolbarViewMode" title="View Mode" style="display: none;">
<div class="scxToolbarButton-buttonWrapper">
<div class="scxToolbarButton-activateBtn" data-scxValue="toggleFullWindow"></div>
<button class="scxToolbarButton-toggleDropdownBtn"></button>

64
gui/js/simpledexactions.js
View File

@ -3094,6 +3094,24 @@ function setOrderPrice(trade_data) {
}
function infoOrderPrice(trade_data) {
console.log(trade_data);
bootbox.dialog({
//title: 'A custom dialog with init',
onEscape: true,
backdrop: true,
message: `<table class="table table-striped orderbook_row_data" width="100%" style="margin-bottom: 0;">
<tbody>
<tr>
<td>Address</td>
<td>${trade_data.address}</td>
</tr>
</tbody>
</table>`
});
}
function CheckOrderBookFn(sig) {
if (sig == false) {
clearInterval(CheckOrderbook_Interval);
@ -3176,20 +3194,23 @@ function CheckOrderBookFn(sig) {
row_trade_data.depth = val.depth;
row_trade_data.maxbuy = val.avevolume / val.price;
row_trade_data.pubkey = val.pubkey;
row_trade_data.address = val.address;
row_trade_data.type = 'bids';
//row_trade_data.totalbuy = (val.avevolume / val.price) * val.numutxos;
var orderbook_bids_tr = '';
orderbook_bids_tr += '<tr ' + mytrade_true + ' onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>';
orderbook_bids_tr += '<td>' + val.price + '</td>';
//orderbook_bids_tr += '<td>' + val.minvolume + '</td>';
//orderbook_bids_tr += '<td>' + val.maxvolume + '</td>';
orderbook_bids_tr += '<td>' + ((val.avevolume == 0) ? '-' : val.avevolume) + '</td>';
orderbook_bids_tr += '<td>' + val.depth + '</td>';
orderbook_bids_tr += '<td>' + coloraddr.firstpart + '<font style="color: #' + coloraddr.colorpart1 + '; background-color: #' + coloraddr.colorpart1 + ';">' + coloraddr.char1 + '</font><font style="color: #' + coloraddr.colorpart2 + '; background-color: #' + coloraddr.colorpart2 + ';">' + coloraddr.char2 + '</font><font style="color: #' + coloraddr.colorpart3 + '; background-color: #' + coloraddr.colorpart3 + ';">' + coloraddr.char3 + '</font>' + coloraddr.lastpart + '</td>';
orderbook_bids_tr += '<td>' + val.age + '</td>';
orderbook_bids_tr += '<td>' + val.numutxos + '</td>';
orderbook_bids_tr += '<td><span class="glyphicon glyphicon-piggy-bank" aria-hidden="true"></span> ' + val.zcredits.toFixed(2) + '</td>';
orderbook_bids_tr += '<tr ' + mytrade_true + '>';
orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.price + '</td>';
//orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.minvolume + '</td>';
//orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.maxvolume + '</td>';
orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + ((val.avevolume == 0) ? '-' : val.avevolume) + '</td>';
orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.depth + '</td>';
//orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + coloraddr.firstpart + '<font style="color: #' + coloraddr.colorpart1 + '; background-color: #' + coloraddr.colorpart1 + ';">' + coloraddr.char1 + '</font><font style="color: #' + coloraddr.colorpart2 + '; background-color: #' + coloraddr.colorpart2 + ';">' + coloraddr.char2 + '</font><font style="color: #' + coloraddr.colorpart3 + '; background-color: #' + coloraddr.colorpart3 + ';">' + coloraddr.char3 + '</font>' + coloraddr.lastpart + '</td>';
orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.age + '</td>';
orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.numutxos + '</td>';
orderbook_bids_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')><span class="glyphicon glyphicon-piggy-bank" aria-hidden="true"></span> ' + val.zcredits.toFixed(2) + '</td>';
orderbook_bids_tr += '<td><button class="btn btn-xs" onclick=infoOrderPrice(' + JSON.stringify(row_trade_data) + ')><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></button></td>';
orderbook_bids_tr += '</tr>';
$('.orderbook_bids tbody').append(orderbook_bids_tr);
})
@ -3218,19 +3239,21 @@ function CheckOrderBookFn(sig) {
row_trade_data.depth = val.depth;
row_trade_data.maxbuy = val.avevolume / val.price;
row_trade_data.pubkey = val.pubkey;
row_trade_data.address = val.address;
row_trade_data.type = 'asks';
//row_trade_data.totalbuy = (val.avevolume / val.price) * val.numutxos;
var orderbook_asks_tr = '';
orderbook_asks_tr += '<tr ' + mytrade_true + ' onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>';
orderbook_asks_tr += '<td>' + val.price + '</td>';
//orderbook_asks_tr += '<td>' + val.minvolume + ' - ' + val.maxvolume + '</td>';
//orderbook_asks_tr += '<td>' + row_trade_data.totalbuy.toFixed(8) + '</td>';
orderbook_asks_tr += '<td>' + ((val.avevolume == 0) ? '-' : val.avevolume) + '</td>';
orderbook_asks_tr += '<td>' + val.depth + '</td>';
orderbook_asks_tr += '<td>' + coloraddr.firstpart + '<font style="color: #' + coloraddr.colorpart1 + '; background-color: #' + coloraddr.colorpart1 + ';">' + coloraddr.char1 + '</font><font style="color: #' + coloraddr.colorpart2 + '; background-color: #' + coloraddr.colorpart2 + ';">' + coloraddr.char2 + '</font><font style="color: #' + coloraddr.colorpart3 + '; background-color: #' + coloraddr.colorpart3 + ';">' + coloraddr.char3 + '</font>' + coloraddr.lastpart + '</td>';
orderbook_asks_tr += '<td>' + val.age + '</td>';
orderbook_asks_tr += '<td>' + val.numutxos + '</td>';
orderbook_asks_tr += '<td><span class="glyphicon glyphicon-piggy-bank" aria-hidden="true"></span> ' + val.zcredits.toFixed(2) + '</td>';
orderbook_asks_tr += '<tr ' + mytrade_true + '>';
orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.price + '</td>';
//orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.minvolume + ' - ' + val.maxvolume + '</td>';
//orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + row_trade_data.totalbuy.toFixed(8) + '</td>';
orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + ((val.avevolume == 0) ? '-' : val.avevolume) + '</td>';
orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.depth + '</td>';
//orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + coloraddr.firstpart + '<font style="color: #' + coloraddr.colorpart1 + '; background-color: #' + coloraddr.colorpart1 + ';">' + coloraddr.char1 + '</font><font style="color: #' + coloraddr.colorpart2 + '; background-color: #' + coloraddr.colorpart2 + ';">' + coloraddr.char2 + '</font><font style="color: #' + coloraddr.colorpart3 + '; background-color: #' + coloraddr.colorpart3 + ';">' + coloraddr.char3 + '</font>' + coloraddr.lastpart + '</td>';
orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.age + '</td>';
orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')>' + val.numutxos + '</td>';
orderbook_asks_tr += '<td onclick=setOrderPrice(' + JSON.stringify(row_trade_data) + ')><span class="glyphicon glyphicon-piggy-bank" aria-hidden="true"></span> ' + val.zcredits.toFixed(2) + '</td>';
orderbook_asks_tr += '<td><button class="btn btn-xs" onclick=infoOrderPrice(' + JSON.stringify(row_trade_data) + ')><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></button></td>';
orderbook_asks_tr += '</tr>';
$('.orderbook_asks tbody').append(orderbook_asks_tr);
})
@ -5984,6 +6007,7 @@ function ZeroConfDeposit(deposit_weeks, deposit_amount) {
var mypubkey = sessionStorage.getItem('mm_mypubkey');
var ajax_data = {"userpass":userpass,"method":"instantdex_deposit","weeks":deposit_weeks,"amount":deposit_amount,"broadcast": 1};
var url = "http://127.0.0.1:7783";
console.log(ajax_data);
$.ajax({
async: true,