From fc69afcffc71f35b867302ad842856b04864a069 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Sun, 27 Oct 2013 11:52:53 +0100 Subject: [PATCH] Some more bugfixes, soft animation when resizing window No more oh! (Hopefully) --- .../admin/customers/customers_customer.tpl | 4 +- templates/Sparkle/admin/index/index.tpl | 31 +++++++------- templates/Sparkle/assets/css/main.css | 16 ++++++-- templates/Sparkle/assets/js/circular.js | 40 +++++++++++++++++++ templates/Sparkle/customer/index/index.tpl | 26 ++++++------ 5 files changed, 83 insertions(+), 34 deletions(-) diff --git a/templates/Sparkle/admin/customers/customers_customer.tpl b/templates/Sparkle/admin/customers/customers_customer.tpl index f0400ea8..b9070c85 100644 --- a/templates/Sparkle/admin/customers/customers_customer.tpl +++ b/templates/Sparkle/admin/customers/customers_customer.tpl @@ -35,7 +35,7 @@ -
+
∞
@@ -53,7 +53,7 @@
-
+
∞
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index d7b1af86..9f60ba29 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -4,10 +4,10 @@ $header {$lng['panel']['dashboard']} -
+
- +
{$lng['admin']['customers']}
{$overview['number_customers']} {$lng['panel']['used']}
@@ -20,7 +20,7 @@ $header
- +
{$lng['customer']['domains']}
{$overview['number_domains']} {$lng['panel']['used']}
@@ -33,7 +33,7 @@ $header
- +
{$lng['customer']['subdomains']}
{$overview['subdomains_used']} {$lng['panel']['used']}
@@ -46,7 +46,7 @@ $header
- +
{$lng['customer']['diskspace']}
{$overview['diskspace_used']} {$lng['panel']['used']}
@@ -59,7 +59,7 @@ $header
- +
{$lng['customer']['traffic']}
{$overview['traffic_used']} {$lng['panel']['used']}
@@ -72,7 +72,7 @@ $header
- +
{$lng['customer']['mysqls']}
{$overview['mysqls_used']} {$lng['panel']['used']}
@@ -85,7 +85,7 @@ $header
- +
{$lng['customer']['emails']}
{$overview['emails_used']} {$lng['panel']['used']}
@@ -98,7 +98,7 @@ $header
- +
{$lng['customer']['accounts']}
{$overview['email_accounts_used']} {$lng['panel']['used']}
@@ -111,7 +111,7 @@ $header
- +
{$lng['customer']['forwarders']}
{$overview['email_forwarders_used']} {$lng['panel']['used']}
@@ -125,7 +125,7 @@ $header
- +
{$lng['customer']['email_quota']}
{$overview['email_quota_used']} {$lng['panel']['used']}
@@ -140,7 +140,7 @@ $header
- +
{$lng['customer']['autoresponder']}
{$overview['email_autoresponder_used']} {$lng['panel']['used']}
@@ -155,7 +155,7 @@ $header
- +
{$lng['aps']['numberofapspackages']}
{$overview['aps_packages_used']} {$lng['panel']['used']}
@@ -169,7 +169,7 @@ $header
- +
{$lng['customer']['ftps']}
{$overview['ftps_used']} {$lng['panel']['used']}
@@ -183,7 +183,7 @@ $header
- +
{$lng['customer']['tickets']}
{$overview['tickets_used']} {$lng['panel']['used']}
@@ -194,6 +194,7 @@ $header
+

System Information

diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index d3b7f181..c184bd25 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -363,6 +363,9 @@ aside.right { right:36px; font-size:80%; } +.overviewsearch input[type="text"] { + width: 150px; +} .overviewadd { padding:10px; @@ -834,6 +837,7 @@ select[multiple="multiple"] { -webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1); -moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1); box-shadow:inset 0 1px 2px rgba(0,0,0,0.1); + text-align: center; } .progress .bar { width:1px; @@ -908,12 +912,16 @@ label.nobr { /* CANVAS STUFF */ .canvasitems { - margin: 0 auto; - text-align: center; + position:relative; + overflow:hidden; + width:100%; + margin-top:10px; + margin-bottom:10px; + padding: 0 0 0 10px; } .canvasbox { - width: 130px !important; - margin: 10px; + width: 130px; + margin: 10px 20px 10px 0; text-align: center; float: left; height: 150px; diff --git a/templates/Sparkle/assets/js/circular.js b/templates/Sparkle/assets/js/circular.js index e5653b98..f39e87c7 100644 --- a/templates/Sparkle/assets/js/circular.js +++ b/templates/Sparkle/assets/js/circular.js @@ -1,4 +1,44 @@ +(function($,sr){ + var debounce = function (func, threshold, execAsap) { + var timeout; + + return function debounced () { + var obj = this, args = arguments; + function delayed () { + if (!execAsap) + func.apply(obj, args); + timeout = null; + }; + + if (timeout) + clearTimeout(timeout); + else if (execAsap) + func.apply(obj, args); + + timeout = setTimeout(delayed, threshold || 100); + }; + } + // smartresize + jQuery.fn[sr] = function(fn){ return fn ? this.bind('resize', debounce(fn)) : this.trigger(sr); }; + +})(jQuery,'smartresize'); + + +$(window).smartresize(function(){ + resizecanvas(); +}); + +function resizecanvas() { + var divwidth = $('#statsbox').width(); + var space = divwidth % 150; + var elementspl = (divwidth - space) / 150; + var elementwidth = 130 + Math.round(space / elementspl) - 1; + $(".canvasbox").animate({width: elementwidth}, 500); +} + $(document).ready(function() { + resizecanvas(); + var usedColor = "#91c46b"; var assiColor = "#287e7e"; var unliColor = "#56606e"; diff --git a/templates/Sparkle/customer/index/index.tpl b/templates/Sparkle/customer/index/index.tpl index 876201b9..3876c4ae 100644 --- a/templates/Sparkle/customer/index/index.tpl +++ b/templates/Sparkle/customer/index/index.tpl @@ -5,11 +5,11 @@ $header {$lng['panel']['dashboard']} -
+
- +
{$lng['customer']['subdomains']}
{$userinfo['subdomains_used']} {$lng['panel']['used']}
@@ -23,7 +23,7 @@ $header
- +
{$lng['customer']['diskspace']}
{$userinfo['diskspace_used']} {$lng['panel']['used']}
@@ -37,7 +37,7 @@ $header
- +
{$lng['customer']['traffic']}
{$userinfo['traffic_used']} {$lng['panel']['used']}
@@ -51,7 +51,7 @@ $header
- +
{$lng['customer']['emails']}
{$userinfo['emails_used']} {$lng['panel']['used']}
@@ -65,7 +65,7 @@ $header
- +
{$lng['customer']['accounts']}
{$userinfo['email_accounts_used']} {$lng['panel']['used']}
@@ -79,7 +79,7 @@ $header
- +
{$lng['customer']['forwarders']}
{$userinfo['email_forwarders_used']} {$lng['panel']['used']}
@@ -93,7 +93,7 @@ $header
- +
{$lng['customer']['email_quota']}
{$userinfo['email_quota_used']} {$lng['panel']['used']}
@@ -107,7 +107,7 @@ $header
- +
{$lng['customer']['autoresponder']}
{$userinfo['email_autoresponder_used']} {$lng['panel']['used']}
@@ -121,7 +121,7 @@ $header
- +
{$lng['customer']['mysqls']}
{$userinfo['mysqls_used']} {$lng['panel']['used']}
@@ -135,7 +135,7 @@ $header
- +
{$lng['customer']['ftps']}
{$userinfo['ftps_used']} {$lng['panel']['used']}
@@ -149,7 +149,7 @@ $header
- +
{$lng['aps']['numberofapspackages']}
{$userinfo['aps_packages_used']} {$lng['panel']['used']}
@@ -163,7 +163,7 @@ $header
- +
{$lng['customer']['tickets']}
{$userinfo['tickets_used']} {$lng['panel']['used']}