From f36643851ffd66210f377224f7466615e614fdb7 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sun, 10 Apr 2011 10:50:10 +0200 Subject: [PATCH] Redesign of resource-recalculation, fixes #699 Signed-off-by: Florian Aders (EleRas) --- .../Froxlor/admin/settings/updatecounters.tpl | 40 +++-- .../settings/updatecounters_row_admin.tpl | 139 +++++++++--------- .../settings/updatecounters_row_customer.tpl | 107 +++++++------- 3 files changed, 152 insertions(+), 134 deletions(-) diff --git a/templates/Froxlor/admin/settings/updatecounters.tpl b/templates/Froxlor/admin/settings/updatecounters.tpl index bd283aac..a15ea11c 100644 --- a/templates/Froxlor/admin/settings/updatecounters.tpl +++ b/templates/Froxlor/admin/settings/updatecounters.tpl @@ -1,18 +1,30 @@ $header - - - - +
+
+

+   + {$lng['admin']['updatecounters']} +

+
+ +
+
-  {$lng['admin']['updatecounters']}: {$lng['admin']['customers']} -
+ + + {$customers} - - - +
 {$lng['admin']['customers']}
-  {$lng['admin']['updatecounters']}: {$lng['admin']['admins']} -
+

+ +

+
+ + + + {$admins} -
 {$lng['admin']['admins']}
-
-
+ +

+
+ $footer diff --git a/templates/Froxlor/admin/settings/updatecounters_row_admin.tpl b/templates/Froxlor/admin/settings/updatecounters_row_admin.tpl index b7d33278..0bb85bf4 100644 --- a/templates/Froxlor/admin/settings/updatecounters_row_admin.tpl +++ b/templates/Froxlor/admin/settings/updatecounters_row_admin.tpl @@ -1,73 +1,76 @@ - + {$admin['loginname']}{$admin['loginname']}: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lng['admin']['customers']}:style="color:green"style="color:red">{$admin['customers_used']} -> {$admin['customers_used_new']}
{$lng['customer']['domains']}:style="color:green"style="color:red">{$admin['domains_used']} -> {$admin['domains_used_new']}
{$lng['customer']['subdomains']}:style="color:green"style="color:red">{$admin['subdomains_used']} -> {$admin['subdomains_used_new']}
{$lng['customer']['diskspace']}:style="color:green"style="color:red">{$admin['diskspace_used']} -> {$admin['diskspace_used_new']}
{$lng['customer']['traffic']}:style="color:green"style="color:red">{$admin['traffic_used']} -> {$admin['traffic_used_new']}
{$lng['customer']['mysqls']}:style="color:green"style="color:red">{$admin['mysqls_used']} -> {$admin['mysqls_used_new']}
{$lng['customer']['emails']}:style="color:green"style="color:red">{$admin['emails_used']} -> {$admin['emails_used_new']}
{$lng['customer']['accounts']}:style="color:green"style="color:red">{$admin['email_accounts_used']} -> {$admin['email_accounts_used_new']}
{$lng['customer']['forwarders']}:style="color:green"style="color:red">{$admin['email_forwarders_used']} -> {$admin['email_forwarders_used_new']}
{$lng['customer']['email_quota']}:style="color:green"style="color:red">{$admin['email_quota_used']} -> {$admin['email_quota_used_new']}
{$lng['customer']['autoresponder']}:style="color:green"style="color:red">{$admin['email_autoresponder_used']} -> {$admin['email_autoresponder_used_new']}
{$lng['customer']['ftps']}:style="color:green"style="color:red">{$admin['ftps_used']} -> {$admin['ftps_used_new']}
{$lng['customer']['tickets']}:style="color:green"style="color:red">{$admin['tickets_used']} -> {$admin['tickets_used_new']}
{$lng['customer']['aps']}:style="color:green"style="color:red">{$admin['aps_packages_used']} -> {$admin['aps_packages_used_new']}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lng['admin']['customers']}:style="color:green"style="color:red">{$admin['customers_used']} -> {$admin['customers_used_new']}
{$lng['customer']['domains']}:style="color:green"style="color:red">{$admin['domains_used']} -> {$admin['domains_used_new']}
{$lng['customer']['subdomains']}:style="color:green"style="color:red">{$admin['subdomains_used']} -> {$admin['subdomains_used_new']}
{$lng['customer']['diskspace']}:style="color:green"style="color:red">{$admin['diskspace_used']} -> {$admin['diskspace_used_new']}
{$lng['customer']['traffic']}:style="color:green"style="color:red">{$admin['traffic_used']} -> {$admin['traffic_used_new']}
{$lng['customer']['mysqls']}:style="color:green"style="color:red">{$admin['mysqls_used']} -> {$admin['mysqls_used_new']}
{$lng['customer']['emails']}:style="color:green"style="color:red">{$admin['emails_used']} -> {$admin['emails_used_new']}
{$lng['customer']['accounts']}:style="color:green"style="color:red">{$admin['email_accounts_used']} -> {$admin['email_accounts_used_new']}
{$lng['customer']['forwarders']}:style="color:green"style="color:red">{$admin['email_forwarders_used']} -> {$admin['email_forwarders_used_new']}
{$lng['customer']['email_quota']}:style="color:green"style="color:red">{$admin['email_quota_used']} -> {$admin['email_quota_used_new']}
{$lng['customer']['autoresponder']}:style="color:green"style="color:red">{$admin['email_autoresponder_used']} -> {$admin['email_autoresponder_used_new']}
{$lng['customer']['ftps']}:style="color:green"style="color:red">{$admin['ftps_used']} -> {$admin['ftps_used_new']}
{$lng['customer']['tickets']}:style="color:green"style="color:red">{$admin['tickets_used']} -> {$admin['tickets_used_new']}
{$lng['customer']['aps']}:style="color:green"style="color:red">{$admin['aps_packages_used']} -> {$admin['aps_packages_used_new']}
+

+
diff --git a/templates/Froxlor/admin/settings/updatecounters_row_customer.tpl b/templates/Froxlor/admin/settings/updatecounters_row_customer.tpl index 0032178f..3e97abca 100644 --- a/templates/Froxlor/admin/settings/updatecounters_row_customer.tpl +++ b/templates/Froxlor/admin/settings/updatecounters_row_customer.tpl @@ -1,57 +1,60 @@ - + {$customer['name']}, {$customer['firstname']} | {$customer['company']} ({$customer['loginname']}): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lng['customer']['subdomains']}:style="color:green"style="color:red">{$customer['subdomains_used']} -> {$customer['subdomains_used_new']}
{$lng['customer']['mysqls']}:style="color:green"style="color:red">{$customer['mysqls_used']} -> {$customer['mysqls_used_new']}
{$lng['customer']['emails']}:style="color:green"style="color:red">{$customer['emails_used']} -> {$customer['emails_used_new']}
{$lng['customer']['accounts']}:style="color:green"style="color:red">{$customer['email_accounts_used']} -> {$customer['email_accounts_used_new']}
{$lng['customer']['forwarders']}:style="color:green"style="color:red">{$customer['email_forwarders_used']} -> {$customer['email_forwarders_used_new']}
{$lng['customer']['email_quota']}:style="color:green"style="color:red">{$customer['email_quota_used']} -> {$customer['email_quota_used_new']}
{$lng['customer']['autoresponder']}:style="color:green"style="color:red">{$customer['email_autoresponder_used']} -> {$customer['email_autoresponder_used_new']}
{$lng['customer']['ftps']}:style="color:green"style="color:red">{$customer['ftps_used']} -> {$customer['ftps_used_new']}
{$lng['customer']['tickets']}:style="color:green"style="color:red">{$customer['tickets_used']} -> {$customer['tickets_used_new']}
{$lng['customer']['aps']}:style="color:green"style="color:red">{$customer['aps_packages_used']} -> {$customer['aps_packages_used_new']}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lng['customer']['subdomains']}:style="color:green"style="color:red">{$customer['subdomains_used']} -> {$customer['subdomains_used_new']}
{$lng['customer']['mysqls']}:style="color:green"style="color:red">{$customer['mysqls_used']} -> {$customer['mysqls_used_new']}
{$lng['customer']['emails']}:style="color:green"style="color:red">{$customer['emails_used']} -> {$customer['emails_used_new']}
{$lng['customer']['accounts']}:style="color:green"style="color:red">{$customer['email_accounts_used']} -> {$customer['email_accounts_used_new']}
{$lng['customer']['forwarders']}:style="color:green"style="color:red">{$customer['email_forwarders_used']} -> {$customer['email_forwarders_used_new']}
{$lng['customer']['email_quota']}:style="color:green"style="color:red">{$customer['email_quota_used']} -> {$customer['email_quota_used_new']}
{$lng['customer']['autoresponder']}:style="color:green"style="color:red">{$customer['email_autoresponder_used']} -> {$customer['email_autoresponder_used_new']}
{$lng['customer']['ftps']}:style="color:green"style="color:red">{$customer['ftps_used']} -> {$customer['ftps_used_new']}
{$lng['customer']['tickets']}:style="color:green"style="color:red">{$customer['tickets_used']} -> {$customer['tickets_used_new']}
{$lng['customer']['aps']}:style="color:green"style="color:red">{$customer['aps_packages_used']} -> {$customer['aps_packages_used_new']}
+

+