From: horse69 <horse69@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 31 May 2012 23:44:21 +0000 (+0000)
Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@528 01035d8c-6547-0410-b346-abe4f9... 
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=563a678b1db651ada1a52106a4c946d31203721c;p=freetel-svn-tracking.git

git-svn-id: https://svn.code.sf.net/p/freetel/code@528 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/mini-asterisk-gui2/system.html b/mini-asterisk-gui2/system.html
index 19fb279a..d57db73f 100644
--- a/mini-asterisk-gui2/system.html
+++ b/mini-asterisk-gui2/system.html
@@ -21,7 +21,47 @@
   <table align="center" width=800>
   <tr>
     <td><div id="menu"></div></td>
-    <td><div id="system"></div></td>
+    <td><div id="system"></div>
+        <table align="right" width=600>
+           <tr><td colspan="3" align="left" valign="top"><h2>System</h2></td></tr>
+           <tr><td colspan="2"></td></tr>
+
+           <tr><td colspan="2">cat /proc/version</td></tr>
+           <tr><td div id="version" style="border: 1px solid ;"></div></td></tr>
+           <tr><td>&nbsp</td></tr>
+
+           <tr><td colspan="2">cat /proc/loadavg</td></tr>
+           <tr><td div id="loadavg" style="border: 1px solid ;"></div></td></tr>
+           <tr><td>&nbsp</td></tr>
+
+           <tr><td colspan="2">cat /proc/cpuinfo</td></tr>
+           <tr><td div id="cpuinfo" style="border: 1px solid ;"></div></td></tr>
+           <tr><td>&nbsp</td></tr>
+
+           <tr><td colspan="2">cat /proc/mtd</td></tr>
+           <tr><td div id="mtd" style="border: 1px solid ;"></div></td></tr>
+           <tr><td>&nbsp</td></tr>
+
+           <tr><td colspan="2">cat /proc/meminfo</td></tr>
+           <tr><td div id="meminfo" style="border: 1px solid ;"></div></td></tr>
+           <tr><td>&nbsp</td></tr>
+
+           <tr><td colspan="2">cat /proc/yaffs</td></tr>
+           <tr><td div id="yaffs" style="border: 1px solid ;"></div></td></tr>
+           <tr><td>&nbsp</td></tr>
+
+           <tr><td colspan="2">uptime</td></tr>
+           <tr><td div id="uptime" style="border: 1px solid ;"></div></td></tr>
+           <tr><td>&nbsp</td></tr>
+
+           <tr><td colspan="2">ipkg list_installed</td></tr>
+           <tr><td div id="installed" style="border: 1px solid ;"></div></td></tr>
+           <tr><td>&nbsp</td></tr>
+
+           </table>
+
+
+    </td>
   </tr>
 
   </table>
diff --git a/mini-asterisk-gui2/system.js b/mini-asterisk-gui2/system.js
index db29ef40..f8b01bb0 100644
--- a/mini-asterisk-gui2/system.js
+++ b/mini-asterisk-gui2/system.js
@@ -21,47 +21,9 @@ function initialise() {
 
 
 function initialisePage() {
-    // 
-    
-    var icon = '<img src="tick.png" alt="Analog Phone OK" />';
-    var html = '';
 
-    html += '<table align="right" width=600>';
 
-    // print out info
-
-    html += '<tr><td colspan="3" align="left" valign="top"><h2>System</h2></td></tr>';
-    html += '<tr><td colspan="2">Display results of the following shell commands</td></tr>';
-
-    html += '<tr><td colspan="2">cat /proc/version</td></tr>' ;
-    html += '<tr><td div id="version"></div></td></tr>';
-
-    html += '<tr><td colspan="2">cat /proc/loadavg</td></tr>';
-    html += '<tr><td div id="loadavg"></div></td></tr>';
-
-    html += '<tr><td colspan="2">cat /proc/cpuinfo</td></tr>';
-    html += '<tr><td div id="cpuinfo"></div></td></tr>';
-
-    html += '<tr><td colspan="2">cat /proc/mtd</td></tr>';
-    html += '<tr><td div id="mtd"></div></td></tr>';
-
-    html += '<tr><td colspan="2">cat /proc/meminfo</td></tr>';
-    html += '<tr><td div id="meminfo"></div></td></tr>';
-
-    html += '<tr><td colspan="2">cat /proc/yaffs</td></tr>';
-    html += '<tr><td div id="yaffs"></div></td></tr>';
-
-    html += '<tr><td colspan="2">uptime</td></tr>';
-    html += '<tr><td div id="uptime"></div></td></tr>';
-
-    html += '<tr><td colspan="2">ipkg list_installed</td></tr>';
-    html += '<tr><td div id="installed"></div></td></tr>';
-
-    html += '<tr><td>&nbsp</td></tr>';
- 
-    html += '</table>';
-
-    document.getElementById("system").innerHTML += html;
+//    document.getElementById("system").innerHTML += html;
 
 }
 
@@ -134,7 +96,7 @@ function loadinstalled(doc, status) {
 
 	document.getElementById('installed').innerHTML = doc.substr(0, doc.length);
 
-//	downloadUrl("/cgi-bin/catproc.cgi?arg=cpuinfo", loadCPUinfo);
+//	end of script cascade
 }