diff --git a/README.md b/README.md index 30c95bf..8b43a6f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -pyDash - v1.4.1 +pyDash - v1.4.2 ====== A small web-based monitoring dashboard for your linux pc/server writen in Python and Django + Chart.js. diff --git a/pydash/settings.py b/pydash/settings.py index face6fd..ade20e6 100644 --- a/pydash/settings.py +++ b/pydash/settings.py @@ -36,7 +36,7 @@ TIME_JS_REFRESH = 30000 TIME_JS_REFRESH_LONG = 120000 TIME_JS_REFRESH_NET = 2000 -VERSION = "1.4.1" +VERSION = "1.4.2" ALLOWED_HOSTS = ['*'] diff --git a/static/js/dashboard.js b/static/js/dashboard.js index 1a54f88..a2eb107 100644 --- a/static/js/dashboard.js +++ b/static/js/dashboard.js @@ -251,11 +251,11 @@ dashboard.getIps = function() { } //Expand-Contract div/table -jQuery(document).ready(function() { - jQuery(".widget-content").show(); - //toggle the componenet with class msg_body - jQuery(".widget-header").click(function() +$(document).ready(function() { + $(".widget-content").show(); + $(".widget-header").click(function() { - jQuery(this).next(".widget-content").slideToggle(500); + $(this).next(".widget-content").slideToggle(500); + $("i",this).toggleClass("icon-minus icon-plus"); }); -}); \ No newline at end of file +}); diff --git a/templates/main.html b/templates/main.html index 1362f5d..0d1859d 100644 --- a/templates/main.html +++ b/templates/main.html @@ -61,12 +61,10 @@
-
-

General Info

- +
+

General Info

-
@@ -87,8 +85,8 @@
-
-

CPU Usage %

+
+

CPU Usage %

@@ -108,9 +106,8 @@
-
- -

Memory Usage

+
+

Memory Usage

@@ -130,7 +127,7 @@
-

Disk Usage

+

Disk Usage

@@ -146,7 +143,7 @@
-

Load Average

+

Load Average

@@ -167,8 +164,8 @@
-
-

IP Adresses

+
+

IP Adresses

@@ -185,8 +182,8 @@
-
-

Internet Traffic

+
+

Internet Traffic

@@ -207,8 +204,8 @@
-
-

Disk Reads/Writes

+
+

Disk Reads/Writes

@@ -233,7 +230,7 @@
-

Online

+

Online

@@ -250,7 +247,7 @@
-

Netstat

+

Netstat

@@ -270,8 +267,8 @@
-
-

Processes

+
+

Processes