rbrindley: branch rbrindley/welcome_revamp r4242 - in /team/rbrindley/welcome...

SVN commits to the Asterisk-GUI project asterisk-gui-commits at lists.digium.com
Mon Dec 1 10:14:35 CST 2008


Author: rbrindley
Date: Mon Dec  1 10:14:34 2008
New Revision: 4242

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4242
Log:
relocated localajaxinit function in js/sysinfo.js to sysinfo.html to prepare for js/sysinfo.js inclusion in welcome2.html

Modified:
    team/rbrindley/welcome_revamp/config/js/sysinfo.js
    team/rbrindley/welcome_revamp/config/sysinfo.html

Modified: team/rbrindley/welcome_revamp/config/js/sysinfo.js
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/welcome_revamp/config/js/sysinfo.js?view=diff&rev=4242&r1=4241&r2=4242
==============================================================================
--- team/rbrindley/welcome_revamp/config/js/sysinfo.js (original)
+++ team/rbrindley/welcome_revamp/config/js/sysinfo.js Mon Dec  1 10:14:34 2008
@@ -59,85 +59,3 @@
 	_$('hostname').innerHTML =_$('si_hostname').innerHTML;
 	$('#tabbedMenu').find('A:eq(0)').click();
 }
-
-var localajaxinit = function(){
-	top.document.title = 'System Information' ;
-	parent.ASTGUI.dialog.waitWhile('Loading system Information ...');
-
-	(function(){
-		var t = [{	url:'#',
-				desc:'General',
-				click_function: function(){
-					$('.hideall').hide();
-					$('#osversion_div').show();
-					$('#uptime_div').show();
-					$('#asterisk_div').show();
-					$('#today_div').show();
-					$('#hostname_div').show();
-				}
-			},{	url: '#',
-				desc: 'Network',
-				click_function: function(){
-					$('.hideall').hide();
-					ASTGUI.systemCmdWithOutput( 'ifconfig' , function(output){
-						_$('ifconfig').innerHTML = '<pre>' + output +'</pre>' ;
-						$('.hideall').hide();
-						$('#ifconfig_div').show();
-					});
-				}
-			},{	url: '#',
-				desc: 'Disk Usage',
-				click_function: function(){
-					$('.hideall').hide();
-					ASTGUI.systemCmdWithOutput( 'df -k' , function(output){
-						_$('diskusage').innerHTML = '<pre>' + output +'</pre>';
-						if(parent.sessionData.PLATFORM.isAA50) {
-							try{
-								percentage_usage(output);
-							}catch(err){
-								ASTGUI.Log.Debug( '<B>Error Trying to calculate CF usage %');
-							}
-						}
-						$('.hideall').hide();
-						$('#df_div').show();
-					});
-				}
-			},{	url: '#',
-				desc: 'Memory Usage',
-				click_function: function(){
-					$('.hideall').hide();
-					ASTGUI.systemCmdWithOutput( 'free' , function(free){
-						_$('memoryusage').innerHTML = '<pre>' + free +'</pre>';
-						$('.hideall').hide();
-						$('#memory_div').show();
-					});
-				}
-			}];
-		if( parent.sessionData.PLATFORM.isAA50 ) {
-			t.push({	url:'#',
-					desc:'S800i Config',
-					click_function: function(){
-						$('.hideall').hide();
-						ASTGUI.systemCmdWithOutput( 's800iconfig' , function(output){
-							_$('s800i_config').innerHTML = '<PRE>' + output.replace(/S800i Product Configuration/, '') + '</PRE>';
-							$('.hideall').hide();
-							$('#s800i_div').show();
-						});
-					}
-				});
-			t.push({	url:'#',
-					desc:'DHCP Leases',
-					click_function: function(){
-						$('.hideall').hide();
-						ASTGUI.systemCmdWithOutput( 'dhcp_dump' , function(output){
-							$('#s800i_dhcpClients_output').html('<PRE>' + output + '</PRE>');
-							$('.hideall').hide();
-							$('#s800i_dhcpClients_div').show();
-						});
-					}
-				});
-		}
-		ASTGUI.tabbedOptions( _$('tabbedMenu') , t );
-	})();
-	parent.ASTGUI.systemCmd( top.sessionData.directories.script_SysInfo, function(){ parent.ASTGUI.dialog.hide(); getsysinfohtml(); } );
-}

Modified: team/rbrindley/welcome_revamp/config/sysinfo.html
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/welcome_revamp/config/sysinfo.html?view=diff&rev=4242&r1=4241&r2=4242
==============================================================================
--- team/rbrindley/welcome_revamp/config/sysinfo.html (original)
+++ team/rbrindley/welcome_revamp/config/sysinfo.html Mon Dec  1 10:14:34 2008
@@ -22,6 +22,90 @@
 <script src="js/jquery.js"></script>
 <script src="js/astman.js"></script>
 <script src="js/sysinfo.js"></script>
+<script type="text/javascript">
+var localajaxinit = function(){
+	top.document.title = 'System Information' ;
+	parent.ASTGUI.dialog.waitWhile('Loading system Information ...');
+
+	(function(){
+		var t = [{	url:'#',
+				desc:'General',
+				click_function: function(){
+					$('.hideall').hide();
+					$('#osversion_div').show();
+					$('#uptime_div').show();
+					$('#asterisk_div').show();
+					$('#today_div').show();
+					$('#hostname_div').show();
+				}
+			},{	url: '#',
+				desc: 'Network',
+				click_function: function(){
+					$('.hideall').hide();
+					ASTGUI.systemCmdWithOutput( 'ifconfig' , function(output){
+						_$('ifconfig').innerHTML = '<pre>' + output +'</pre>' ;
+						$('.hideall').hide();
+						$('#ifconfig_div').show();
+					});
+				}
+			},{	url: '#',
+				desc: 'Disk Usage',
+				click_function: function(){
+					$('.hideall').hide();
+					ASTGUI.systemCmdWithOutput( 'df -k' , function(output){
+						_$('diskusage').innerHTML = '<pre>' + output +'</pre>';
+						if(parent.sessionData.PLATFORM.isAA50) {
+							try{
+								percentage_usage(output);
+							}catch(err){
+								ASTGUI.Log.Debug( '<B>Error Trying to calculate CF usage %');
+							}
+						}
+						$('.hideall').hide();
+						$('#df_div').show();
+					});
+				}
+			},{	url: '#',
+				desc: 'Memory Usage',
+				click_function: function(){
+					$('.hideall').hide();
+					ASTGUI.systemCmdWithOutput( 'free' , function(free){
+						_$('memoryusage').innerHTML = '<pre>' + free +'</pre>';
+						$('.hideall').hide();
+						$('#memory_div').show();
+					});
+				}
+			}];
+		if( parent.sessionData.PLATFORM.isAA50 ) {
+			t.push({	url:'#',
+					desc:'S800i Config',
+					click_function: function(){
+						$('.hideall').hide();
+						ASTGUI.systemCmdWithOutput( 's800iconfig' , function(output){
+							_$('s800i_config').innerHTML = '<PRE>' + output.replace(/S800i Product Configuration/, '') + '</PRE>';
+							$('.hideall').hide();
+							$('#s800i_div').show();
+						});
+					}
+				});
+			t.push({	url:'#',
+					desc:'DHCP Leases',
+					click_function: function(){
+						$('.hideall').hide();
+						ASTGUI.systemCmdWithOutput( 'dhcp_dump' , function(output){
+							$('#s800i_dhcpClients_output').html('<PRE>' + output + '</PRE>');
+							$('.hideall').hide();
+							$('#s800i_dhcpClients_div').show();
+						});
+					}
+				});
+		}
+		ASTGUI.tabbedOptions( _$('tabbedMenu') , t );
+	})();
+	parent.ASTGUI.systemCmd( top.sessionData.directories.script_SysInfo, function(){ parent.ASTGUI.dialog.hide(); getsysinfohtml(); } );
+}
+</script>
+
 <link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
 <style type="text/css">
 




More information about the asterisk-gui-commits mailing list