diff --git a/public/site_assets/bootstrap/css/bootstrap.css b/public/site_assets/bootstrap/css/bootstrap.css old mode 100755 new mode 100644 diff --git a/public/site_assets/bootstrap/css/bootstrap.min.css b/public/site_assets/bootstrap/css/bootstrap.min.css old mode 100755 new mode 100644 diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css old mode 100755 new mode 100644 diff --git a/public/site_assets/bootstrap/css/sparklines.css b/public/site_assets/bootstrap/css/sparklines.css old mode 100755 new mode 100644 diff --git a/public/site_assets/bootstrap/js/jquery.cookie.js b/public/site_assets/bootstrap/js/jquery.cookie.js old mode 100755 new mode 100644 diff --git a/public/site_assets/bootstrap/js/mpos.js b/public/site_assets/bootstrap/js/mpos.js old mode 100755 new mode 100644 diff --git a/public/site_assets/bootstrap/js/plugins/sparkline/jquery.sparkline.min.js b/public/site_assets/bootstrap/js/plugins/sparkline/jquery.sparkline.min.js old mode 100755 new mode 100644 diff --git a/public/templates/bootstrap/account/edit/cashout.tpl b/public/templates/bootstrap/account/edit/cashout.tpl index e843b2ef..3f2395de 100644 --- a/public/templates/bootstrap/account/edit/cashout.tpl +++ b/public/templates/bootstrap/account/edit/cashout.tpl @@ -15,6 +15,9 @@

Please note: a {if $GLOBAL.config.txfee_manual > 0.00001}{$GLOBAL.config.txfee_manual}{else}{$GLOBAL.config.txfee_manual|number_format:"8"}{/if} {$GLOBAL.config.currency} transaction will apply when processing "On-Demand" manual payments

+

+ Minimum Cashout: {$GLOBAL.config.mp_threshold} {$GLOBAL.config.currency} +

@@ -37,7 +40,9 @@ {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.withdraw} - {if $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 1} + {if $GLOBAL.userdata.balance.confirmed|escape < $GLOBAL.config.mp_threshold} + + {elseif $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 1} {elseif $WITHDRAWSENT == 0 && $WITHDRAWUNLOCKED == 1 || $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 0} @@ -52,4 +57,4 @@
-{/if} \ No newline at end of file +{/if} diff --git a/public/templates/bootstrap/admin/wallet/default.tpl b/public/templates/bootstrap/admin/wallet/default.tpl old mode 100755 new mode 100644 diff --git a/public/templates/bootstrap/dashboard/js_api.tpl b/public/templates/bootstrap/dashboard/js_api.tpl old mode 100755 new mode 100644 index 01a3b401..5da15a55 --- a/public/templates/bootstrap/dashboard/js_api.tpl +++ b/public/templates/bootstrap/dashboard/js_api.tpl @@ -14,7 +14,7 @@ $(document).ready(function(){ var storedPoolHashrate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.hashrate|number_format:"2"}{literal} ]; var storedNetHashrate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.nethashrate|number_format:"2"}{literal} ]; var storedPoolWorkers = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.workers}{literal} ]; - var storedCoinPrice = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.price}{literal} ]; + var storedCoinPrice = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.price}{literal} ]; // Sparkline options applied to all graphs var sparklineBarOptions = { @@ -22,7 +22,8 @@ $(document).ready(function(){ height: '35', barWidth: 6, barSpacing: 2, - chartRangeMin: 0 + chartRangeMin: {/literal}{$GLOBAL.price}{literal} - 5, + chartRangeMax: {/literal}{$GLOBAL.price}{literal} + 5, }; // Sparkline options applied to line graphs @@ -39,7 +40,9 @@ $(document).ready(function(){ $('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineBarOptions); $('.pool-nethashrate-bar').sparkline(storedNetHashrate, sparklineBarOptions); $('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineBarOptions); +{/literal}{if $GLOBAL.config.price.enabled}{literal} $('.coin-price-line').sparkline(storedCoinPrice, sparklineLineOptions); +{/literal}{/if}{literal} function refreshInformation(data) { // Drop one value, add the latest new one to each array @@ -61,12 +64,16 @@ $(document).ready(function(){ $('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineBarOptions); $('.pool-nethashrate-bar').sparkline(storedNetHashrate, sparklineBarOptions); $('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineBarOptions); + {/literal}{if $GLOBAL.config.price.enabled}{literal} $('.coin-price-line').sparkline(storedCoinPrice, sparklineLineOptions); + {/literal}{/if}{literal} } // Refresh other static numbers on the template function refreshStaticData(data) { + {/literal}{if $GLOBAL.config.price.enabled}{literal} $('#b-price').html((parseFloat(data.getdashboarddata.data.pool.price).toFixed(8))); + {/literal}{/if}{literal} $('#b-poolworkers').html(data.getdashboarddata.data.pool.workers); $('#b-hashrate').html((parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(2))); $('#b-poolhashrate').html((parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(2))); diff --git a/public/templates/bootstrap/dashboard/overview.tpl b/public/templates/bootstrap/dashboard/overview.tpl old mode 100755 new mode 100644 diff --git a/public/templates/bootstrap/global/header.tpl b/public/templates/bootstrap/global/header.tpl index d04537ca..d89e809c 100755 --- a/public/templates/bootstrap/global/header.tpl +++ b/public/templates/bootstrap/global/header.tpl @@ -50,6 +50,7 @@