From 8bf02470d3a65111b82d8231b3f9342b775295ec Mon Sep 17 00:00:00 2001
From: Bill Marquette <bill.marquette@gmail.com>
Date: Fri, 13 Mar 2009 01:22:10 -0500
Subject: Fix javascript include in head.inc Add dragdrop (used in index.php
 for the Sortable class) use dom:loaded event instead of window.loaded

---
 usr/local/www/head.inc  | 7 ++++---
 usr/local/www/index.php | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index c4e0006..bbb3b5c 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -49,9 +49,10 @@ $pagetitle = gentitle( $pgtitle );
 			outputJavaScriptFileInline("javascript/pi.js");
 			outputJavaScriptFileInline("javascript/firebug-lite.js");
 		}
-		outputJavaScriptFileInline("/javascript/scriptaculous/prototype.js");
-		outputJavaScriptFileInline("/javascript/scriptaculous/scriptaculous.js");
-		outputJavaScriptFileInline("/javascript/scriptaculous/effects.js");
+		outputJavaScriptFileInline("javascript/scriptaculous/prototype.js");
+		outputJavaScriptFileInline("javascript/scriptaculous/scriptaculous.js");
+		outputJavaScriptFileInline("javascript/scriptaculous/effects.js");
+		outputJavaScriptFileInline("javascript/scriptaculous/dragdrop.js");
 		
 	/*
 	 *	Find all javascript files that need to be included
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 4d66958..198211b 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -709,7 +709,7 @@ echo $jscriptstr;
 <?php include("fend.inc"); ?>
 	    
 <script type="text/javascript">
-	window.onload = function(in_event)
+	document.observe('dom:loaded', function(in_event)
 	{		
 			Sortable.create("col1", {tag:'div',dropOnEmpty:true,containment:columns,handle:'widgetheader',constraint:false,only:'widgetdiv',onChange:showSave});	
 			Sortable.create("col2", {tag:'div',dropOnEmpty:true,containment:columns,handle:'widgetheader',constraint:false,only:'widgetdiv',onChange:showSave});		
@@ -717,7 +717,7 @@ echo $jscriptstr;
 			hideAllWidgets();		    
 			domTT_activate('welcome1', null, 'x', 287, 'y', 107, 'content', document.getElementById('welcome-container'), 'type', 'sticky', 'closeLink', '','delay', 1000, 'fade', 'both', 'fadeMax', 100, 'styleClass', 'niceTitle');		
 	<?php } ?>
-	}	
+	});
 	<?php
 	//build list of javascript include files
 	$jsincludefiles = array();
-- 
cgit v1.1