diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 4c6dcdcc..96422900 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -53,6 +53,10 @@ min-height: 50px; } +.dropdown-user { min-width:100px; + +} + .navbar-top-links .dropdown-menu li { display: block; } @@ -405,3 +409,61 @@ span.spark-18 { span.spark-25 { margin: -25%; } + +/* Test Edit */ + +.circle-tile { + margin-bottom: 30px; +} + +.circle-tile { + margin-bottom: 15px; + text-align: center; +} + +.circle-tile-content { + padding-top: 50px; + border-radius: 8px; + border: 3px solid rgba(255, 255, 255, 0.3); +} + +.circle-tile-description { + font-weight: bold; + font-size: 16px; +} + +.circle-tile-number { + padding: 0px 1px 4px; +} + +.circle-tile-heading { + position: relative; + width: 80px; + height: 80px; + margin: 0px auto -40px; + border: 3px solid rgba(255, 255, 255, 0.3); + border-radius: 100%; + color: #FFF; + transition: all 0.3s ease-in-out 0s; +} + +.circle-tile-heading .fa { + line-height: 80px; +} + +.blue { + background-color: #428BCA; +} + +.text-faded { + color: rgba(255, 255, 255, 0.7); +} + +p.up { + margin: -14px 0px 0px 0px; +} + +div.up { + margin: -10px 0px 6px 0px; +} +/* End Test */ diff --git a/public/site_assets/bootstrap/css/mpos.css.save b/public/site_assets/bootstrap/css/mpos.css.save new file mode 100644 index 00000000..e0b296b5 --- /dev/null +++ b/public/site_assets/bootstrap/css/mpos.css.save @@ -0,0 +1,412 @@ +/* Global Styles */ + +/* ------------------------------- */ + + body { + background-color: #f8f8f8; +} + +/* Wrappers */ + +/* ------------------------------- */ + + #wrapper { + width: 100%; +} + +#page-wrapper { + padding: 0 15px; + min-height: 568px; + background-color: #fff; +} + +@media(min-width:768px) { + #page-wrapper { + position: inherit; + margin: 0 0 0 250px; + padding: 0 30px; + min-height: 1300px; + border-left: 1px solid #e7e7e7; + } +} + +.navbar-static-side ul li { + border-bottom: 1px solid #e7e7e7; +} + +/* Navigation */ + +/* ------------------------------- */ + +/* Top Right Navigation Dropdown Styles */ + + .navbar-top-links li { + display: inline-block; +} + +.navbar-top-links li:last-child { + margin-right: 15px; +} + +.navbar-top-links li a { + padding: 15px; + min-height: 50px; +} + +.navbar-top-links .dropdown-menu li { + display: block; +} + +.navbar-top-links .dropdown-menu li:last-child { + margin-right: 0; +} + +.navbar-top-links .dropdown-menu li a { + padding: 3px 20px; + min-height: 0; +} + +.navbar-top-links .dropdown-menu li a div { + white-space: normal; +} + +.navbar-top-links .dropdown-messages, +.navbar-top-links .dropdown-tasks, +.navbar-top-links .dropdown-alerts { + width: 310px; + min-width: 0; +} + +.navbar-top-links .dropdown-messages { + margin-left: 5px; +} + +.navbar-top-links .dropdown-tasks { + margin-left: -59px; +} + +.navbar-top-links .dropdown-alerts { + margin-left: -123px; +} + +.navbar-top-links .dropdown-user { + right: 0; + left: auto; +} + +/* Sidebar Menu Styles */ + + .sidebar-search { + padding: 15px; +} + +.arrow { + float: right; +} + +.fa.arrow:before { + content: "\f104"; +} + +.active > a > .fa.arrow:before { + content: "\f107"; +} + +.nav-second-level li, +.nav-third-level li { + border-bottom: none !important; +} + +.nav-second-level li a { + padding-left: 37px; +} + +.nav-third-level li a { + padding-left: 52px; +} + +@media(min-width:768px) { + .navbar-static-side { + z-index: 1; + position: absolute; + width: 250px; + } + + .navbar-top-links .dropdown-messages, + .navbar-top-links .dropdown-tasks, + .navbar-top-links .dropdown-alerts { + margin-left: auto; + } +} + +/* Buttons */ + +/* ------------------------------- */ + + .btn-outline { + color: inherit; + background-color: transparent; + transition: all .5s; +} + +.btn-primary.btn-outline { + color: #428bca; +} + +.btn-success.btn-outline { + color: #5cb85c; +} + +.btn-info.btn-outline { + color: #5bc0de; +} + +.btn-warning.btn-outline { + color: #f0ad4e; +} + +.btn-danger.btn-outline { + color: #d9534f; +} + +.btn-primary.btn-outline:hover, +.btn-success.btn-outline:hover, +.btn-info.btn-outline:hover, +.btn-warning.btn-outline:hover, +.btn-danger.btn-outline:hover { + color: #fff; +} + +/* Pages */ + +/* ------------------------------- */ + +/* Dashboard Chat */ + + .chat { + margin: 0; + padding: 0; + list-style: none; +} + +.chat li { + margin-bottom: 10px; + padding-bottom: 5px; + border-bottom: 1px dotted #B3A9A9; +} + +.chat li.left .chat-body { + margin-left: 60px; +} + +.chat li.right .chat-body { + margin-right: 60px; +} + +.chat li .chat-body p { + margin: 0; + color: #777777; +} + +.panel .slidedown .glyphicon, +.chat .glyphicon { + margin-right: 5px; +} + +.chat-panel .panel-body { + height: 350px; + overflow-y: scroll; +} + +/* Login Page */ + + .login-panel { + margin-top: 25%; +} + +/* Flot Chart Containers */ + + .flot-chart { + display: block; + height: 400px; +} + +.flot-chart-content { + width: 100%; + height: 100%; +} + +/* DataTables Overrides */ + + table.dataTable thead .sorting, +table.dataTable thead .sorting_asc:after, +table.dataTable thead .sorting_desc, +table.dataTable thead .sorting_asc_disabled, +table.dataTable thead .sorting_desc_disabled { + background: transparent; +} + +table.dataTable thead .sorting_asc:after { + content: "\f0de"; + float: right; + font-family: fontawesome; +} + +table.dataTable thead .sorting_desc:after { + content: "\f0dd"; + float: right; + font-family: fontawesome; +} + +table.dataTable thead .sorting:after { + content: "\f0dc"; + float: right; + font-family: fontawesome; + color: rgba(50,50,50,.5); +} + +/* Circle Buttons */ + + .btn-circle { + width: 30px; + height: 30px; + padding: 6px 0; + border-radius: 15px; + text-align: center; + font-size: 12px; + line-height: 1.428571429; +} + +.btn-circle.btn-lg { + width: 50px; + height: 50px; + padding: 10px 16px; + border-radius: 25px; + font-size: 18px; + line-height: 1.33; +} + +.btn-circle.btn-xl { + width: 70px; + height: 70px; + padding: 10px 16px; + border-radius: 35px; + font-size: 24px; + line-height: 1.33; +} + +.show-grid [class^="col-"] { + padding-top: 10px; + padding-bottom: 10px; + border: 1px solid #ddd; + background-color: #eee !important; +} + +.show-grid { + margin: 15px 0; +} + +/* No Padding for Tables */ + +.no-padding { + padding:0 +} + +.no-padding table { + margin: 0 +} + +.no-padding .table-bordered { + border: 0; +} + +.borderless > tbody > tr > td { + border: none; +} + +.borderless > thead > tr > th { + border: none; +} + +.footer { + clear: both; + text-align: center; + padding: 4px 0px 0px; + font-size: 11px; + width: 100%; +} + +.margin-bottom-sm { + margin-bottom: 5px !important; +} + +p.overview { + font-family: 'Open Sans',sans-serif; + font-weight: 600; + font-size: 11px; + text-transform: uppercase; + display: block; + margin-bottom: 4px; +} + +span.overview { + font-size: 20px; + font-weight: bold; +} + +div.overview { + margin: 20px 0px 0px; +} + +span.bigfont { + font-size: 100%; +} + +th.smallwidth { + width: 250px; +} + +.col-md-spark, .col-md-spark-2 { + position:relative; + min-height:1px; + padding-left:15px; + padding-right:15px +} + +@media (min-width:992px) { + .col-md-spark, .col-md-spark-2 { + float: left; + } + .col-md-spark { + width:16.65% + } + .col-md-spark-2 { + width:20% + } +} + +span.overview-mhs { + font-size: 11px; + font-weight: bold; +} + +div.black { + color: black; +} + +div.progress-fix { + margin: 0px 0px 5px 0px; +} + +span.spark-18 { + margin: -20%; +} + +span.spark-25 { + margin: -25%; +} + +.table-striped>tbody>tr:nth-child(odd)>td, +.table-striped>tbody>tr:nth-child(odd)>th { + background-color: #99EB99; +} diff --git a/public/templates/bootstrap/dashboard/js/api.tpl b/public/templates/bootstrap/dashboard/js/api.tpl index 546f13f0..817ef322 100644 --- a/public/templates/bootstrap/dashboard/js/api.tpl +++ b/public/templates/bootstrap/dashboard/js/api.tpl @@ -132,7 +132,7 @@ $(document).ready(function(){ for (var i = j = 0; i < length; i++) { if (workers[i].hashrate > 0) { j++; - $('#b-workers').append('' + workers[i].username + '' + workers[i].hashrate + '' + workers[i].difficulty + ''); + $('#b-workers').append('' + workers[i].username + '' + workers[i].hashrate + '' + workers[i].difficulty + ''); } } if (j == 0) { $('#b-workers').html('No active workers'); } diff --git a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl index cda1bc1c..97dd578a 100644 --- a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl @@ -1,37 +1,102 @@ -
-

My Hashrate

- {$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal} -
- +
+
+
+ +
+
+
+

My Hashrate

+
+ {$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal} +
+ +
+
+
+
-
-

My Sharerate

- {$GLOBAL.userdata.sharerate|number_format:"2"} S/s -
- +
+
+
+ +
+
+
+

Pool Hashrate

+
+ {$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool} +
+ +
+
+
+
-
-

Pool Hashrate

- {$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool} -
- +
+
+
+ +
+
+
+

My Sharerate

+
+ {$GLOBAL.userdata.sharerate|number_format:"2"} S/s +
+ +
+
+
+
-
-

Pool Workers

- {$GLOBAL.workers} -
- +
+
+
+ +
+
+
+

Pool Workers

+
+ {$GLOBAL.workers} +
+ +
+
+
+
-
-

Net Hashrate

- {$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} -
- +
+
+
+ +
+
+
+

Net Hashrate

+
+ {$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} +
+ +
+
+
+
-
-

{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}

- {$GLOBAL.price|default:"0"|number_format:"8"} -
- +
+
+
+ +
+
+
+

{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}

+
+ {$GLOBAL.price|default:"0"|number_format:"8"} +
+ +
+
+
+
- diff --git a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl index 806dbbf7..a72e481e 100644 --- a/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl +++ b/public/templates/bootstrap/dashboard/overview/_without_price_graph.tpl @@ -1,31 +1,85 @@ -
-

My Hashrate

- {$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal} -
- +
+
+
+ +
+
+
+

My Hashrate

+
+ {$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal} +
+ +
+
+
+
-
-

My Sharerate

- {$GLOBAL.userdata.sharerate|number_format:"2"} S/s -
- +
+
+
+ +
+
+
+

Pool Hashrate

+
+ {$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool} +
+ +
+
+
+
-
-

Pool Hashrate

- {$GLOBAL.hashrate|number_format:"2"} {$GLOBAL.hashunits.pool} -
- +
+
+
+ +
+
+
+

My Sharerate

+
+ {$GLOBAL.userdata.sharerate|number_format:"2"} S/s +
+ +
+
+
+
-
-

Pool Workers

- {$GLOBAL.workers} -
- +
+
+
+ +
+
+
+

Pool Workers

+
+ {$GLOBAL.workers} +
+ +
+
+
+
-
-

Net Hashrate

- {$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} -
- +
+
+
+ +
+
+
+

Net Hashrate

+
+ {$GLOBAL.nethashrate|number_format:"2"} {$GLOBAL.hashunits.network} +
+ +
+
+
+
- diff --git a/public/templates/bootstrap/dashboard/overview/default.tpl b/public/templates/bootstrap/dashboard/overview/default.tpl index de533cc7..94652aad 100644 --- a/public/templates/bootstrap/dashboard/overview/default.tpl +++ b/public/templates/bootstrap/dashboard/overview/default.tpl @@ -6,7 +6,7 @@
-
+
{* Depending on the price option we need to load a different template so it aligns properly *} {if $GLOBAL.config.price.enabled} {include file="dashboard/overview/_with_price_graph.tpl"} diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl index 4b694e61..893d8695 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl @@ -1,35 +1,95 @@
-
-
- -

{$NETWORK.block}

-

Current Block

+
+
+
+
+ +
+
+
+

{$NETWORK.block}

+
+
+

Current Block

+
+
+
-
- -

{$ESTIMATES.percent|number_format:"2"}%

-

Of Expected Shares

+
+
+
+ +
+
+
+

{$ESTIMATES.percent|number_format:"2"}%

+
+
+

Of Expected Shares

+
+
+
-
- -

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

-

{$GLOBAL.config.currency} Estimated Earnings

+
+
+
+ +
+
+
+

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

+
+
+

{$GLOBAL.config.currency} Estimated Earnings

+
+
+
-
- -

{$NETWORK.difficulty|number_format:"8"}

-

Difficulty

+
+
+
+ +
+
+
+

{$NETWORK.difficulty|number_format:"8"}

+
+
+

Difficulty

+
+
+
-
- -

{$NETWORK.EstNextDifficulty|number_format:"8"}

-

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

-

Est Next Difficulty

-
-
- -

{$NETWORK.EstTimePerBlock|seconds_to_words}

-

Est. Avg. Time per Block

+
+
+
+ +
+
+
+

{$NETWORK.EstNextDifficulty|number_format:"8"}

+

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

+
+
+

Est Next Difficulty

+
+
+
+
+
+
+
+ +
+
+
+

{$NETWORK.EstTimePerBlock|seconds_to_words}

+
+
+

Est. Avg. Time per Block

+
+
+
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pps/default.tpl b/public/templates/bootstrap/dashboard/round_statistics/pps/default.tpl new file mode 100644 index 00000000..d5c4927a --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_statistics/pps/default.tpl @@ -0,0 +1,22 @@ +
+
+
+

+ Round Information +

+
+ {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"} +
+
+
+
+
+

+ Share Information +

+
+ {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"} +
+
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl new file mode 100644 index 00000000..aef81206 --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_statistics/pps/round.tpl @@ -0,0 +1,55 @@ +
+
+
+ +

{$GLOBAL.userdata.estimates.hours1|number_format:"12"}

+

{$GLOBAL.config.currency} 1 Hour Estimated Earnings

+
+
+ +

{$GLOBAL.userdata.estimates.hours1|number_format:"12"}

+

{$GLOBAL.config.currency} 24 Hours Estimated Earnings

+
+
+ +

{$GLOBAL.userdata.estimates.days7|number_format:"12"}

+

{$GLOBAL.config.currency} 7 Days Estimated Earnings

+
+
+ +

{$GLOBAL.userdata.estimates.days14|number_format:"12"}

+

{$GLOBAL.config.currency} 14 Days Estimated Earnings

+
+
+ +

{$GLOBAL.userdata.estimates.days30|number_format:"12"}

+

{$GLOBAL.config.currency} 30 Days Estimated Earnings

+
+
+ +

{$GLOBAL.ppsvalue}

+

PPS Value

+
+
+ +

{$GLOBAL.userdata.pps.unpaidshares}

+

Unpaid Shares

+
+
+ +

{$NETWORK.difficulty|number_format:"8"}

+

Difficulty

+
+
+ +

{$NETWORK.EstNextDifficulty|number_format:"8"}

+

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

+

Est Next Difficulty

+
+
+ +

{$NETWORK.EstTimePerBlock|seconds_to_words}

+

Est. Avg. Time per Block

+
+
+
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pps/shares.tpl b/public/templates/bootstrap/dashboard/round_statistics/pps/shares.tpl new file mode 100644 index 00000000..043df82d --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_statistics/pps/shares.tpl @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + +
Own
Pool
Valid
 +
+
{$GLOBAL.userdata.shares.valid|number_format}
+
+ 		+
+
{$GLOBAL.roundshares.valid|number_format}
+
+
Invalid
 +
+
{$GLOBAL.userdata.shares.invalid|number_format}
+
+ 		+
+
{$GLOBAL.roundshares.invalid|number_format}
+
+
Efficiency
 +
+
{if $GLOBAL.userdata.shares.valid > 0}{(100 - ($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}
+
+ 		+
+
{if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}
+
+
diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl index 4b694e61..dfce41e0 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl @@ -1,35 +1,95 @@
-
-
- -

{$NETWORK.block}

-

Current Block

+
+
+
+
+ +
+
+
+

{$NETWORK.block}

+
+
+

Current Block

+
+
+
-
- -

{$ESTIMATES.percent|number_format:"2"}%

-

Of Expected Shares

+
+
+
+ +
+
+
+

{$ESTIMATES.percent|number_format:"2"}%

+
+
+

Of Expected Shares

+
+
+
-
- -

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

-

{$GLOBAL.config.currency} Estimated Earnings

+
+
+
+ +
+
+
+

{$GLOBAL.userdata.estimates.payout|number_format:"8"}

+
+
+

{$GLOBAL.config.currency} Estimated Earnings

+
+
+
-
- -

{$NETWORK.difficulty|number_format:"8"}

-

Difficulty

+
+
+
+ +
+
+
+

{$NETWORK.difficulty|number_format:"8"}

+
+
+

Difficulty

+
+
+
-
- -

{$NETWORK.EstNextDifficulty|number_format:"8"}

-

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

-

Est Next Difficulty

+
+
+
+ +
+
+
+

{$NETWORK.EstNextDifficulty|number_format:"8"}

+

Change in {$NETWORK.BlocksUntilDiffChange} Blocks

+
+
+

Est Next Difficulty

+
+
+
-
- -

{$NETWORK.EstTimePerBlock|seconds_to_words}

-

Est. Avg. Time per Block

+
+
+
+ +
+
+
+

{$NETWORK.EstTimePerBlock|seconds_to_words}

+
+
+

Est. Avg. Time per Block

+
+
+
diff --git a/public/templates/bootstrap/dashboard/worker_information/default.tpl b/public/templates/bootstrap/dashboard/worker_information/default.tpl index cc41f918..3bedcb74 100644 --- a/public/templates/bootstrap/dashboard/worker_information/default.tpl +++ b/public/templates/bootstrap/dashboard/worker_information/default.tpl @@ -4,7 +4,7 @@

Worker Information

-
+
diff --git a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl index 9d24bd51..2ac6687f 100644 --- a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl +++ b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl @@ -10,168 +10,168 @@ - - - - - - - - - - + + + + + + + + + + - - - - - + + + + - - - + + - - + + - - - - - + + + + - - - + + - - + + - - - - - + + + + - - - + + - - + + - - - - - + + + + - - - + + - - + + - - - - - + + + + - - - + + - - + + - - - - - + + + + - - - + + - - + +
Gen est.FoundValidOrphanAvg DiffShares est.SharesPercentageAmountRate est.Gen est.FoundValidOrphanAvg DiffShares est.SharesPercentageAmountRate est.
all time{($FIRSTBLOCKFOUND / $COINGENTIME)|number_format:"0"}{$LASTBLOCKSBYTIME.Total}{$LASTBLOCKSBYTIME.TotalValid}{$LASTBLOCKSBYTIME.TotalOrphan} + {($FIRSTBLOCKFOUND / $COINGENTIME)|number_format}{$LASTBLOCKSBYTIME.Total|number_format}{$LASTBLOCKSBYTIME.TotalValid|number_format}{$LASTBLOCKSBYTIME.TotalOrphan|number_format} {if $LASTBLOCKSBYTIME.TotalValid > 0} {($LASTBLOCKSBYTIME.TotalDifficulty / $LASTBLOCKSBYTIME.TotalValid)|number_format:"4"} {else} 0 {/if} {$LASTBLOCKSBYTIME.TotalEstimatedShares}{$LASTBLOCKSBYTIME.TotalShares} + {$LASTBLOCKSBYTIME.TotalEstimatedShares|number_format}{$LASTBLOCKSBYTIME.TotalShares|number_format} {if $LASTBLOCKSBYTIME.TotalEstimatedShares > 0} {($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} {$LASTBLOCKSBYTIME.TotalAmount}{($LASTBLOCKSBYTIME.Total|default:"0.00" / ($FIRSTBLOCKFOUND / $COINGENTIME) * 100)|number_format:"2"}%{$LASTBLOCKSBYTIME.TotalAmount|number_format}{($LASTBLOCKSBYTIME.Total|default:"0.00" / ($FIRSTBLOCKFOUND / $COINGENTIME) * 100)|number_format:"2"}%
last hour{(3600 / $COINGENTIME)}{$LASTBLOCKSBYTIME.1HourTotal}{$LASTBLOCKSBYTIME.1HourValid}{$LASTBLOCKSBYTIME.1HourOrphan} + {(3600 / $COINGENTIME)|number_format}{$LASTBLOCKSBYTIME.1HourTotal|number_format}{$LASTBLOCKSBYTIME.1HourValid|number_format}{$LASTBLOCKSBYTIME.1HourOrphan|number_format} {if $LASTBLOCKSBYTIME.1HourValid > 0} {($LASTBLOCKSBYTIME.1HourDifficulty / $LASTBLOCKSBYTIME.1HourValid)|number_format:"4"} {else} 0 {/if} {$LASTBLOCKSBYTIME.1HourEstimatedShares}{$LASTBLOCKSBYTIME.1HourShares} + {$LASTBLOCKSBYTIME.1HourEstimatedShares|number_format}{$LASTBLOCKSBYTIME.1HourShares|number_format} {if $LASTBLOCKSBYTIME.1HourEstimatedShares > 0} {($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} {$LASTBLOCKSBYTIME.1HourAmount}{($LASTBLOCKSBYTIME.1HourTotal|default:"0.00" / (3600 / $COINGENTIME) * 100)|number_format:"2"}%{$LASTBLOCKSBYTIME.1HourAmount|number_format}{($LASTBLOCKSBYTIME.1HourTotal|default:"0.00" / (3600 / $COINGENTIME) * 100)|number_format:"2"}%
last 24 hours{(86400 / $COINGENTIME)}{$LASTBLOCKSBYTIME.24HourTotal}{$LASTBLOCKSBYTIME.24HourValid}{$LASTBLOCKSBYTIME.24HourOrphan} + {(86400 / $COINGENTIME)|number_format}{$LASTBLOCKSBYTIME.24HourTotal|number_format}{$LASTBLOCKSBYTIME.24HourValid|number_format}{$LASTBLOCKSBYTIME.24HourOrphan|number_format} {if $LASTBLOCKSBYTIME.24HourValid > 0} {($LASTBLOCKSBYTIME.24HourDifficulty / $LASTBLOCKSBYTIME.24HourValid)|number_format:"4"} {else} 0 {/if} {$LASTBLOCKSBYTIME.24HourEstimatedShares}{$LASTBLOCKSBYTIME.24HourShares} + {$LASTBLOCKSBYTIME.24HourEstimatedShares|number_format}{$LASTBLOCKSBYTIME.24HourShares|number_format} {if $LASTBLOCKSBYTIME.24HourEstimatedShares > 0} {($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} {$LASTBLOCKSBYTIME.24HourAmount}{($LASTBLOCKSBYTIME.24HourTotal|default:"0.00" / (86400 / $COINGENTIME) * 100)|number_format:"2"}%{$LASTBLOCKSBYTIME.24HourAmount|number_format}{($LASTBLOCKSBYTIME.24HourTotal|default:"0.00" / (86400 / $COINGENTIME) * 100)|number_format:"2"}%
last 7 days{(604800 / $COINGENTIME)}{$LASTBLOCKSBYTIME.7DaysTotal}{$LASTBLOCKSBYTIME.7DaysValid}{$LASTBLOCKSBYTIME.7DaysOrphan} + {(604800 / $COINGENTIME)|number_format}{$LASTBLOCKSBYTIME.7DaysTotal|number_format}{$LASTBLOCKSBYTIME.7DaysValid|number_format}{$LASTBLOCKSBYTIME.7DaysOrphan|number_format} {if $LASTBLOCKSBYTIME.7DaysValid > 0} {($LASTBLOCKSBYTIME.7DaysDifficulty / $LASTBLOCKSBYTIME.7DaysValid)|number_format:"4"} {else} 0 {/if} {$LASTBLOCKSBYTIME.7DaysEstimatedShares}{$LASTBLOCKSBYTIME.7DaysShares} + {$LASTBLOCKSBYTIME.7DaysEstimatedShares|number_format}{$LASTBLOCKSBYTIME.7DaysShares|number_format} {if $LASTBLOCKSBYTIME.7DaysEstimatedShares > 0} {($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} {$LASTBLOCKSBYTIME.7DaysAmount}{($LASTBLOCKSBYTIME.7DaysTotal|default:"0.00" / (604800 / $COINGENTIME) * 100)|number_format:"2"}%{$LASTBLOCKSBYTIME.7DaysAmount}{($LASTBLOCKSBYTIME.7DaysTotal|default:"0.00" / (604800 / $COINGENTIME) * 100)|number_format:"2"}%
last 4 Weeks{(2419200 / $COINGENTIME)}{$LASTBLOCKSBYTIME.4WeeksTotal}{$LASTBLOCKSBYTIME.4WeeksValid}{$LASTBLOCKSBYTIME.4WeeksOrphan} + {(2419200 / $COINGENTIME)|number_format}{$LASTBLOCKSBYTIME.4WeeksTotal|number_format}{$LASTBLOCKSBYTIME.4WeeksValid|number_format}{$LASTBLOCKSBYTIME.4WeeksOrphan|number_format} {if $LASTBLOCKSBYTIME.4WeeksValid > 0} {($LASTBLOCKSBYTIME.4WeeksDifficulty / $LASTBLOCKSBYTIME.4WeeksValid)|number_format:"4"} {else} 0 {/if} {$LASTBLOCKSBYTIME.4WeeksEstimatedShares}{$LASTBLOCKSBYTIME.4WeeksShares} + {$LASTBLOCKSBYTIME.4WeeksEstimatedShares|number_format}{$LASTBLOCKSBYTIME.4WeeksShares|number_format} {if $LASTBLOCKSBYTIME.4WeeksEstimatedShares > 0} {($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} {$LASTBLOCKSBYTIME.4WeeksAmount}{($LASTBLOCKSBYTIME.4WeeksTotal|default:"0.00" / (2419200 / $COINGENTIME) * 100)|number_format:"2"}%{$LASTBLOCKSBYTIME.4WeeksAmount|number_format}{($LASTBLOCKSBYTIME.4WeeksTotal|default:"0.00" / (2419200 / $COINGENTIME) * 100)|number_format:"2"}%
last 12 Month{(29030400 / $COINGENTIME)}{$LASTBLOCKSBYTIME.12MonthTotal}{$LASTBLOCKSBYTIME.12MonthValid}{$LASTBLOCKSBYTIME.12MonthOrphan} + {(29030400 / $COINGENTIME)|number_format}{$LASTBLOCKSBYTIME.12MonthTotal|number_format}{$LASTBLOCKSBYTIME.12MonthValid|number_format}{$LASTBLOCKSBYTIME.12MonthOrphan|number_format} {if $LASTBLOCKSBYTIME.12MonthValid > 0} {($LASTBLOCKSBYTIME.12MonthDifficulty / $LASTBLOCKSBYTIME.12MonthValid)|number_format:"4"} {else} 0 {/if} {$LASTBLOCKSBYTIME.12MonthEstimatedShares}{$LASTBLOCKSBYTIME.12MonthShares} + {$LASTBLOCKSBYTIME.12MonthEstimatedShares|number_format}{$LASTBLOCKSBYTIME.12MonthShares|number_format} {if $LASTBLOCKSBYTIME.12MonthEstimatedShares > 0} {($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100)|number_format:"2"}% {else} 0.00% {/if} {$LASTBLOCKSBYTIME.12MonthAmount}{($LASTBLOCKSBYTIME.12MonthTotal|default:"0.00" / (29030400 / $COINGENTIME) * 100)|number_format:"2"}%{$LASTBLOCKSBYTIME.12MonthAmount|number_format}{($LASTBLOCKSBYTIME.12MonthTotal|default:"0.00" / (29030400 / $COINGENTIME) * 100)|number_format:"2"}%
diff --git a/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl b/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl index 7a13d239..d223ee68 100644 --- a/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl +++ b/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl @@ -9,16 +9,16 @@ - - - - - - - - {if $GLOBAL.config.payout_system == 'pplns'}{/if} - - + + + + + + + + {if $GLOBAL.config.payout_system == 'pplns'}{/if} + + @@ -32,11 +32,11 @@ {assign var="count" value=$count+1} {if $GLOBAL.config.payout_system == 'pplns'}{assign var="pplnsshares" value=$pplnsshares+$BLOCKSFOUND[block].pplns_shares}{/if} {if ! $GLOBAL.website.blockexplorer.disabled} - + {else} - + {/if} - - - - - + + + {if $GLOBAL.config.payout_system == 'pplns'} - + {/if} - - + @@ -65,12 +65,12 @@ {/section} - + {if $GLOBAL.config.payout_system == 'pplns'} - + {/if} - - + +
BlockValidityFinderTimeDifficultyAmountExpected SharesPPLNS SharesActual SharesPercentageBlockValidityFinderTimeDifficultyAmountExpected SharesPPLNS SharesActual SharesPercentage
{$BLOCKSFOUND[block].height}{$BLOCKSFOUND[block].height}{$BLOCKSFOUND[block].height}{$BLOCKSFOUND[block].height} + {if $BLOCKSFOUND[block].confirmations >= $GLOBAL.confirmations} Confirmed {else if $BLOCKSFOUND[block].confirmations == -1} @@ -46,18 +46,18 @@ {/if} {if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}{$BLOCKSFOUND[block].difficulty|number_format:"2"}{$BLOCKSFOUND[block].amount|number_format:"2"} + {$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}{$BLOCKSFOUND[block].difficulty|number_format:"4"}{$BLOCKSFOUND[block].amount|number_format:"2"} {assign var="totalexpectedshares" value=$totalexpectedshares+$BLOCKSFOUND[block].estshares} {$BLOCKSFOUND[block].estshares|number_format} {$BLOCKSFOUND[block].pplns_shares|number_format}{$BLOCKSFOUND[block].pplns_shares|number_format}{$BLOCKSFOUND[block].shares|number_format} + {$BLOCKSFOUND[block].shares|number_format} {math assign="percentage" equation="shares / estshares * 100" shares=$BLOCKSFOUND[block].shares|default:"0" estshares=$BLOCKSFOUND[block].estshares} {$percentage|number_format:"2"}
Totals{$totalexpectedshares|number_format}{$totalexpectedshares|number_format}{$pplnsshares|number_format}{$pplnsshares|number_format}{$totalshares|number_format}{if $count > 0}{($totalshares / $totalexpectedshares * 100)|number_format:"2"}{else}0{/if}{$totalshares|number_format}{if $count > 0}{($totalshares / $totalexpectedshares * 100)|number_format:"2"}{else}0{/if}
diff --git a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl index 354f3925..bb49912e 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl @@ -22,7 +22,7 @@ {assign var=listed value=0} {section contrib $CONTRIBHASHES} {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate} - + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}{else}{/if} {$rank++} {if $CONTRIBHASHES[contrib].donate_percent|default:"0" >= 2}{elseif $CONTRIBHASHES[contrib].donate_percent|default:"0" < 2 AND $CONTRIBHASHES[contrib].donate_percent|default:"0" > 0}{else}{/if} {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} @@ -35,7 +35,7 @@ {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.rawhashrate|default:"0" > 0} {math assign="myestday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.rawhashrate} - + n/a {if $GLOBAL.userdata.donate_percent|default:"0" >= 2}{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}{else}{/if} {$GLOBAL.userdata.username|escape} diff --git a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl index e2c9432f..06661e03 100644 --- a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl +++ b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl @@ -17,7 +17,7 @@ {assign var=rank value=1} {assign var=listed value=0} {section shares $CONTRIBSHARES} - + {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBSHARES[shares].account|lower}{assign var=listed value=1}{else}{/if} {$rank++} {if $CONTRIBSHARES[shares].donate_percent|default:"0" >= 2}{else if $CONTRIBSHARES[shares].donate_percent|default:"0" < 2 AND $CONTRIBSHARES[shares].donate_percent|default:"0" > 0}{else}{/if} {if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if} @@ -25,7 +25,7 @@ {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0} - + n/a {if $GLOBAL.userdata.donate_percent|default:"0" >= 2}{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}{else}{/if} {$GLOBAL.userdata.username|escape}