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

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Mon Dec  1 10:01:55 2008
New Revision: 4240

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4240
Log:
pulled the window onload function out of js/welcome2.js and into welcome2.html

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

Modified: team/rbrindley/welcome_revamp/config/js/welcome2.js
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/welcome_revamp/config/js/welcome2.js?view=diff&rev=4240&r1=4239&r2=4240
==============================================================================
--- team/rbrindley/welcome_revamp/config/js/welcome2.js (original)
+++ team/rbrindley/welcome_revamp/config/js/welcome2.js Mon Dec  1 10:01:55 2008
@@ -20,61 +20,6 @@
  */
 
 var REGISTRY_OUTPUT = { } ;
-
- /* This function will be called when the page has completed loading */
- $(document).ready(function() {
-
-	/* jQuery sortable init for content sections */
- 	$('#sysstat_right_container, #sysstat_left_container').sortable({
-		axis: 'y',
-		cancel: '.minimaxi',
-		cursor: 'move',
-		forcePlaceholderSize: true,
-		handle: 'div.handle',
-		items: '> div.content',
-		placeholder: 'placeholder'
-	});
-
-	/* jQuery tabs init */
-	$("#sys_status_info .body > ul").tabs();
-
-	/* Event Delegation */
-	$('body').click( $.delegate({
-		'.minimaxi': function (e) {
-			$(e.target).parent().parent().children(".body").toggle();
-			if ($(e.target).html() == "[ - ]") {
-				$(e.target).html("[ + ]");
-			} else {
-				$(e.target).html("[ - ]");
-			}
-		}
-	}));
-
-	setTimeout("loadTrunks()", 1);
-	loadExtensions();
-	setTimeout("loadQueues()", 1);
-	setTimeout("loadAgents()", 1);
-	setTimeout("loadConferenceRooms()", 1);
-	setTimeout("loadParkingLot()", 1);
-
-	/* jQuery Tablesorter init */
-	/* this requires a rewrite of the loadExtensions and loadTrunks */
-		$("#extensions_list").tablesorter({
-			cancelSelection: true,
-			cssAsc: "header_sort_up",
-			cssDesc: "header_sort_down",
-			widgets: ['zebra']
-		});
-
-		$("#parking_lot_list").tablesorter({
-			cancelSelection: true,
-			cssAsc: "header_sort_up",
-			cssDesc: "header_sort_down",
-			widgets: ['zebra']
-		});
-
-	return;
- });
 
 var loadTrunks = function() {
 	EX_CF = config2json({filename:'extensions.conf', usf:0 });

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=4240&r1=4239&r2=4240
==============================================================================
--- team/rbrindley/welcome_revamp/config/welcome2.html (original)
+++ team/rbrindley/welcome_revamp/config/welcome2.html Mon Dec  1 10:01:55 2008
@@ -312,6 +312,64 @@
 <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">
+
+ /* This function will be called when the page has completed loading */
+ $(document).ready(function() {
+
+	/* jQuery sortable init for content sections */
+ 	$('#sysstat_right_container, #sysstat_left_container').sortable({
+		axis: 'y',
+		cancel: '.minimaxi',
+		cursor: 'move',
+		forcePlaceholderSize: true,
+		handle: 'div.handle',
+		items: '> div.content',
+		placeholder: 'placeholder'
+	});
+
+	/* jQuery tabs init */
+	$("#sys_status_info .body > ul").tabs();
+
+	/* Event Delegation */
+	$('body').click( $.delegate({
+		'.minimaxi': function (e) {
+			$(e.target).parent().parent().children(".body").toggle();
+			if ($(e.target).html() == "[ - ]") {
+				$(e.target).html("[ + ]");
+			} else {
+				$(e.target).html("[ - ]");
+			}
+		}
+	}));
+
+	setTimeout("loadTrunks()", 1);
+	loadExtensions();
+	setTimeout("loadQueues()", 1);
+	setTimeout("loadAgents()", 1);
+	setTimeout("loadConferenceRooms()", 1);
+	setTimeout("loadParkingLot()", 1);
+
+	/* jQuery Tablesorter init */
+	/* this requires a rewrite of the loadExtensions and loadTrunks */
+		$("#extensions_list").tablesorter({
+			cancelSelection: true,
+			cssAsc: "header_sort_up",
+			cssDesc: "header_sort_down",
+			widgets: ['zebra']
+		});
+
+		$("#parking_lot_list").tablesorter({
+			cancelSelection: true,
+			cssAsc: "header_sort_up",
+			cssDesc: "header_sort_down",
+			widgets: ['zebra']
+		});
+
+	return;
+ });
+
+</script>
 <!-- End Initial Javascript -->
 
 <body>