rbrindley: branch rbrindley/welcome_revamp r4244 - /team/rbrindley/welcome_re...

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Mon Dec  1 11:45:32 2008
New Revision: 4244

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4244
Log:
included js/sysinfo.js to welcome2.html, and removed some of the html for sysinfo

Modified:
    team/rbrindley/welcome_revamp/config/welcome2.html

Modified: team/rbrindley/welcome_revamp/config/welcome2.html
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/welcome_revamp/config/welcome2.html?view=diff&rev=4244&r1=4243&r2=4244
==============================================================================
--- team/rbrindley/welcome_revamp/config/welcome2.html (original)
+++ team/rbrindley/welcome_revamp/config/welcome2.html Mon Dec  1 11:45:32 2008
@@ -312,6 +312,7 @@
 <script type="text/javascript" src="js/jquery.tablesorter.pager.js"></script>
 <script type="text/javascript" src="js/astman.js"></script>
 <script type="text/javascript" src="js/welcome2.js"></script>
+<script type="text/javascript" src="js/sysinfo.js"></script>
 <script type="text/javascript">
 
  /* This function will be called when the page has completed loading */
@@ -349,6 +350,7 @@
 	setTimeout("loadAgents()", 1);
 	setTimeout("loadConferenceRooms()", 1);
 	setTimeout("loadParkingLot()", 1);
+	getsysinfohtml();
 
 	/* jQuery Tablesorter init */
 	/* this requires a rewrite of the loadExtensions and loadTrunks */
@@ -563,7 +565,6 @@
 					<ul class="ui-tabs-nav">
 						<li><a href="#info_general"><span>General</span></a></li>
 						<li><a href="#info_network"><span>Network</span></a></li>
-						<li><a href="#info_cpu"><span>CPU</span></a></li>
 						<li><a href="#info_memory"><span>Memory</span></a></li>
 						<li><a href="#info_disk"><span>Disk</span></a></li>
 					</ul>
@@ -575,11 +576,7 @@
 						<B>Uptime:</B> <div id="uptime" style="font-family:courier; font-size:10pt;"></div><BR>
 					</div>
 					<div id="info_network" class="ui-tabs-panel">
-						<B>Hostname:</B> <div id="hostname" style="font-family:courier; font-size:10pt;"></div><BR>
 						<div id="ifconfig" style="font-family:courier; font-size:9pt;overflow :auto;"></div>
-					</div>
-					<div id="info_cpu" class="ui-tabs-panel">
-						<B>Uptime:</B> <div id="uptime" style="font-family:courier; font-size:10pt;"></div><BR>
 					</div>
 					<div id="info_memory" class="ui-tabs-panel">
 						<B>Memory Usage:</B><div id="memoryusage" style="font-family:courier; font-size:9.5pt;"></div>