add contract/expand icons, small fixes

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.

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 = ['*']
 

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");
     });
-});
+});

templates/main.html

@@ -61,12 +61,10 @@
         
         <div class="span3">
          <div class="widget widget-table action-table">
-            <div class="widget-header"> <i class="icon-info-sign"></i>
-              <h3>General Info</h3>
-              
+            <div class="widget-header"> <i class="icon-dashboard"></i>
+              <h3>General Info</h3><i class="icon-minus"></i>
               <div id="refresh-os">
               </div>
-                
             </div>
             <!-- /widget-header -->
             <div class="widget-content">
@@ -87,8 +85,8 @@
         
         <div class="span3">
          <div class="widget widget-table action-table">
-            <div class="widget-header"> <i class="icon-info-sign"></i>
-              <h3>CPU Usage %</h3>
+            <div class="widget-header"> <i class="icon-check"></i>
+              <h3>CPU Usage %</h3><i class="icon-minus"></i>
               <div id="refresh-cpu">
               </div>
             </div>
@@ -108,9 +106,8 @@
         
         <div class="span6">
          <div class="widget widget-nopad">
-            <div class="widget-header">
-                <i class="icon-list-alt"></i>
-                <h3>Memory Usage</h3>
+            <div class="widget-header"> <i class="icon-list-alt"></i>
+                <h3>Memory Usage</h3><i class="icon-minus"></i>
                 <div id="refresh-ram">
                 </div>
             </div>
@@ -130,7 +127,7 @@
          <div class="span6">
            <div class="widget widget-table action-table">
             <div class="widget-header"> <i class="icon-hdd"></i>
-              <h3>Disk Usage</h3>
+              <h3>Disk Usage</h3><i class="icon-minus"></i>
               <div id="refresh-df">
               </div>
             </div>
@@ -146,7 +143,7 @@
           <div class="span6">
             <div class="widget widget-table action-table">
             <div class="widget-header"> <i class="icon-bolt"></i>
-              <h3>Load Average</h3>
+              <h3>Load Average</h3><i class="icon-minus"></i>
               <div id="refresh-load">
               </div>
             </div>
@@ -167,8 +164,8 @@
       <div class="row">
     	<div class="span6">
            <div class="widget widget-table action-table">
-            <div class="widget-header"> <i class="icon-monitor"></i>
-              <h3>IP Adresses</h3>
+            <div class="widget-header"> <i class="icon-level-up"></i>
+              <h3>IP Adresses</h3><i class="icon-minus"></i>
               <div id="refresh-ip">
               </div>
             </div>
@@ -185,8 +182,8 @@
     
          <div class="span3">
            <div class="widget">
-            <div class="widget-header"> <i class="icon-monitor"></i>
-              <h3>Internet Traffic</h3>
+            <div class="widget-header"> <i class="icon-exchange"></i>
+              <h3>Internet Traffic</h3><i class="icon-minus"></i>
               <div id="refresh-ispeed">
               </div>
             </div>
@@ -207,8 +204,8 @@
          
          <div class="span3">
            <div class="widget">
-            <div class="widget-header"> <i class="icon-monitor"></i>
-              <h3>Disk Reads/Writes</h3>
+            <div class="widget-header"> <i class="icon-angle-up"></i>
+              <h3>Disk Reads/Writes</h3><i class="icon-minus"></i>
               <div id="refresh-diskio">
               </div>
             </div>
@@ -233,7 +230,7 @@
         <div class="span6">
              <div class="widget widget-table action-table">
                 <div class="widget-header"> <i class="icon-group"></i>
-                  <h3>Online</h3>
+                  <h3>Online</h3><i class="icon-minus"></i>
                   <div id="refresh-online">
                   </div>
                 </div>
@@ -250,7 +247,7 @@
         <div class="span6">
              <div class="widget widget-table action-table">
                 <div class="widget-header"> <i class="icon-angle-down"></i>
-                  <h3>Netstat</h3>
+                  <h3>Netstat</h3><i class="icon-minus"></i>
                   <div id="refresh-netstat">
                   </div>
                 </div>
@@ -270,8 +267,8 @@
       <div class="row">
         <div class="span12">
           <div class="widget">
-            <div class="widget-header"> <i class="icon-dashboard"></i>
-              <h3> Processes </h3>
+            <div class="widget-header"> <i class="icon-list-alt"></i>
+              <h3> Processes </h3><i class="icon-minus"></i>
               <div id="refresh-ps">
               </div>
             </div>