From 8f1be2adf856319240553047a4631600dc7240ea Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Feb 2014 20:35:24 -0700 Subject: [PATCH] Dashboard Layout --- .../bootstrap/dashboard/account_data.tpl | 12 ++- .../templates/bootstrap/dashboard/default.tpl | 3 + .../bootstrap/dashboard/overview.tpl | 54 +++++----- .../bootstrap/dashboard/round_data.tpl | 16 +-- .../bootstrap/dashboard/system_stats.tpl | 18 ++-- public/templates/bootstrap/home/default.tpl | 5 - .../statistics/blocks/small_table.tpl | 1 - .../bootstrap/statistics/uptime/default.tpl | 99 ++++++++----------- 8 files changed, 102 insertions(+), 106 deletions(-) mode change 100644 => 100755 public/templates/bootstrap/dashboard/default.tpl mode change 100644 => 100755 public/templates/bootstrap/dashboard/overview.tpl mode change 100644 => 100755 public/templates/bootstrap/dashboard/round_data.tpl mode change 100644 => 100755 public/templates/bootstrap/dashboard/system_stats.tpl mode change 100644 => 100755 public/templates/bootstrap/home/default.tpl diff --git a/public/templates/bootstrap/dashboard/account_data.tpl b/public/templates/bootstrap/dashboard/account_data.tpl index 181b299a..bd1d5eae 100755 --- a/public/templates/bootstrap/dashboard/account_data.tpl +++ b/public/templates/bootstrap/dashboard/account_data.tpl @@ -1,5 +1,9 @@ -
-

Account Information

+
+
+
+

Account Information

+
+
@@ -46,4 +50,6 @@
{/if} -
+ + + \ No newline at end of file diff --git a/public/templates/bootstrap/dashboard/default.tpl b/public/templates/bootstrap/dashboard/default.tpl old mode 100644 new mode 100755 index 43e85d42..b369372c --- a/public/templates/bootstrap/dashboard/default.tpl +++ b/public/templates/bootstrap/dashboard/default.tpl @@ -1,8 +1,11 @@ {if $smarty.session.AUTHENTICATED|default} {include file="dashboard/overview.tpl"} +{literal}
{/literal} {include file="dashboard/system_stats.tpl"} {include file="dashboard/round_data.tpl"} {include file="dashboard/account_data.tpl"} +{literal}
{/literal} + {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} {include file="dashboard/js_api.tpl"} {else} diff --git a/public/templates/bootstrap/dashboard/overview.tpl b/public/templates/bootstrap/dashboard/overview.tpl old mode 100644 new mode 100755 index 6fb42246..618f8eba --- a/public/templates/bootstrap/dashboard/overview.tpl +++ b/public/templates/bootstrap/dashboard/overview.tpl @@ -1,26 +1,32 @@ -
-

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|number_format:"8"|default:"0"}{/if} / Pool Workers: {$GLOBAL.workers}

-
-
-
-
-
+
+
+
+
+

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|number_format:"8"|default:"0"}{/if} / Pool Workers: {$GLOBAL.workers}

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} +
+
+
+ {/if} +
+
-
-
-
-
-
-
-
-
- {if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} -
-
-
- {/if}
-
-

Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.

-
-
+ \ No newline at end of file diff --git a/public/templates/bootstrap/dashboard/round_data.tpl b/public/templates/bootstrap/dashboard/round_data.tpl old mode 100644 new mode 100755 index 9c593c21..ea39dcc4 --- a/public/templates/bootstrap/dashboard/round_data.tpl +++ b/public/templates/bootstrap/dashboard/round_data.tpl @@ -1,8 +1,10 @@ -
-

Round Information

-
-
+
+
+
+

Round Information

+
+
+ +
-
-
-
+ \ No newline at end of file diff --git a/public/templates/bootstrap/dashboard/system_stats.tpl b/public/templates/bootstrap/dashboard/system_stats.tpl old mode 100644 new mode 100755 index a4576e01..f6ffdc62 --- a/public/templates/bootstrap/dashboard/system_stats.tpl +++ b/public/templates/bootstrap/dashboard/system_stats.tpl @@ -1,7 +1,10 @@ -
-

{$GLOBAL.config.payout_system|capitalize} Stats

-
- +
+
+
+

{$GLOBAL.config.payout_system|capitalize} Stats

+
+
+
{if $GLOBAL.config.payout_system == 'pplns'} @@ -36,5 +39,8 @@
-
- + + + \ No newline at end of file diff --git a/public/templates/bootstrap/home/default.tpl b/public/templates/bootstrap/home/default.tpl old mode 100644 new mode 100755 index ae39f27d..106b684b --- a/public/templates/bootstrap/home/default.tpl +++ b/public/templates/bootstrap/home/default.tpl @@ -1,11 +1,9 @@ -

latest News

-
{section name=news loop=$NEWS} @@ -24,9 +22,6 @@ {/section}
-
-
-
diff --git a/public/templates/bootstrap/statistics/blocks/small_table.tpl b/public/templates/bootstrap/statistics/blocks/small_table.tpl index 9b8cbe56..15f458f7 100755 --- a/public/templates/bootstrap/statistics/blocks/small_table.tpl +++ b/public/templates/bootstrap/statistics/blocks/small_table.tpl @@ -30,7 +30,6 @@ - {if $GLOBAL.config.payout_system != 'pps'}