From 5a5a5b49c367acce140ad07add2923a8534c33ea Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Tue, 11 Mar 2014 12:26:32 +0100 Subject: [PATCH] [UPDATE] change dashboard as requested --- .../templates/bootstrap/dashboard/default.tpl | 2 ++ .../round_statistics/pplns/_content.tpl | 26 -------------- .../round_statistics/pplns/_footer.tpl | 19 ---------- .../round_statistics/pplns/_header.tpl | 19 ---------- .../round_statistics/pplns/default.tpl | 22 +++++++++--- .../round_statistics/pplns/round.tpl | 36 +++++++++++++++++++ .../round_statistics/pplns/shares.tpl | 25 +++++++++++++ .../round_statistics/prop/_content.tpl | 26 -------------- .../round_statistics/prop/_footer.tpl | 19 ---------- .../round_statistics/prop/_header.tpl | 19 ---------- .../round_statistics/prop/default.tpl | 24 +++++++++---- .../dashboard/round_statistics/prop/round.tpl | 36 +++++++++++++++++++ .../round_statistics/prop/shares.tpl | 25 +++++++++++++ 13 files changed, 159 insertions(+), 139 deletions(-) delete mode 100644 public/templates/bootstrap/dashboard/round_statistics/pplns/_content.tpl delete mode 100644 public/templates/bootstrap/dashboard/round_statistics/pplns/_footer.tpl delete mode 100644 public/templates/bootstrap/dashboard/round_statistics/pplns/_header.tpl create mode 100644 public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl create mode 100644 public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl delete mode 100644 public/templates/bootstrap/dashboard/round_statistics/prop/_content.tpl delete mode 100644 public/templates/bootstrap/dashboard/round_statistics/prop/_footer.tpl delete mode 100644 public/templates/bootstrap/dashboard/round_statistics/prop/_header.tpl create mode 100644 public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl create mode 100644 public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl diff --git a/public/templates/bootstrap/dashboard/default.tpl b/public/templates/bootstrap/dashboard/default.tpl index 81c0fdd2..7a6f0626 100644 --- a/public/templates/bootstrap/dashboard/default.tpl +++ b/public/templates/bootstrap/dashboard/default.tpl @@ -4,6 +4,8 @@ {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} {include file="dashboard/overview/default.tpl"} {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/default.tpl"} + +
{include file="dashboard/account_data/default.tpl"} {include file="dashboard/worker_information/default.tpl"}
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/_content.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/_content.tpl deleted file mode 100644 index 2b992064..00000000 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/_content.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -

Round Shares

Valid

Invalid

Efficiency

My Shares

-

{$GLOBAL.userdata.shares.valid|number_format}

{$GLOBAL.userdata.shares.invalid|number_format}

 -

{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}

-

Pool Shares

{$GLOBAL.roundshares.valid|number_format}

{$GLOBAL.roundshares.invalid|number_format}

 -

{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/pplns/_footer.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/_footer.tpl deleted file mode 100644 index 13fce496..00000000 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/_footer.tpl +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
- -

{$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/pplns/_header.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/_header.tpl deleted file mode 100644 index 5e1d2b05..00000000 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/_header.tpl +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
- -

{$NETWORK.block}

-

Current Block

-
-
- -

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

-

Of Expected Shares

-
-
- -

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

-

{$GLOBAL.config.currency} Estimated Earnings

-
-
-
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl index 9b320b72..999aa481 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl @@ -1,14 +1,26 @@ -
+

- Round statistics + Round statistics

{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/_header.tpl"} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/_content.tpl"} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/_footer.tpl"} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"} +
+
Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds.
+
+
+
+
+
+
+

+ Share statistics +

+
+ {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"}
Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds.
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl new file mode 100644 index 00000000..5a44547c --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/round.tpl @@ -0,0 +1,36 @@ +
+
+
+ +

{$NETWORK.block}

+

Current Block

+
+
+ +

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

+

Of Expected Shares

+
+
+ +

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

+

{$GLOBAL.config.currency} Estimated Earnings

+
+
+
+
+ +

{$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/pplns/shares.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl new file mode 100644 index 00000000..809afa24 --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
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/_content.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/_content.tpl deleted file mode 100644 index b59261fa..00000000 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/_content.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -

Round Shares

Valid

Invalid

Efficiency

My Shares

-

{$GLOBAL.userdata.shares.valid|number_format}

{$GLOBAL.userdata.shares.invalid|number_format}

 -

{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}

-

Pool Shares

{$GLOBAL.roundshares.valid|number_format}

{$GLOBAL.roundshares.invalid|number_format}

 -

{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/_footer.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/_footer.tpl deleted file mode 100644 index 13fce496..00000000 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/_footer.tpl +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
- -

{$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/prop/_header.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/_header.tpl deleted file mode 100644 index 5e1d2b05..00000000 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/_header.tpl +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
- -

{$NETWORK.block}

-

Current Block

-
-
- -

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

-

Of Expected Shares

-
-
- -

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

-

{$GLOBAL.config.currency} Estimated Earnings

-
-
-
diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl index cef97314..999aa481 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl @@ -1,16 +1,28 @@ -
+

- Round statistics + Round statistics

{assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/_header.tpl"} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/_content.tpl"} - {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/_footer.tpl"} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/round.tpl"}
- Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. +
Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds.
+
+
+
+
+
+
+

+ Share statistics +

+
+ {assign var=PAYOUT_SYSTEM value=$GLOBAL.config.payout_system} + {include file="dashboard/round_statistics/$PAYOUT_SYSTEM/shares.tpl"} +
+
Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds.
diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl new file mode 100644 index 00000000..5a44547c --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/round.tpl @@ -0,0 +1,36 @@ +
+
+
+ +

{$NETWORK.block}

+

Current Block

+
+
+ +

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

+

Of Expected Shares

+
+
+ +

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

+

{$GLOBAL.config.currency} Estimated Earnings

+
+
+
+
+ +

{$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/prop/shares.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl new file mode 100644 index 00000000..809afa24 --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
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}