diff --git a/assets/bin/osx/marketmaker b/assets/bin/osx/marketmaker index 52b75d4..acd411b 100755 Binary files a/assets/bin/osx/marketmaker and b/assets/bin/osx/marketmaker differ diff --git a/gui/.DS_Store b/gui/.DS_Store deleted file mode 100644 index e9610a3..0000000 Binary files a/gui/.DS_Store and /dev/null differ diff --git a/gui/css/bootstrap-toggle.min.css b/gui/css/bootstrap-toggle.min.css new file mode 100755 index 0000000..0d42ed0 --- /dev/null +++ b/gui/css/bootstrap-toggle.min.css @@ -0,0 +1,28 @@ +/*! ======================================================================== + * Bootstrap Toggle: bootstrap-toggle.css v2.2.0 + * http://www.bootstraptoggle.com + * ======================================================================== + * Copyright 2014 Min Hur, The New York Times Company + * Licensed under MIT + * ======================================================================== */ +.checkbox label .toggle,.checkbox-inline .toggle{margin-left:-20px;margin-right:5px} +.toggle{position:relative;overflow:hidden} +.toggle input[type=checkbox]{display:none} +.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none} +.toggle.off .toggle-group{left:-100%} +.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0} +.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0} +.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px} +.toggle.btn{min-width:59px;min-height:34px} +.toggle-on.btn{padding-right:24px} +.toggle-off.btn{padding-left:24px} +.toggle.btn-lg{min-width:79px;min-height:45px} +.toggle-on.btn-lg{padding-right:31px} +.toggle-off.btn-lg{padding-left:31px} +.toggle-handle.btn-lg{width:40px} +.toggle.btn-sm{min-width:50px;min-height:30px} +.toggle-on.btn-sm{padding-right:20px} +.toggle-off.btn-sm{padding-left:20px} +.toggle.btn-xs{min-width:35px;min-height:22px} +.toggle-on.btn-xs{padding-right:12px} +.toggle-off.btn-xs{padding-left:12px} \ No newline at end of file diff --git a/gui/img/.DS_Store b/gui/img/.DS_Store deleted file mode 100644 index 2890fc0..0000000 Binary files a/gui/img/.DS_Store and /dev/null differ diff --git a/gui/img/cryptologo/hodl.png b/gui/img/cryptologo/hodl.png new file mode 100644 index 0000000..7289d2e Binary files /dev/null and b/gui/img/cryptologo/hodl.png differ diff --git a/gui/index.html b/gui/index.html index b7bbbe3..6d2fb89 100644 --- a/gui/index.html +++ b/gui/index.html @@ -14,6 +14,7 @@ + @@ -478,7 +479,7 @@
- + @@ -575,6 +576,7 @@ + diff --git a/gui/js/bootstrap-toggle.min.js b/gui/js/bootstrap-toggle.min.js new file mode 100755 index 0000000..3711320 --- /dev/null +++ b/gui/js/bootstrap-toggle.min.js @@ -0,0 +1,9 @@ +/*! ======================================================================== + * Bootstrap Toggle: bootstrap-toggle.js v2.2.0 + * http://www.bootstraptoggle.com + * ======================================================================== + * Copyright 2014 Min Hur, The New York Times Company + * Licensed under MIT + * ======================================================================== */ ++function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-lg":"small"===this.options.size?"btn-sm":"mini"===this.options.size?"btn-xs":"",c=a(''; dex_balances_tbl_tr += ''; dex_balances_tbl_tr += ''; + dex_balances_tbl_tr += ''; dex_balances_tbl_tr += ''; dex_balances_tbl_tr += ''; @@ -816,6 +841,8 @@ function get_coins_list(data) { } $('.selectpicker').selectpicker('refresh');*/ + $('.toggle_checkbox[data-coin="BTC"]').removeAttr('disabled'); + $('.toggle_checkbox').bootstrapToggle(); }) };
CoinDeposit AddressStatustxfeeActions
CoinDeposit AddressStatustxfeeElectrumActions
' + val.smartaddress + '' + val.status + '' + (parseFloat(val.txfee)/100000000).toFixed(8) + '
' + (( val.status == 'active' ) ? '' : '') + '