diff --git a/rpimonitor/rpimonitord.conf b/rpimonitor/rpimonitord.conf index dcbc741..606a639 100644 --- a/rpimonitor/rpimonitord.conf +++ b/rpimonitor/rpimonitord.conf @@ -69,6 +69,7 @@ distribution=/etc/os-release=PRETTY_NAME.\"(.*)\" firmware_version=false=(.*) kernel_version=uname -msr=(.*) revision=false=(.*) +processor=/proc/cpuinfo=Processor\s+: (.*) memory_total=/proc/meminfo=MemTotal:\s+(\d+) swap_total=/proc/meminfo=SwapTotal:\s+(\d+) sdcard_root_total=df -t ext4=root\s+(\d+) diff --git a/rpimonitor/web/css/rpimonitor.css b/rpimonitor/web/css/rpimonitor.css index 773078d..a83b2be 100644 --- a/rpimonitor/web/css/rpimonitor.css +++ b/rpimonitor/web/css/rpimonitor.css @@ -66,7 +66,7 @@ code { font-size: 80%; } -/* FROM RASPCONTROL +/* -------------------------------------------------- */ .reportIcon { float: left; diff --git a/rpimonitor/web/js/rpimonitor.js b/rpimonitor/web/js/rpimonitor.js index 4d6d6fa..bded73e 100644 --- a/rpimonitor/web/js/rpimonitor.js +++ b/rpimonitor/web/js/rpimonitor.js @@ -2,7 +2,8 @@ var animate; var shellinabox; var shellinaboxport; var statusautorefresh; -var refreshtimer; +var refreshTimerId; +var clickId; var firstload=true; function SetProgressBarAnimate(){ @@ -75,21 +76,21 @@ $(function () { ''+ ''+ ''+ '