Add processor info and cleanup licencs and about

Author: XavierBerger

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+)

rpimonitor/web/css/rpimonitor.css

@@ -66,7 +66,7 @@ code {
   font-size: 80%;
 }
 
-/* FROM RASPCONTROL
+/*
 -------------------------------------------------- */
 .reportIcon {
   float: left;

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 () {
         '</div>'+
         '<div class="modal-body">'+
           'This program is free software: you can redistribute it and/or modify<br>'+
-          'it under the terms of the GNU General Public License as published by<br>'+
-          'the Free Software Foundation, either version 3 of the License, or<br>'+
+          'it under the terms of the GNU General Public License as published<br>'+ 
+          'by the Free Software Foundation, either version 3 of the License, or<br>'+
           '(at your option) any later version.<br>'+
           '<br>'+
-          'This program is distributed in the hope that it will be useful,<br>'+
-          'but WITHOUT ANY WARRANTY; without even the implied warranty of<br>'+
-          'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the<br>'+
-          'GNU General Public License for more details.<br>'+
+          'This program is distributed in the hope that it will be useful,i but<br>'+
+          'WITHOUT ANY WARRANTY; without even the implied warranty of<br>'+
+          'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.<br>'+
+          'See the GNU General Public License for more details.<br>'+
           '<br>'+
           'You should have received a copy of the GNU General Public License<br>'+
           'along with this program.  If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.'+
           '</p>'+
           '<hr>'+
-          'RPi-Monitor is using third party software hava there own license.<br>'+
-          'Ref. <a href="#About" data-dismiss="modal" data-toggle="modal">About</a> to have the list of software used by RPi-Monitor. '+
+          '<b>RPi-Monitor</b> is using third party software hava there own license.<br>'+
+          'Ref. <a href="#About" data-dismiss="modal" data-toggle="modal">About</a> to have the list of software used by <b>RPi-Monitor</b>. '+
         '</div>'+
         '<div class="modal-footer">'+
           '<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>'+
@@ -108,9 +109,8 @@ $(function () {
           '<p><b>Version</b>: {DEVELOPMENT} '+
           '<b>by</b> Xavier Berger <a href="http://rpi-experiences.blogspot.fr/">Blog</a> <a href="https://github.com/XavierBerger/RPi-Monitor">GitHub</a></p>'+
           '<hr>'+
-          '<p><b>RPi-Monitor</b> is free software developped on top of other open source'+
+          '<p><b>RPi-Monitor</b> is free software developped on top of other open source '+
             'tools : <a href="http://twitter.github.io/bootstrap/">bootstrap</a>, <a href="http://jquery.com/">jquery</a>, <a href="https://code.google.com/p/jsqrencode/">jsqrencode</a> and <a href="http://javascriptrrd.sourceforge.net/">javascriptrrd</a>.<br>'+
-            'The look and feel of the status page is clearly inspired by <a href="https://github.com/Bioshox/Raspcontrol">Raspcontrol</a>.</p>'+
           '<p><b>Raspberry Pi</b> and Raspberry Pi logo are properties of <a href="http://www.raspberrypi.org/">Raspberry Pi Fundation</a>.</p>'+
         '</div>'+
         '<div class="modal-footer">'+
@@ -173,7 +173,7 @@ $(function () {
                       '<li><a href="#About" data-toggle="modal">About</a></li>'+
                       '<li class="divider"></li>'+
                       '<li class="nav-header">Related links</li>'+
-                      '<li><a href="http://rpi-experiences.blogspot.fr/">RPi-experiences</a></li>'+
+                      '<li><a href="http://rpi-experiences.blogspot.fr/">RPi-Experiences</a></li>'+
                       '<li><a href="https://github.com/XavierBerger/RPi-Monitor">RPi-Monitor</a></li>'+
                     '</ul>'+
                   '</li>'+
@@ -245,10 +245,12 @@ $(function () {
     localStorage.setItem('statusautorefresh', statusautorefresh);
     if ( statusautorefresh ) {
       UpdateStatus(); 
-      refreshtimer = setInterval( UpdateStatus , 10000 ) 
+      refreshTimerId = setInterval( UpdateStatus , 10000 ) 
+      clockId=setInterval(clock,1000);
     }
     else {
-      clearInterval(refreshtimer);
+      clearInterval(refreshTimerId);
+      clearInterval(clockId);
     };
   });
 

rpimonitor/web/js/rpimonitor.status.js

@@ -38,8 +38,9 @@ function UpdateStatus () {
     uptimetext += "<b>" + pad(seconds) +"</b> seconds<p>"
     $('#uptimeText').html(uptimetext);
 
-    // temperature
+    // version
     versionText="";
+    if ( data.processor ) {  versionText+="<p>Processor: <b>" + data.processor + "</b></p>"}
     if ( data.distribution ) {  versionText+="<p>Distribtion: <b>" + data.distribution + "</b></p>"}
     if ( data.kernel_version ) {  versionText+="<p>Kernel version: <b>" + data.kernel_version + "</b></p>"}
     if ( data.firmware_version ) {  versionText+="<p>Firmvare version: <b>" + data.firmware_version + "</b></p>"}
@@ -124,11 +125,10 @@ $(function () {
   /* Start status update*/
   UpdateStatus();
   if ( statusautorefresh ) { 
-    refreshtimer = setInterval( UpdateStatus , 10000 ) 
+    refreshTimerId = setInterval( UpdateStatus , 10000 ) 
+    clockId=setInterval(clock,1000);
   }
 
-  setInterval(clock,1000);
-  
 });