From 83efd6026c829073565fcd139552dea22626ce77 Mon Sep 17 00:00:00 2001
From: Bart S <smiba@users.noreply.github.com>
Date: Wed, 21 Feb 2018 13:22:25 +0100
Subject: [PATCH 1/2] Minor changes to the block overview template

Often my pool is at 101% because thats just luck, however bright red makes users often think something is wrong

I'd say up to 115% make it orange, its less worrying.
---
 .../statistics/blocks/block_overview_time.tpl        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/bootstrap/statistics/blocks/block_overview_time.tpl b/templates/bootstrap/statistics/blocks/block_overview_time.tpl
index 61bae492..7fb9941b 100644
--- a/templates/bootstrap/statistics/blocks/block_overview_time.tpl
+++ b/templates/bootstrap/statistics/blocks/block_overview_time.tpl
@@ -42,7 +42,7 @@
                 <td class="text-right">{$LASTBLOCKSBYTIME.TotalShares|number_format}</td>
                 <td class="text-right">
                 {if $LASTBLOCKSBYTIME.TotalEstimatedShares > 0}
-                  <font color="{if (($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100)|number_format:"2"}%</font></b>
+                  <font color="{if (($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100) <= 100)}green{elseif (($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100) <= 115)}orange{else}red{/if}">{($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
@@ -68,7 +68,7 @@
                 <td class="text-right">{$LASTBLOCKSBYTIME.1HourShares|number_format}</td>
                 <td class="text-right">
                 {if $LASTBLOCKSBYTIME.1HourEstimatedShares > 0}
-                  <font color="{if (($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100)|number_format:"2"}%</font></b>
+                  <font color="{if (($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100) <= 100)}green{elseif (($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100) <= 115)}orange{else}red{/if}">{($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
@@ -94,7 +94,7 @@
                 <td class="text-right">{$LASTBLOCKSBYTIME.24HourShares|number_format}</td>
                 <td class="text-right">
                 {if $LASTBLOCKSBYTIME.24HourEstimatedShares > 0}
-                  <font color="{if (($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100)|number_format:"2"}%</font></b>
+                  <font color="{if (($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100) <= 100)}green{elseif (($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100) <= 115)}orange{else}red{/if}">{($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
@@ -120,7 +120,7 @@
                 <td class="text-right">{$LASTBLOCKSBYTIME.7DaysShares|number_format}</td>
                 <td class="text-right">
                 {if $LASTBLOCKSBYTIME.7DaysEstimatedShares > 0}
-                  <font color="{if (($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100)|number_format:"2"}%</font></b>
+                  <font color="{if (($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100) <= 100)}green{elseif (($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100) <= 115)}orange{else}red{/if}">{($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
@@ -146,7 +146,7 @@
                 <td class="text-right">{$LASTBLOCKSBYTIME.4WeeksShares|number_format}</td>
                 <td class="text-right">
                 {if $LASTBLOCKSBYTIME.4WeeksEstimatedShares > 0}
-                  <font color="{if (($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100)|number_format:"2"}%</font></b>
+                  <font color="{if (($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100) <= 100)}green{elseif (($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100) <= 115)}orange{else}red{/if}">{($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
@@ -172,7 +172,7 @@
                 <td class="text-right">{$LASTBLOCKSBYTIME.12MonthShares|number_format}</td>
                 <td class="text-right">
                 {if $LASTBLOCKSBYTIME.12MonthEstimatedShares > 0}
-                  <font color="{if (($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100)|number_format:"2"}%</font></b>
+                  <font color="{if (($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100) <= 100)}green{elseif (($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100) <= 115)}orange{else}red{/if}">{($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}

From ef8f66468cbd5a589bbf1d0c89aeb0763061e1d7 Mon Sep 17 00:00:00 2001
From: Bart S <smiba@users.noreply.github.com>
Date: Wed, 21 Feb 2018 13:32:47 +0100
Subject: [PATCH 2/2] Add orange colour to blocks found

Together with #83efd60
---
 .../bootstrap/statistics/blocks/blocks_found_details.tpl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/bootstrap/statistics/blocks/blocks_found_details.tpl b/templates/bootstrap/statistics/blocks/blocks_found_details.tpl
index 834c0fe2..1f054a86 100644
--- a/templates/bootstrap/statistics/blocks/blocks_found_details.tpl
+++ b/templates/bootstrap/statistics/blocks/blocks_found_details.tpl
@@ -59,7 +59,7 @@
                 <td class="text-right">{$BLOCKSFOUND[block].shares|number_format}</td>
                 <td class="text-right">
                   {math assign="percentage" equation="shares / estshares * 100" shares=$BLOCKSFOUND[block].shares|default:"0" estshares=$BLOCKSFOUND[block].estshares}
-                  <font color="{if ($percentage <= 100)}green{else}red{/if}">{$percentage|number_format:"2"}</font>
+                  <font color="{if ($percentage <= 100)}green{elseif ($percentage <= 115)}orange{else}red{/if}">{$percentage|number_format:"2"}</font>
                 </td>
               </tr>
               {/section}
@@ -70,7 +70,7 @@
                 <td class="text-right">{$pplnsshares|number_format}</td>
                 {/if}
                 <td class="text-right">{$totalshares|number_format}</td>
-                <td class="text-right">{if $count > 0}<font color="{if (($totalshares / $totalexpectedshares * 100) <= 100)}green{else}red{/if}">{($totalshares / $totalexpectedshares * 100)|number_format:"2"}</font>{else}0{/if}</td>
+                <td class="text-right">{if $count > 0}<font color="{if (($totalshares / $totalexpectedshares * 100) <= 100)}green{elseif (($totalshares / $totalexpectedshares * 100) <= 115)}orange{else}red{/if}">{($totalshares / $totalexpectedshares * 100)|number_format:"2"}</font>{else}0{/if}</td>
               </tr>
             </tbody>
           </table>