diff --git a/baseTemplate/static/baseTemplate/custom-js/system-status.js b/baseTemplate/static/baseTemplate/custom-js/system-status.js index bb03a3148..e0ca09fb0 100644 --- a/baseTemplate/static/baseTemplate/custom-js/system-status.js +++ b/baseTemplate/static/baseTemplate/custom-js/system-status.js @@ -58,7 +58,7 @@ app.filter('getwebsitename', function() { app.controller('systemStatusInfo', function($scope,$http,$timeout) { - getStuff(); + //getStuff(); function getStuff() { @@ -109,10 +109,10 @@ app.controller('adminController', function($scope,$http,$timeout) { $("#serverIPAddress").text(response.data.serverIPAddress); - if (response.data.admin_type != "Administrator") + if (response.data.admin_type !== "Administrator") { - if(response.data.admin_type != "Reseller") { + if(response.data.admin_type !== "Reseller") { $("#normalUser").hide(); $("#normalUserA").hide(); $("#normalUserB").hide(); @@ -140,6 +140,7 @@ app.controller('adminController', function($scope,$http,$timeout) { $("#createWebsite").hide(); $("#modifyWebSite").hide(); $("#deleteWebsite").hide(); + $("#versionManagement").hide(); } } @@ -156,7 +157,7 @@ app.controller('adminController', function($scope,$http,$timeout) { app.controller('loadAvg', function($scope,$http,$timeout) { - getStuff(); + //getStuff(); function getStuff() { @@ -179,7 +180,7 @@ app.controller('loadAvg', function($scope,$http,$timeout) { console.log("not good"); } - $timeout(getStuff, 2000); + //$timeout(getStuff, 2000); } }); diff --git a/baseTemplate/templates/baseTemplate/homePage.html b/baseTemplate/templates/baseTemplate/homePage.html index b5a8fdbac..d80685b3b 100644 --- a/baseTemplate/templates/baseTemplate/homePage.html +++ b/baseTemplate/templates/baseTemplate/homePage.html @@ -89,70 +89,6 @@ -
- -
- -
-

- {% trans "HTTP Statistics" %} -

- - -
-
-
- {$ Avail $}/{$ MAXCONN $} -
- {% trans "Available/Max Connections" %} -
-
-
- - - -
-
- {$ AvailSSL $}/{$ MAXSSL $} -
- {% trans "Available/Max SSL Connections" %} -
-
-
- -
-
- {$ RequestProcessing $} -
- {% trans "Requests Processing" %} -
-
-
- -
-
- {$ TotalRequests $} -
- {% trans "Total Requests" %} -
-
-
- -
- - -
-
- - - - - -
- - - - diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index 4150a87fb..1bf74b1f9 100755 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -86,10 +86,7 @@
- - {% trans "CPU Status" %} - - +