diff --git a/websiteFunctions/templates/websiteFunctions/listWebsites.html b/websiteFunctions/templates/websiteFunctions/listWebsites.html index a0f37c3eb..bb62e0ec9 100755 --- a/websiteFunctions/templates/websiteFunctions/listWebsites.html +++ b/websiteFunctions/templates/websiteFunctions/listWebsites.html @@ -77,9 +77,9 @@
- - +
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 90b913ad7..05956feaf 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -2084,8 +2084,11 @@ IdentityFile /home/%s/.ssh/%s state = "Suspended" else: state = "Active" + + diskUsed = "%sMB" % str(virtualHostUtilities.getDiskUsage("/home/" + items.domain, items.package.diskSpace)[0]) + dic = {'domain': items.domain, 'adminEmail': items.adminEmail, 'ipAddress': ipAddress, - 'admin': items.admin.userName, 'package': items.package.packageName, 'state': state} + 'admin': items.admin.userName, 'package': items.package.packageName, 'state': state, 'diskUsed': diskUsed} if checker == 0: json_data = json_data + json.dumps(dic)