Skip to content

Commit cfcd1d1

Browse files
TheSerapherTheSerapher
authored
Merge pull request #2674 from smiba/patch-1
Minor changes to the block overview template
2 parents 6c0d9a1 + ef8f664 commit cfcd1d1

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎templates/bootstrap/statistics/blocks/block_overview_time.tpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<td class="text-right">{$LASTBLOCKSBYTIME.TotalShares|number_format}</td>
4343
<td class="text-right">
4444
{if $LASTBLOCKSBYTIME.TotalEstimatedShares > 0}
45-
<font color="{if (($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100)|number_format:"2"}%</font></b>
45+
<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>
4646
{else}
4747
0.00%
4848
{/if}
@@ -68,7 +68,7 @@
6868
<td class="text-right">{$LASTBLOCKSBYTIME.1HourShares|number_format}</td>
6969
<td class="text-right">
7070
{if $LASTBLOCKSBYTIME.1HourEstimatedShares > 0}
71-
<font color="{if (($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100)|number_format:"2"}%</font></b>
71+
<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>
7272
{else}
7373
0.00%
7474
{/if}
@@ -94,7 +94,7 @@
9494
<td class="text-right">{$LASTBLOCKSBYTIME.24HourShares|number_format}</td>
9595
<td class="text-right">
9696
{if $LASTBLOCKSBYTIME.24HourEstimatedShares > 0}
97-
<font color="{if (($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100)|number_format:"2"}%</font></b>
97+
<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>
9898
{else}
9999
0.00%
100100
{/if}
@@ -120,7 +120,7 @@
120120
<td class="text-right">{$LASTBLOCKSBYTIME.7DaysShares|number_format}</td>
121121
<td class="text-right">
122122
{if $LASTBLOCKSBYTIME.7DaysEstimatedShares > 0}
123-
<font color="{if (($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100)|number_format:"2"}%</font></b>
123+
<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>
124124
{else}
125125
0.00%
126126
{/if}
@@ -146,7 +146,7 @@
146146
<td class="text-right">{$LASTBLOCKSBYTIME.4WeeksShares|number_format}</td>
147147
<td class="text-right">
148148
{if $LASTBLOCKSBYTIME.4WeeksEstimatedShares > 0}
149-
<font color="{if (($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100)|number_format:"2"}%</font></b>
149+
<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>
150150
{else}
151151
0.00%
152152
{/if}
@@ -172,7 +172,7 @@
172172
<td class="text-right">{$LASTBLOCKSBYTIME.12MonthShares|number_format}</td>
173173
<td class="text-right">
174174
{if $LASTBLOCKSBYTIME.12MonthEstimatedShares > 0}
175-
<font color="{if (($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100)|number_format:"2"}%</font></b>
175+
<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>
176176
{else}
177177
0.00%
178178
{/if}

‎templates/bootstrap/statistics/blocks/blocks_found_details.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<td class="text-right">{$BLOCKSFOUND[block].shares|number_format}</td>
6060
<td class="text-right">
6161
{math assign="percentage" equation="shares / estshares * 100" shares=$BLOCKSFOUND[block].shares|default:"0" estshares=$BLOCKSFOUND[block].estshares}
62-
<font color="{if ($percentage <= 100)}green{else}red{/if}">{$percentage|number_format:"2"}</font>
62+
<font color="{if ($percentage <= 100)}green{elseif ($percentage <= 115)}orange{else}red{/if}">{$percentage|number_format:"2"}</font>
6363
</td>
6464
</tr>
6565
{/section}
@@ -70,7 +70,7 @@
7070
<td class="text-right">{$pplnsshares|number_format}</td>
7171
{/if}
7272
<td class="text-right">{$totalshares|number_format}</td>
73-
<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>
73+
<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>
7474
</tr>
7575
</tbody>
7676
</table>

0 commit comments

Comments
 (0)