--- rat/lonpage.pm	2000/11/13 18:37:27	1.18
+++ rat/lonpage.pm	2001/08/09 16:30:17	1.23
@@ -5,13 +5,14 @@
 #
 # 05/29/00,05/30 Gerd Kortemeyer)
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
-# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14 Gerd Kortemeyer
+# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer
 
 package Apache::lonpage;
 
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
+use Apache::lonxml();
 use HTML::TokeParser;
 use GDBM_File;
 
@@ -300,15 +301,21 @@ sub handler {
 		      }
 # ------------------------------------------------------------------------ Head
                       $r->print("\n<head>\n".$allmeta);
+                      $allscript=~
+       s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
                       if ($allscript) {
-			  $r->print("\n<script>\n".$allscript."\n</script>\n");
+			  $r->print("\n<script language='JavaScript'>\n".
+                                   $allscript."\n</script>\n");
                       }
+                      $r->print(&Apache::lonxml::registerurl);
                       $r->print("\n</head>\n");
 # ------------------------------------------------------------------ Start body
                       if ($isxml) {
                           $r->print($xmlbody);
                       } else {
-			  $r->print('<body bgcolor="#FFFFFF">');
+			  $r->print(
+ '<body bgcolor="#FFFFFF" onLoad="'.&Apache::lonxml::loadevents.
+                     '" onUnload="'.&Apache::lonxml::unloadevents.'">');
                       }
 # ------------------------------------------------------------------ Start form
                       if ($nforms) {
