Listing WEBSITES should show their space usage.

Author: usmannasir

websiteFunctions/templates/websiteFunctions/listWebsites.html

@@ -77,9 +77,9 @@ <h2 style="display: inline; color: #414C59;" ng-bind="web.domain"></h2>
                     <div class="col-md-12">
 
                         <div class="col-md-4 content-box-header">
-                            <i class="p fa fa-envelope btn-icon text-muted" data-toggle="tooltip" data-placement="right"
+                            <i class="p fa fa-hdd-o btn-icon text-muted" data-toggle="tooltip" data-placement="right"
                                title="Email">&emsp;</i>
-                            <span ng-bind="web.adminEmail" style="text-transform: none"></span>
+                            <span ng-bind="web.diskUsed" style="text-transform: none"></span>
                         </div>
 
                         <div class="col-md-4 content-box-header">

websiteFunctions/website.py

@@ -2084,8 +2084,11 @@ def findWebsitesJson(self, currentACL, userID, pageNumber):
                 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)