diff --git a/baseTemplate/templates/baseTemplate/homePage.html b/baseTemplate/templates/baseTemplate/homePage.html index d9bccef1f..a796570d0 100755 --- a/baseTemplate/templates/baseTemplate/homePage.html +++ b/baseTemplate/templates/baseTemplate/homePage.html @@ -65,7 +65,47 @@ - + + {% if admin %} +
+
+ +
+
{% trans "CPU Usage" %}
+
+ {$ cpuUsage $}% +
+
+
+
+
+
+ +
+
{% trans "Ram Usage" %}
+
+ {$ ramUsage $}% +
+
+
+
+
+
+ +
+
{% trans "Disk Usage '/'" %}
+
+ {$ diskUsage $}% +
+
+
+
+
+
+
+
+ {% endif %} +
@@ -168,265 +208,6 @@ }); - -
-
-

- {% trans "Available Functions" %} -

- -
-
-
- -
- {% trans "Users" %} -
-
- -
- -
- -
- -
- {% trans "Websites" %} -
-
- -
- -
- -
- -
- {% trans "Packages" %} -
-
- -
- -
- -
- -
- {% trans "Databases" %} -
-
- -
- -
- -
- -
- {% trans "DNS" %} -
-
- -
- -
- -
- -
- {% trans "FTP" %} -
-
- -
- -
- -
- -
- {% trans "Backup" %} -
-
- -
- -
- -
- -
- {% trans "Emails" %} -
-
- -
- -
- -
- -
- {% trans "SSL" %} -
-
- -
- -
- - {% if admin %} - -
- -
- {% trans "Status" %} -
-
- -
- -
- -
- -
- {% trans "PHP" %} -
-
- -
- -
- -
- -
- {% trans "Logs" %} -
-
- -
- -
- -
- -
- {% trans "Security" %} -
-
- -
- -
- - {% endif %} - - -
-
- -
- -
- - - {% if admin %} -
-
-

- {% trans "Resources" %} -

- -
- -
-
-
-

- {% trans "CPU Usage" %} -

-
-
-
-
- {$ cpuUsage $}% -
-
-
-
-
-
-
-
-
-
- -
-
-

- {% trans "Ram Usage" %} -

-
-
-
-
- {$ ramUsage $}% -
-
-
-
-
-
-
-
-
-
- -
-
-

- {% trans "Disk Usage '/'" %} -

-
-
-
-
- {$ diskUsage $}% -
-
-
-
-
-
-
-
-
-
- -
- -
-
-
- {% endif %} - -
diff --git a/baseTemplate/views.py b/baseTemplate/views.py index beec8126e..f4e8c1457 100755 --- a/baseTemplate/views.py +++ b/baseTemplate/views.py @@ -426,6 +426,8 @@ def RestartCyberPanel(request): def getDashboardStats(request): try: + val = request.session['userID'] + currentACL = ACLManager.loadedACL(val) total_sites = Websites.objects.count() total_wp_sites = WPSites.objects.count() total_dbs = Databases.objects.count() @@ -443,6 +445,8 @@ def getDashboardStats(request): def getTrafficStats(request): try: + val = request.session['userID'] + currentACL = ACLManager.loadedACL(val) # Get network stats from /proc/net/dev (Linux) rx = tx = 0 with open('/proc/net/dev', 'r') as f: @@ -464,6 +468,8 @@ def getTrafficStats(request): def getDiskIOStats(request): try: + val = request.session['userID'] + currentACL = ACLManager.loadedACL(val) # Parse /proc/diskstats for all disks read_sectors = 0 write_sectors = 0 @@ -491,6 +497,8 @@ def getDiskIOStats(request): def getCPULoadGraph(request): try: + val = request.session['userID'] + currentACL = ACLManager.loadedACL(val) # Parse /proc/stat for the 'cpu' line with open('/proc/stat', 'r') as f: for line in f: