From 26d52b62c64ae39a67d7672b86795617a416af27 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Tue, 11 Mar 2014 12:47:30 +0100 Subject: [PATCH] [UPDATE] dashboard style --- .../templates/bootstrap/dashboard/default.tpl | 34 ++++++++++++++----- .../bootstrap/dashboard/overview/default.tpl | 7 ++-- .../round_statistics/pplns/default.tpl | 10 ++---- .../round_statistics/pplns/shares.tpl | 4 +-- .../round_statistics/prop/default.tpl | 10 ++---- .../round_statistics/prop/shares.tpl | 4 +-- 6 files changed, 37 insertions(+), 32 deletions(-) diff --git a/public/templates/bootstrap/dashboard/default.tpl b/public/templates/bootstrap/dashboard/default.tpl index 7a6f0626..79f06d65 100644 --- a/public/templates/bootstrap/dashboard/default.tpl +++ b/public/templates/bootstrap/dashboard/default.tpl @@ -1,13 +1,31 @@ {if $smarty.session.AUTHENTICATED|default}
- {* Load our payout system so we can load some payout specific templates *} - {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"} +
+
+
+

Overview

+
+
+
+
+ {* Load our payout system so we can load some payout specific templates *} + {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"} +
+
+
+ +
+
{* Include our JS libraries, we allow a live updating JS and a static one *} {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} diff --git a/public/templates/bootstrap/dashboard/overview/default.tpl b/public/templates/bootstrap/dashboard/overview/default.tpl index 9d88a315..822c6c34 100644 --- a/public/templates/bootstrap/dashboard/overview/default.tpl +++ b/public/templates/bootstrap/dashboard/overview/default.tpl @@ -1,7 +1,9 @@
-

Overview

+

+ Pool Information +

@@ -13,8 +15,5 @@ {/if}
-
diff --git a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl index 999aa481..2c659566 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/default.tpl @@ -2,27 +2,21 @@

- Round statistics + Round Information

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

- Share statistics + 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/pplns/shares.tpl b/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl index 809afa24..2c233030 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/pplns/shares.tpl @@ -6,13 +6,13 @@
Pool
-
Valid
+
Valid
{$GLOBAL.userdata.shares.valid|number_format}
{$GLOBAL.roundshares.valid|number_format}
-
Invalid
+
Invalid
{$GLOBAL.userdata.shares.invalid|number_format}
{$GLOBAL.roundshares.invalid|number_format}
diff --git a/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl index 999aa481..2c659566 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/default.tpl @@ -2,27 +2,21 @@

- Round statistics + Round Information

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

- Share statistics + 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/prop/shares.tpl b/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl index 809afa24..2c233030 100644 --- a/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl +++ b/public/templates/bootstrap/dashboard/round_statistics/prop/shares.tpl @@ -6,13 +6,13 @@
Pool
-
Valid
+
Valid
{$GLOBAL.userdata.shares.valid|number_format}
{$GLOBAL.roundshares.valid|number_format}
-
Invalid
+
Invalid
{$GLOBAL.userdata.shares.invalid|number_format}
{$GLOBAL.roundshares.invalid|number_format}