Fix cutom addon source page issue. Update top3 addons.

XavierBerger · Jan 4, 2015 · b088d7c · b088d7c
1 parent 4825125
commit b088d7c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/rpimonitor/template/cpu.conf b/rpimonitor/template/cpu.conf
@@ -37,7 +37,7 @@ web.status.1.content.1.icon=cpu.png
 web.status.1.content.1.line.1=JustGageBar("Load", "1min", 0, data.load1, 3, 100, 80)+" "+JustGageBar("Load", "5min", 0, data.load5, 3, 100, 80)+" "+JustGageBar("Load", "15min", 0, data.load15, 3, 100, 80)
 web.status.1.content.1.line.2="CPU frequency: <b>" + data.cpu_frequency + "MHz</b> Voltage: <b>" + data.cpu_voltage + "V</b>"
 web.status.1.content.1.line.3="Scaling governor: <b>" + data.scaling_governor + "</b>"
-web.status.1.content.1.line.4=InsertHTML("/addons/top3/top3.html")
+#web.status.1.content.1.line.4=InsertHTML("/addons/top3/top3.html")
 
 web.statistics.1.content.1.name=CPU Loads
 web.statistics.1.content.1.graph.1=load1

diff --git a/rpimonitor/web/addons/custom/custom.js b/rpimonitor/web/addons/custom/custom.js
@@ -38,7 +38,7 @@ $(function () {
     localStorage.setItem('customwarning'+activePage, customwarning);
   });
 
-  customuri=(localStorage.getItem('customuri'+activePage) || '/addons/custom/custominfo.html');
+  customuri=(localStorage.getItem('customuri'+activePage) || data[activePage].url || '/addons/custom/custominfo.html');
   $('#customuri'+activePage).val(customuri);
   $('#customuri'+activePage).keyup(function(){
     customuri = $('#customuri'+activePage).val();

diff --git a/rpimonitor/web/addons/top3/top3.html b/rpimonitor/web/addons/top3/top3.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link href="/css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body bgcolor="#E6E6FA">
+  <div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title">Top3 addons</h3>
+  </div>
+  <div class="panel-body">
+    <b>Top3</b> is design show the 3 process consuming the CPU time of
+    CPU in addition to cunsumption of <code>rpimonitord</code> process.<br>
+    <br> 
+    To activate this addon, copy <code>/usr/share/rpimonitor/web/addons/top3.cron</code> 
+    to <code>/etc/cron.d/top3</code>.<br>
+    <br>
+    Adding the top3 information into status page can be done by uncommenting 
+    the following line into <code>cpu.conf</code><br>
+    <code>#web.status.1.content.1.line.4=InsertHTML("/addons/top3/top3.html")</code>
+  </div>
+</body>
+</html>
+