From c233fbfffb9a1f2f4b6ef976f2aac18d30c3679e Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Sun, 27 Oct 2013 10:44:31 +0100 Subject: [PATCH] Dashboard bugfixes --- .../admin/customers/customers_customer.tpl | 4 +- templates/Sparkle/admin/index/index.tpl | 379 +++++++++--------- templates/Sparkle/assets/css/main.css | 5 +- templates/Sparkle/assets/js/circular.js | 25 +- templates/Sparkle/customer/index/index.tpl | 24 +- 5 files changed, 234 insertions(+), 203 deletions(-) diff --git a/templates/Sparkle/admin/customers/customers_customer.tpl b/templates/Sparkle/admin/customers/customers_customer.tpl index 96326a53..f0400ea8 100644 --- a/templates/Sparkle/admin/customers/customers_customer.tpl +++ b/templates/Sparkle/admin/customers/customers_customer.tpl @@ -36,7 +36,7 @@
-
+
@@ -54,7 +54,7 @@
-
+
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index cbcabbb9..d7b1af86 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -5,198 +5,197 @@ $header {$lng['panel']['dashboard']}
-
- - - {$lng['admin']['customers']}
- - {$overview['number_customers']} {$lng['panel']['used']}
- {$userinfo['customers_used']} {$lng['panel']['assigned']}
- - {$userinfo['customers']} {$lng['panel']['available']} - - +
+ + + {$lng['admin']['customers']}
+ + {$overview['number_customers']} {$lng['panel']['used']}
+ {$userinfo['customers_used']} {$lng['panel']['assigned']}
+ + {$userinfo['customers']} {$lng['panel']['available']} + + +
+ +
+ + + {$lng['customer']['domains']}
+ + {$overview['number_domains']} {$lng['panel']['used']}
+ {$userinfo['domains_used']} {$lng['panel']['assigned']}
+ + {$userinfo['domains']} {$lng['panel']['available']} + + +
+ +
+ + + {$lng['customer']['subdomains']}
+ + {$overview['subdomains_used']} {$lng['panel']['used']}
+ {$userinfo['subdomains_used']} {$lng['panel']['assigned']}
+ + {$userinfo['subdomains']} {$lng['panel']['available']} + + +
+ +
+ + + {$lng['customer']['diskspace']}
+ + {$overview['diskspace_used']} {$lng['panel']['used']}
+ {$userinfo['diskspace_used']} {$lng['panel']['assigned']}
+ + {$userinfo['diskspace']} {$lng['panel']['available']} + + +
+ +
+ + + {$lng['customer']['traffic']}
+ + {$overview['traffic_used']} {$lng['panel']['used']}
+ {$userinfo['traffic_used']} {$lng['panel']['assigned']}
+ + {$userinfo['traffic']} {$lng['panel']['available']} + + +
+ +
+ + + {$lng['customer']['mysqls']}
+ + {$overview['mysqls_used']} {$lng['panel']['used']}
+ {$userinfo['mysqls_used']} {$lng['panel']['assigned']}
+ + {$userinfo['mysqls']} {$lng['panel']['available']} + + +
+ +
+ + + {$lng['customer']['emails']}
+ + {$overview['emails_used']} {$lng['panel']['used']}
+ {$userinfo['emails_used']} {$lng['panel']['assigned']}
+ + {$userinfo['emails']} {$lng['panel']['available']} + + +
+ +
+ + + {$lng['customer']['accounts']}
+ + {$overview['email_accounts_used']} {$lng['panel']['used']}
+ {$userinfo['email_accounts_used']} {$lng['panel']['assigned']}
+ + {$userinfo['email_accounts']} {$lng['panel']['available']} + + +
+ +
+ + + {$lng['customer']['forwarders']}
+ + {$overview['email_forwarders_used']} {$lng['panel']['used']}
+ {$userinfo['email_forwarders_used']} {$lng['panel']['assigned']}
+ + {$userinfo['email_forwarders']} {$lng['panel']['available']} + + +
+ + +
+ + + {$lng['customer']['email_quota']}
+ + {$overview['email_quota_used']} {$lng['panel']['used']}
+ {$userinfo['email_quota_used']} {$lng['panel']['assigned']}
+ + {$userinfo['email_quota']} {$lng['panel']['available']} + + +
+ + + +
+ + + {$lng['customer']['autoresponder']}
+ + {$overview['email_autoresponder_used']} {$lng['panel']['used']}
+ {$userinfo['email_autoresponder_used']} {$lng['panel']['assigned']}
+ + {$userinfo['email_autoresponder']} {$lng['panel']['available']} + + +
+ + + +
+ + + {$lng['aps']['numberofapspackages']}
+ + {$overview['aps_packages_used']} {$lng['panel']['used']}
+ {$userinfo['aps_packages_used']} {$lng['panel']['assigned']}
+ + {$userinfo['aps_packages']} {$lng['panel']['available']} + + +
+ + +
+ + + {$lng['customer']['ftps']}
+ + {$overview['ftps_used']} {$lng['panel']['used']}
+ {$userinfo['ftps_used']} {$lng['panel']['assigned']}
+ + {$userinfo['ftps']} {$lng['panel']['available']} + + +
+ + +
+ + + {$lng['customer']['tickets']}
+ + {$overview['tickets_used']} {$lng['panel']['used']}
+ {$userinfo['tickets_used']} {$lng['panel']['assigned']}
+ + {$userinfo['tickets']} {$lng['panel']['available']} + + +
+
-
- - - {$lng['customer']['domains']}
- - {$overview['number_domains']} {$lng['panel']['used']}
- {$userinfo['domains_used']} {$lng['panel']['assigned']}
- - {$userinfo['domains']} {$lng['panel']['available']} - - -
- -
- - - {$lng['customer']['subdomains']}
- - {$overview['subdomains_used']} {$lng['panel']['used']}
- {$userinfo['subdomains_used']} {$lng['panel']['assigned']}
- - {$userinfo['subdomains']} {$lng['panel']['available']} - - -
- -
- - - {$lng['customer']['diskspace']}
- - {$overview['diskspace_used']} {$lng['panel']['used']}
- {$userinfo['diskspace_used']} {$lng['panel']['assigned']}
- - {$userinfo['diskspace']} {$lng['panel']['available']} - - -
- -
- - - {$lng['customer']['traffic']}
- - {$overview['traffic_used']} {$lng['panel']['used']}
- {$userinfo['traffic_used']} {$lng['panel']['assigned']}
- - {$userinfo['traffic']} {$lng['panel']['available']} - - -
- -
- - - {$lng['customer']['mysqls']}
- - {$overview['mysqls_used']} {$lng['panel']['used']}
- {$userinfo['mysqls_used']} {$lng['panel']['assigned']}
- - {$userinfo['mysqls']} {$lng['panel']['available']} - - -
- -
- - - {$lng['customer']['emails']}
- - {$overview['emails_used']} {$lng['panel']['used']}
- {$userinfo['emails_used']} {$lng['panel']['assigned']}
- - {$userinfo['emails']} {$lng['panel']['available']} - - -
- -
- - - {$lng['customer']['accounts']}
- - {$overview['email_accounts_used']} {$lng['panel']['used']}
- {$userinfo['email_accounts_used']} {$lng['panel']['assigned']}
- - {$userinfo['email_accounts']} {$lng['panel']['available']} - - -
- -
- - - {$lng['customer']['forwarders']}
- - {$overview['email_forwarders_used']} {$lng['panel']['used']}
- {$userinfo['email_forwarders_used']} {$lng['panel']['assigned']}
- - {$userinfo['email_forwarders']} {$lng['panel']['available']} - - -
- - -
- - - {$lng['customer']['email_quota']}
- - {$overview['email_quota_used']} {$lng['panel']['used']}
- {$userinfo['email_quota_used']} {$lng['panel']['assigned']}
- - {$userinfo['email_quota']} {$lng['panel']['available']} - - -
- - - -
- - - {$lng['customer']['autoresponder']}
- - {$overview['email_autoresponder_used']} {$lng['panel']['used']}
- {$userinfo['email_autoresponder_used']} {$lng['panel']['assigned']}
- - {$userinfo['email_autoresponder']} {$lng['panel']['available']} - - -
- - - -
- - - {$lng['aps']['numberofapspackages']}
- - {$overview['aps_packages_used']} {$lng['panel']['used']}
- {$userinfo['aps_packages_used']} {$lng['panel']['assigned']}
- - {$userinfo['aps_packages']} {$lng['panel']['available']} - - -
- - -
- - - {$lng['customer']['ftps']}
- - {$overview['ftps_used']} {$lng['panel']['used']}
- {$userinfo['ftps_used']} {$lng['panel']['assigned']}
- - {$userinfo['ftps']} {$lng['panel']['available']} - - -
- - -
- - - {$lng['customer']['tickets']}
- - {$overview['tickets_used']} {$lng['panel']['used']}
- {$userinfo['tickets_used']} {$lng['panel']['assigned']}
- - {$userinfo['tickets']} {$lng['panel']['available']} - - -
- -
- -

System Information

diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 714575d8..d3b7f181 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -806,9 +806,8 @@ select[multiple="multiple"] { .cronjobtask li { background-image: url(../img/icons/clock.png); background-repeat: no-repeat; - background-position: 0px center; - padding-left: 18px; - height: 18px; + background-position: 0px 1px; + padding-left: 18px; } .overviewheading { diff --git a/templates/Sparkle/assets/js/circular.js b/templates/Sparkle/assets/js/circular.js index a971c25e..e5653b98 100644 --- a/templates/Sparkle/assets/js/circular.js +++ b/templates/Sparkle/assets/js/circular.js @@ -2,6 +2,7 @@ $(document).ready(function() { var usedColor = "#91c46b"; var assiColor = "#287e7e"; var unliColor = "#56606e"; + var overColor = "#dd514c"; $(".circular").each(function(index, element) { var canvas = "#" + $(element).attr("id") + "-canvas"; @@ -15,6 +16,7 @@ $(document).ready(function() { // Draw percentages if (!isNaN(assigned) && available == "∞") { + // Unlimited ressource and assigned if (assigned > used) { // Draw assigned as full circle circularCircle(canvas, 38, 0, 270, 4, assiColor); @@ -35,6 +37,7 @@ $(document).ready(function() { } circularText(canvas, 60, 42, 26, "∞") } else if (!isNaN(assigned)) { + // Limited ressources but assigned available = parseFloat(available); assignedP = Math.round(100 / available * assigned); @@ -48,6 +51,7 @@ $(document).ready(function() { circularCircle(canvas, 40, 0, 270, 8, unliColor); circularText(canvas, 60, 42, 26, "∞") } else { + // Limited ressources available = parseFloat(available); usedP = 100 / available * used; if (usedP < 1 && usedP > 0) { @@ -55,9 +59,21 @@ $(document).ready(function() { } else { usedP = Math.round(usedP); } + // Check if customer is over Limit usedD = 270 * usedP / 100; - circularCircle(canvas, 40, 0, usedD, 8, usedColor); - circularText(canvas, 60, 42, 22, usedP + "%") + if (usedD > 270) { usedD = 270; } + if (usedP > 90) { + circularCircle(canvas, 40, 0, usedD, 8, overColor); + } else { + circularCircle(canvas, 40, 0, usedD, 8, usedColor); + } + if (usedP > 100) { + circularText(canvas, 60, 42, 22, usedP + "%", overColor); + } else { + circularText(canvas, 60, 42, 22, usedP + "%") + } + + } }); @@ -74,9 +90,10 @@ function circularCircle(canvas, radius, start, end, stroke, color) { rotate: -135 }); } -function circularText(canvas, x, y, size, text) { +function circularText(canvas, x, y, size, text, color) { + color = color || "#343a41"; $(canvas).drawText({ - fillStyle: "#343a41", + fillStyle: color, x: x, y: y, fontSize: size, fontFamily: "Lucida Grande, Verdana, sans-serif", diff --git a/templates/Sparkle/customer/index/index.tpl b/templates/Sparkle/customer/index/index.tpl index 6b364f47..876201b9 100644 --- a/templates/Sparkle/customer/index/index.tpl +++ b/templates/Sparkle/customer/index/index.tpl @@ -6,6 +6,7 @@ $header
+
@@ -17,7 +18,9 @@ $header
+ +
@@ -29,7 +32,9 @@ $header
+ +
@@ -41,7 +46,9 @@ $header
+ +
@@ -53,7 +60,9 @@ $header
+ +
@@ -65,7 +74,9 @@ $header
+ +
@@ -77,8 +88,9 @@ $header
+ - +
@@ -92,7 +104,7 @@ $header
- +
@@ -106,6 +118,7 @@ $header
+
@@ -117,7 +130,9 @@ $header
+ +
@@ -129,8 +144,9 @@ $header
+ - +
@@ -144,7 +160,7 @@ $header
- +