From eca77d551c71ff6f38c39c0ec78374fd6a8e7b99 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 24 Jul 2013 10:00:27 +0200 Subject: [PATCH 1/4] Changed percentages for invalids, pool efficiency This should address #514 with negative efficiencies. Formulas were wrong. Will fix #514 when merged. --- public/templates/mmcFE/global/sidebar_pplns.tpl | 4 ++-- public/templates/mmcFE/global/sidebar_pps.tpl | 4 ++-- public/templates/mmcFE/global/sidebar_prop.tpl | 4 ++-- public/templates/mmcFE/statistics/pool/authenticated.tpl | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/templates/mmcFE/global/sidebar_pplns.tpl b/public/templates/mmcFE/global/sidebar_pplns.tpl index 79ffec8a..e5ef06b8 100644 --- a/public/templates/mmcFE/global/sidebar_pplns.tpl +++ b/public/templates/mmcFE/global/sidebar_pplns.tpl @@ -38,11 +38,11 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} {$GLOBAL.config.currency} Round Estimate diff --git a/public/templates/mmcFE/global/sidebar_pps.tpl b/public/templates/mmcFE/global/sidebar_pps.tpl index b90f9aed..3fdc478a 100644 --- a/public/templates/mmcFE/global/sidebar_pps.tpl +++ b/public/templates/mmcFE/global/sidebar_pps.tpl @@ -30,11 +30,11 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if}   {$GLOBAL.config.currency} Estimates diff --git a/public/templates/mmcFE/global/sidebar_prop.tpl b/public/templates/mmcFE/global/sidebar_prop.tpl index c19c429d..a9b0e742 100644 --- a/public/templates/mmcFE/global/sidebar_prop.tpl +++ b/public/templates/mmcFE/global/sidebar_prop.tpl @@ -33,11 +33,11 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} {$GLOBAL.config.currency} Round Estimate diff --git a/public/templates/mmcFE/statistics/pool/authenticated.tpl b/public/templates/mmcFE/statistics/pool/authenticated.tpl index 832cecf3..394e762b 100644 --- a/public/templates/mmcFE/statistics/pool/authenticated.tpl +++ b/public/templates/mmcFE/statistics/pool/authenticated.tpl @@ -13,7 +13,7 @@ Pool Efficiency - {if $GLOBAL.roundshares.valid > 0}{(100 - (100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid))|number_format:"2"}{else}0{/if} % + {if $GLOBAL.roundshares.valid > 0}{($GLOBAL.roundshares.valid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%{else}0%{/if} Current Active Workers From 3f62612af995208a25fe326ff5bb055925b5e3db Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 24 Jul 2013 11:30:16 +0200 Subject: [PATCH 2/4] Fixing mobile templates too --- .../site_assets/mobile/images/questionmark.png, | Bin 0 -> 7160 bytes public/templates/mobile/global/sidebar_pps.tpl | 8 ++++---- public/templates/mobile/global/sidebar_prop.tpl | 12 ++++++------ .../mobile/statistics/pool/authenticated.tpl | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 public/site_assets/mobile/images/questionmark.png, diff --git a/public/site_assets/mobile/images/questionmark.png, b/public/site_assets/mobile/images/questionmark.png, new file mode 100644 index 0000000000000000000000000000000000000000..f3405a0171fb95824942f946feb8fc4030ded8f1 GIT binary patch literal 7160 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.roundshares.valid|number_format} - Pool Invalid ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%) - {$GLOBAL.roundshares.invalid|number_format} + Pool Invalid + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){/if} - Your Invalid ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%) - {$GLOBAL.userdata.shares.invalid|number_format} + Your Invalid + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){/if}   {$GLOBAL.config.currency} Estimates diff --git a/public/templates/mobile/global/sidebar_prop.tpl b/public/templates/mobile/global/sidebar_prop.tpl index 18fec375..1dbcf3f5 100644 --- a/public/templates/mobile/global/sidebar_prop.tpl +++ b/public/templates/mobile/global/sidebar_prop.tpl @@ -15,17 +15,17 @@ Pool Valid {$GLOBAL.roundshares.valid|number_format} - - Pool Invalid ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%) - {$GLOBAL.roundshares.invalid|number_format} - Your Valid {$GLOBAL.userdata.shares.valid|number_format} - Your Invalid ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%) - {$GLOBAL.userdata.shares.invalid|number_format} + Pool Invalid + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){/if} + + + Your Invalid + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){/if}   diff --git a/public/templates/mobile/statistics/pool/authenticated.tpl b/public/templates/mobile/statistics/pool/authenticated.tpl index a7025779..0d0252e6 100644 --- a/public/templates/mobile/statistics/pool/authenticated.tpl +++ b/public/templates/mobile/statistics/pool/authenticated.tpl @@ -18,7 +18,7 @@ Pool Efficiency - {(100 - (100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid))|number_format:"2"} % + {if $GLOBAL.roundshares.valid > 0}{(100 - (100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid))|number_format:"2"}{else}0{/if} % Current Active Workers From e760cbdc0356a2572a735c318c7ae7bf02c528f1 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 24 Jul 2013 11:39:59 +0200 Subject: [PATCH 3/4] Fixing mobile templates Addresses #514 --- public/templates/mobile/global/sidebar_pplns.tpl | 4 ++-- public/templates/mobile/global/sidebar_pps.tpl | 4 ++-- public/templates/mobile/global/sidebar_prop.tpl | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/public/templates/mobile/global/sidebar_pplns.tpl b/public/templates/mobile/global/sidebar_pplns.tpl index 95dcf93c..fe26beb7 100644 --- a/public/templates/mobile/global/sidebar_pplns.tpl +++ b/public/templates/mobile/global/sidebar_pplns.tpl @@ -31,11 +31,11 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} {$GLOBAL.config.currency} Round Estimate diff --git a/public/templates/mobile/global/sidebar_pps.tpl b/public/templates/mobile/global/sidebar_pps.tpl index fc4093df..8867dc77 100644 --- a/public/templates/mobile/global/sidebar_pps.tpl +++ b/public/templates/mobile/global/sidebar_pps.tpl @@ -25,11 +25,11 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if}   {$GLOBAL.config.currency} Estimates diff --git a/public/templates/mobile/global/sidebar_prop.tpl b/public/templates/mobile/global/sidebar_prop.tpl index 1dbcf3f5..d47202ec 100644 --- a/public/templates/mobile/global/sidebar_prop.tpl +++ b/public/templates/mobile/global/sidebar_prop.tpl @@ -21,12 +21,13 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.roundshares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({(100 / $GLOBAL.roundshares.valid * $GLOBAL.userdata.shares.invalid)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} +   {$GLOBAL.config.currency} Round Estimate From b5eca59e58e5c6ef9e65c8b6f558933e035db5a9 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 24 Jul 2013 11:41:12 +0200 Subject: [PATCH 4/4] Fixing alignment in mobile template Addresses #514 --- public/templates/mobile/global/sidebar_pplns.tpl | 4 ++-- public/templates/mobile/global/sidebar_pps.tpl | 4 ++-- public/templates/mobile/global/sidebar_prop.tpl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/templates/mobile/global/sidebar_pplns.tpl b/public/templates/mobile/global/sidebar_pplns.tpl index fe26beb7..c60359b7 100644 --- a/public/templates/mobile/global/sidebar_pplns.tpl +++ b/public/templates/mobile/global/sidebar_pplns.tpl @@ -31,11 +31,11 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} {$GLOBAL.config.currency} Round Estimate diff --git a/public/templates/mobile/global/sidebar_pps.tpl b/public/templates/mobile/global/sidebar_pps.tpl index 8867dc77..38edd078 100644 --- a/public/templates/mobile/global/sidebar_pps.tpl +++ b/public/templates/mobile/global/sidebar_pps.tpl @@ -25,11 +25,11 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if}   {$GLOBAL.config.currency} Estimates diff --git a/public/templates/mobile/global/sidebar_prop.tpl b/public/templates/mobile/global/sidebar_prop.tpl index d47202ec..f685171e 100644 --- a/public/templates/mobile/global/sidebar_prop.tpl +++ b/public/templates/mobile/global/sidebar_prop.tpl @@ -21,11 +21,11 @@ Pool Invalid - {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} + {$GLOBAL.roundshares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if} + {$GLOBAL.userdata.shares.invalid|number_format}{if $GLOBAL.roundshares.valid > 0} ({($GLOBAL.userdata.shares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){/if}