Thu, 17 Feb 2005 08:29:44 -0000

This is a MIME encoded message

--albertel1108628984
Content-Type: text/plain

albertel		Thu Feb 17 03:29:44 2005 EDT

  Modified files:              
    /loncom/interface	groupsort.pm lonaboutme.pm lonannounce.pm 
                     	lonbulletin.pm lonchat.pm lonchatfetch.pm 
                     	loncommon.pm loncommunicate.pm loncreatecourse.pm 
                     	loncreateuser.pm londocs.pm londropadd.pm 
                     	lonerrorhandler.pm lonevaluate.pm lonfeedback.pm 
                     	lonhelp.pm lonhelper.pm lonhelpmenu.pm 
                     	lonhtmlcommon.pm lonindexer.pm lonmanagekeys.pm 
                     	lonmenu.pm lonmeta.pm lonmodifycourse.pm 
                     	lonnavmaps.pm lonparmset.pm lonpickcode.pm 
                     	lonpickcourse.pm lonpickstudent.pm lonpopulate.pm 
                     	lonpreferences.pm lonprintout.pm lonremote.pm 
                     	lonsearchcat.pm lonsimplepage.pm lonsource.pm 
                     	lonspeller.pm lonstatistics.pm lonsupportreq.pm 
                     	lonsyllabus.pm lontest.pm lontrackstudent.pm 
                     	lonviewclasslist.pm portfolio.pm 
  Log:
  - <html> -> &Apache::lonxml::xmlbegin, thus valid doctypes are now getting output, Yeah! StandardsCmpliance
  
  - backing out the encoding changes for now
  
  - some xhtml cleanups
  - one icon -> lonhttpd
  
  
--albertel1108628984
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20050217032944.txt"

Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.29 loncom/interface/groupsort.pm:1.30

--- loncom/interface/groupsort.pm:1.29	Mon Jul 12 16:42:31 2004
+++ loncom/interface/groupsort.pm	Thu Feb 17 03:29:42 2005
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.29 2004/07/12 20:42:31 matthew Exp $
+# $Id: groupsort.pm,v 1.30 2005/02/17 08:29:42 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,9 +105,9 @@
     }
 
 # output start of web page
-
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<END);
-<html>
+$html
 <head>
 <title>The LearningOnline Network With CAPA Group Sorter</title>
 <script language='javascript'>
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.35 loncom/interface/lonaboutme.pm:1.36
--- loncom/interface/lonaboutme.pm:1.35	Thu Dec 23 15:42:50 2004
+++ loncom/interface/lonaboutme.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "About Me" Personal Information
 #
-# $Id: lonaboutme.pm,v 1.35 2004/12/23 20:42:50 matthew Exp $
+# $Id: lonaboutme.pm,v 1.36 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,8 +44,9 @@
     my $target=$ENV{'form.grade_target'};
 # ------------------------------------------------------------ Print the screen
     if ($target ne 'tex') {
+	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 ENDDOCUMENT
Index: loncom/interface/lonannounce.pm
diff -u loncom/interface/lonannounce.pm:1.32 loncom/interface/lonannounce.pm:1.33
--- loncom/interface/lonannounce.pm:1.32	Thu Sep  2 09:15:07 2004
+++ loncom/interface/lonannounce.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.32 2004/09/02 13:15:07 www Exp $
+# $Id: lonannounce.pm,v 1.33 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -325,9 +325,9 @@
                                      'dlsav' => -1 ));
     my $weekday=$firstday{'weekday'};
 # ------------------------------------------------------------ Print the screen
-
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script>
Index: loncom/interface/lonbulletin.pm
diff -u loncom/interface/lonbulletin.pm:1.27 loncom/interface/lonbulletin.pm:1.28
--- loncom/interface/lonbulletin.pm:1.27	Wed Aug 18 17:14:00 2004
+++ loncom/interface/lonbulletin.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Bulletin Board Handler
 #
-# $Id: lonbulletin.pm,v 1.27 2004/08/18 21:14:00 albertel Exp $
+# $Id: lonbulletin.pm,v 1.28 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,8 +45,9 @@
 
 # ------------------------------------------------------------ Print the screen
     if ($target ne 'tex') {
+	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 ENDDOCUMENT
Index: loncom/interface/lonchat.pm
diff -u loncom/interface/lonchat.pm:1.7 loncom/interface/lonchat.pm:1.8
--- loncom/interface/lonchat.pm:1.7	Thu Jul 24 13:53:59 2003
+++ loncom/interface/lonchat.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Chat
 #
-# $Id: lonchat.pm,v 1.7 2003/07/24 17:53:59 matthew Exp $
+# $Id: lonchat.pm,v 1.8 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,8 +48,9 @@
     }
 # --------------------------------------------------- Print login screen header
     my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/lonchatfetch.pm
diff -u loncom/interface/lonchatfetch.pm:1.14 loncom/interface/lonchatfetch.pm:1.15
--- loncom/interface/lonchatfetch.pm:1.14	Sun Jun 27 13:36:57 2004
+++ loncom/interface/lonchatfetch.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Chat Fetching
 #
-# $Id: lonchatfetch.pm,v 1.14 2004/06/27 17:36:57 www Exp $
+# $Id: lonchatfetch.pm,v 1.15 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,8 @@
     my $bottomid='';
     unless ($ENV{'form.lastid'}) { 
        $include=1; 
-       $newstuff='<html><body bgcolor="#FFFFFF">';
+       my $html=&Apache::lonxml::xmlbegin();
+       $newstuff=$html.'<head></head><body bgcolor="#FFFFFF">';
     }
     my @participants=();
     foreach (@entries) {
@@ -149,8 +150,9 @@
 	}
     }
     my $participant_output=join('<br />',sort @participants);
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
   <meta HTTP-EQUIV="Refresh" CONTENT="5; url=/adm/chatfetch?lastid=$lastid">
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.249 loncom/interface/loncommon.pm:1.250
--- loncom/interface/loncommon.pm:1.249	Sun Feb 13 20:44:02 2005
+++ loncom/interface/loncommon.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.249 2005/02/14 01:44:02 albertel Exp $
+# $Id: loncommon.pm,v 1.250 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -687,6 +687,7 @@
   "<table bgcolor='#773311' cellspacing='1' cellpadding='1' border='0'><tr>".
   "<td bgcolor='#886622'><a href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
     }
+    my $html=&Apache::lonxml::xmlbegin();
     my $helpicon=&lonhttpdurl("/adm/lonIcons/helpgateway.gif");
     $template .= <<"ENDTEMPLATE";
  <script type="text/javascript">
@@ -696,7 +697,7 @@
     if (target == 'open') {
         var newWindow = null;
         try {
-            newWindow =  window.open("","helpmenu","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" )
+            newWindow =  window.open("/adm/rat/empty.html","helpmenu","HEIGHT=$height,WIDTH=$width,resizable=yes,scrollbars=yes" )
         }
         catch(error) {
             writeHelp(caller);
@@ -710,7 +711,7 @@
     return;
 }
 function writeHelp(caller) {
-    caller.document.write("<html><head><title>LON-CAPA Help Menu</title><meta http-equiv='pragma' content='no-cache'></head>")
+    caller.document.write('$html<head><title>LON-CAPA Help Menu</title><meta http-equiv="pragma" content="no-cache"></head>')
     caller.document.write("<frameset rows='105,*' border='0'><frame name='bannerframe'  src='$banner_link'><frame name='bodyframe' src='$details_link'></frameset>")
     caller.document.write("</html>")
     caller.document.close()
Index: loncom/interface/loncommunicate.pm
diff -u loncom/interface/loncommunicate.pm:1.26 loncom/interface/loncommunicate.pm:1.27
--- loncom/interface/loncommunicate.pm:1.26	Wed Nov 17 16:05:26 2004
+++ loncom/interface/loncommunicate.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.26 2004/11/17 21:05:26 www Exp $
+# $Id: loncommunicate.pm,v 1.27 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -93,8 +93,9 @@
 #
 # Start document
 #
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<END);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/loncreatecourse.pm
diff -u loncom/interface/loncreatecourse.pm:1.75 loncom/interface/loncreatecourse.pm:1.76
--- loncom/interface/loncreatecourse.pm:1.75	Thu Jan 20 11:30:52 2005
+++ loncom/interface/loncreatecourse.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Create a course
 #
-# $Id: loncreatecourse.pm,v 1.75 2005/01/20 16:30:52 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.76 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -331,8 +331,10 @@
 		    'rshm' => 'Resource Space Home',
                     'opco' => "Open Course"
 				       );
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
+<head>
 <script language="JavaScript" type="text/javascript">
 var editbrowser = null;
 function openbrowser(formname,elementname) {
@@ -354,7 +356,6 @@
 $javascript_validations
 </script>
 $coursebrowserjs
-<head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
 $bodytag
@@ -597,9 +598,10 @@
     }
 
     my $logmsg;
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Create a New Course');
     $r->print(<<ENDENHEAD);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.99 loncom/interface/loncreateuser.pm:1.100
--- loncom/interface/loncreateuser.pm:1.99	Sun Jan 30 10:34:46 2005
+++ loncom/interface/loncreateuser.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.99 2005/01/30 15:34:46 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.100 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,6 +122,7 @@
     my $defdom=$ENV{'request.role.domain'};
     my @domains = &Apache::loncommon::get_domains();
     my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $sellink=&Apache::loncommon::selectstudent_link
@@ -141,7 +142,7 @@
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
     my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     $r->print(<<"ENDDOCUMENT");
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 $selscript
@@ -271,8 +272,9 @@
     }
 ENDSCRIPT
     }
+    my $html=&Apache::lonxml::xmlbegin();
     my $dochead =<<"ENDDOCHEAD";
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script type="text/javascript" language="Javascript">
@@ -859,8 +861,9 @@
     my $error     = '<font color="#ff0000">'.&mt('Error').':</font>';
     my $end       = '</body></html>';
     # Print header
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDTHREEHEAD);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.166 loncom/interface/londocs.pm:1.167
--- loncom/interface/londocs.pm:1.166	Wed Feb  2 17:15:06 2005
+++ loncom/interface/londocs.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.166 2005/02/02 22:15:06 albertel Exp $
+# $Id: londocs.pm,v 1.167 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -141,7 +141,8 @@
 
 sub dumpcourse {
     my $r=shift;
-    $r->print('<html><head><title>Dump DOCS</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>Dump DOCS</title></head>'.
         &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
 	      '<form name="dumpdoc" method="post">');
     my ($home,$other,%outhash)=&authorhosts();
@@ -325,8 +326,8 @@
                 $outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />';
             }
         }
-
-        $r->print('<html><head><title>Export Course</title></head>'.
+	my $html=&Apache::lonxml::xmlbegin();
+        $r->print($html.'<head><title>Export Course</title></head>'.
             &Apache::loncommon::bodytag('Export course to IMS content package'));
         $r->print($outcome);
         $r->print('</body></html>');
@@ -467,7 +468,8 @@
 
 </script>
         |;
-        $r->print('<html><head><title>Export Course</title>'.$scripttag.'</head>'.
+	my $html=&Apache::lonxml::xmlbegin();
+        $r->print($html.'<head><title>Export Course</title>'.$scripttag.'</head>'.
             &Apache::loncommon::bodytag('Export course to IMS content package'
 ));
 
@@ -1459,8 +1461,8 @@
    my $r=shift; 
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
-
-   $r->print('<html><head><title>Verify Content</title></head>'.
+   my $html=&Apache::lonxml::xmlbegin();
+   $r->print($html.'<head><title>Verify Content</title></head>'.
               &Apache::loncommon::bodytag('Verify Course Documents'));
    $hashtied=0;
    undef %alreadyseen;
@@ -1488,7 +1490,8 @@
 
 sub checkversions {
     my $r=shift;
-    $r->print('<html><head><title>Check Versions</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));
     my $header='';
     my $startsel='';
@@ -1879,8 +1882,9 @@
     my $now=time;
 
 # print screen
+       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script>
Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.124 loncom/interface/londropadd.pm:1.125
--- loncom/interface/londropadd.pm:1.124	Mon Jan 31 06:27:14 2005
+++ loncom/interface/londropadd.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.124 2005/01/31 11:27:14 www Exp $
+# $Id: londropadd.pm,v 1.125 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,10 +43,11 @@
 ###############################################################
 ###############################################################
 sub header {
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
     my $title = &mt('LON-CAPA Enrollment Manager');
     return(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>$title</title>
 </head>
Index: loncom/interface/lonerrorhandler.pm
diff -u loncom/interface/lonerrorhandler.pm:1.4 loncom/interface/lonerrorhandler.pm:1.5
--- loncom/interface/lonerrorhandler.pm:1.4	Tue Aug  5 08:52:23 2003
+++ loncom/interface/lonerrorhandler.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Internal Server Error Handler
 #
-# $Id: lonerrorhandler.pm,v 1.4 2003/08/05 12:52:23 www Exp $
+# $Id: lonerrorhandler.pm,v 1.5 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,10 +55,11 @@
      my $req=$r->as_string();
      $req=~s/\"/\'\'/g;
 
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Could Not Process Request');
 # --------------------------------------------------- Print login screen header
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/lonevaluate.pm
diff -u loncom/interface/lonevaluate.pm:1.14 loncom/interface/lonevaluate.pm:1.15
--- loncom/interface/lonevaluate.pm:1.14	Thu Nov 11 17:47:55 2004
+++ loncom/interface/lonevaluate.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.14 2004/11/11 22:47:55 albertel Exp $
+# $Id: lonevaluate.pm,v 1.15 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -93,8 +93,9 @@
         }
         if ($complete) {
 	    my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl));
-           $r->print(<<ENDHEADER);
-<html>
+	    my $html=&Apache::lonxml::xmlbegin();
+	    $r->print(<<ENDHEADER);
+$html
 <head>
 <title>Evaluation submitted</title>
 <script>
@@ -150,9 +151,10 @@
 <option value=4>Agree</option>
 <option value=5>Strongly Agree</option>
 ENDOPTIONS
-
+    
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.152 loncom/interface/lonfeedback.pm:1.153
--- loncom/interface/lonfeedback.pm:1.152	Wed Feb 16 23:39:58 2005
+++ loncom/interface/lonfeedback.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.152 2005/02/17 04:39:58 albertel Exp $
+# $Id: lonfeedback.pm,v 1.153 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1437,11 +1437,9 @@
   my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders();
   my $send=&mt('Send');
   my $html=&Apache::lonxml::xmlbegin();
-  my $encoding=&Apache::lonxml::fontsettings();
   $r->print(<<END);
 $html
 <head>
-$encoding
 <title>The LearningOnline Network with CAPA</title>
 <meta http-equiv="pragma" content="no-cache"></meta>
 $htmlheader
@@ -1665,11 +1663,9 @@
         $disctogg = 'toggon';
     }
     my $html=&Apache::lonxml::xmlbegin();
-    my $encoding=&Apache::lonxml::fontsettings();
     $r->print(<<END);
 $html
 <head>
-$encoding
 <title>$lt{'dido'}</title>
 <meta http-equiv="pragma" content="no-cache" />
 <script>
@@ -1850,11 +1846,9 @@
     my %status_types = ();
     &sort_filter_names(\%sort_types,\%role_types,\%status_types);
     my $html=&Apache::lonxml::xmlbegin();
-    my $encoding=&Apache::lonxml::fontsettings();
     $r->print(<<END);
 $html
 <head>
-$encoding
 <title>$lt{'diso'}</title>
 <meta http-equiv="pragma" content="no-cache" />
 <script type="text/javascript">
@@ -2005,11 +1999,9 @@
         }
     }
     my $html=&Apache::lonxml::xmlbegin();
-    my $encoding=&Apache::lonxml::fontsettings();
     $r->print(<<END);
 $html
 <head>
-$encoding
 <title>$lt{'diso'}</title>
 <meta http-equiv="pragma" content="no-cache" />
 </head>
@@ -2121,11 +2113,9 @@
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my $html=&Apache::lonxml::xmlbegin();
-  my $encoding=&Apache::lonxml::fontsettings();
   $r->print (<<ENDFAILREDIR);
 $html
 <head>
-$encoding
 <title>Feedback not sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
@@ -2211,11 +2201,9 @@
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my $html=&Apache::lonxml::xmlbegin();
-  my $encoding=&Apache::lonxml::fontsettings();
   $r->print (<<ENDREDIR);
 $html
 <head>
-$encoding
 <title>Feedback sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
@@ -2244,11 +2232,9 @@
   my $nofeed=&mt('Sorry, no feedback possible on this resource  ...');
   my $continue=&mt('Continue');
   my $html=&Apache::lonxml::xmlbegin();
-  my $encoding=&Apache::lonxml::fontsettings();
   $r->print (<<ENDNOREDIR);
 $html
 <head>
-$encoding
 <title>Feedback not sent</title>
 <meta http-equiv="pragma" content="no-cache" />
 ENDNOREDIR
@@ -2594,9 +2580,11 @@
     my $subject=&clear_out_html($ENV{'form.subject'});
     $subject=~s/\n/\<br \/\>/g;
     $subject=&Apache::lontexconvert::msgtexconverted($subject);
-    $r->print('<table border="2"><tr><td>'.
-       '<b>Subject:</b> '.$subject.'<br /><br />'.
-       $message.'</td></tr></table>');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head>'.
+	      '</head><body><table border="2"><tr><td>'.
+	      '<b>Subject:</b> '.$subject.'<br /><br />'.
+	      $message.'</td></tr></table></body></html>');
 }
 
 sub generate_preview_button {
@@ -2629,11 +2617,9 @@
     }
     &Apache::lonenc::check_encrypt(\$symb);
     my $html=&Apache::lonxml::xmlbegin();
-    my $encoding=&Apache::lonxml::fontsettings();
     $r->print(<<END);
 $html
 <head>
-$encoding
 <title>Managing Attachments</title>
 <script>
  function setAction () {
@@ -2983,12 +2969,10 @@
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       my $html=&Apache::lonxml::xmlbegin();
-      my $encoding=&Apache::lonxml::fontsettings();
       my $bodytag=&Apache::loncommon::bodytag('Discussion Post Versions');
       $r->print(<<END);
 $html
 <head>
-$encoding
 <title>Post Versions</title>
 <meta http-equiv="pragma" content="no-cache" />
 </head>
@@ -3089,11 +3073,9 @@
       $r->send_http_header;
       my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
       my $html=&Apache::lonxml::xmlbegin();
-      my $encoding=&Apache::lonxml::fontsettings();
       $r->print (<<ENDREDIR);
 $html
 <head>
-$encoding
 <title>New posts marked as read</title>
 <meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
Index: loncom/interface/lonhelp.pm
diff -u loncom/interface/lonhelp.pm:1.15 loncom/interface/lonhelp.pm:1.16
--- loncom/interface/lonhelp.pm:1.15	Mon May 17 18:08:56 2004
+++ loncom/interface/lonhelp.pm	Thu Feb 17 03:29:42 2005
@@ -53,11 +53,12 @@
 sub serveTex
 {
     my ($tex, $r) = @_;
+    my $html=&Apache::lonxml::xmlbegin();
     my $bugs=&Apache::loncommon::help_open_bug('Documentation');
     my $header=&mt('LON-CAPA Help');
     my $footer=&mt('About LON-CAPA help and More Help');
-$r->print(<<HEADER);
-<html>
+    $r->print(<<HEADER);
+$html
     <head>
         <title>LON-CAPA Help</title>
     </head>
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.95 loncom/interface/lonhelper.pm:1.96
--- loncom/interface/lonhelper.pm:1.95	Fri Jan 21 17:59:54 2005
+++ loncom/interface/lonhelper.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.95 2005/01/21 22:59:54 albertel Exp $
+# $Id: lonhelper.pm,v 1.96 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -575,6 +575,7 @@
     }
 
     # Phase 4: Display.
+    my $html=&Apache::lonxml::xmlbegin();
     my $stateTitle=&mt($state->title());
     my $helperTitle = &mt($self->{TITLE});
     my $bodytag = &Apache::loncommon::bodytag($helperTitle,'','');
@@ -584,9 +585,8 @@
     my $loncapaHelper = &mt("LON-CAPA Helper:");
 
     $result .= <<HEADER;
-<html>
+$html
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <title>$loncapaHelper: $helperTitle</title>
     </head>
     $bodytag
Index: loncom/interface/lonhelpmenu.pm
diff -u loncom/interface/lonhelpmenu.pm:1.18 loncom/interface/lonhelpmenu.pm:1.19
--- loncom/interface/lonhelpmenu.pm:1.18	Mon Dec 20 16:11:41 2004
+++ loncom/interface/lonhelpmenu.pm	Thu Feb 17 03:29:42 2005
@@ -137,8 +137,9 @@
 </script>
 SCRIPT_TWO
     }
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<END);
-<html>
+$html
 <head>
 <title>Help Banner</title>
 <style type="text/css">
@@ -258,9 +259,9 @@
         'crea' => 'Create an account for yourself in the LON-CAPA Bugzilla tracking system, if you wish to report bugs you have encountered in the LON-CAPA software,or if you have suggestions for improvements in LON-CAPA.',
         'suim' => ' Suggested improvements may include additional functionality, improved usability, or changes to wording used in LON-CAPA pages, including the embedded help system.'
     );
-
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<END);
-<html>
+$html
  <head>
   <title>$lt{'heco'}</title>
  </head>
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.102 loncom/interface/lonhtmlcommon.pm:1.103
--- loncom/interface/lonhtmlcommon.pm:1.102	Wed Dec  1 19:01:34 2004
+++ loncom/interface/lonhtmlcommon.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.102 2004/12/02 00:01:34 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.103 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,7 +80,7 @@
     foreach (keys %bombs) {
 	if ($_=~/^$udom\/$uname\//) {
 	    return '<a href="/adm/bombs/'.$url.
-		'"><img src="/adm/lonMisc/bomb.gif" border="0" /></a>'.
+		'"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" border="0" /></a>'.
 		&Apache::loncommon::help_open_topic('About_Bombs');
 	}
     }
@@ -759,13 +759,14 @@
     $prog_state{'type'}=$type;
     if ($type eq 'popup') {
 	$prog_state{'window'}='popwin';
+	my $html=&Apache::lonxml::xmlbegin();
 	#the whole function called through timeout is due to issues
 	#in mozilla Read BUG #2665 if you want to know the whole story
 	&r_print($r,'<script>'.
         "var popwin;
          function openpopwin () {
          popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
-        "popwin.document.writeln(\'<html><head><title>$title</title></head>".
+        "popwin.document.writeln(\'".$html."<head><title>$title</title></head>".
 	      "<body bgcolor=\"#88DDFF\">".
               "<h4>$heading</h4>".
               "<form name=popremain>".
@@ -929,15 +930,15 @@
 # --------------------- A function that generates a window for the spellchecker
 
 sub spellheader {
-    my $nothing = &javascript_nothing();
+    my $html=&Apache::lonxml::xmlbegin();
     return (<<ENDCHECK);
 <script type="text/javascript"> 
 //<!-- BEGIN LON-CAPA Internal
 var checkwin;
 
 function spellcheckerwindow() {
-    checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
-    checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
+    checkwin=window.open('/adm/rat/empty.html','spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+    checkwin.document.writeln('$html<head></head><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
     checkwin.document.close();
 }
 // END LON-CAPA Internal -->
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.128 loncom/interface/lonindexer.pm:1.129
--- loncom/interface/lonindexer.pm:1.128	Thu Oct 21 07:18:41 2004
+++ loncom/interface/lonindexer.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.128 2004/10/21 11:18:41 foxr Exp $
+# $Id: lonindexer.pm,v 1.129 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,10 +145,12 @@
 	   $verify_title=~s/'/\\'/g;
 	   $extra='window.opener.document.forms["'.$ENV{'form.form'}.'"].elements["'.$ENV{'form.titleelement'}.'"].value=\''.$verify_title.'\';';
        }
+       my $html=&Apache::lonxml::xmlbegin();
        $r->print(<<ENDSUBM);
-		<html>
-		<!-- Generated by lonindexer.pm -->
-		<script type="text/javascript">
+	   $html
+	     <!-- Generated by lonindexer.pm -->
+	     <head>
+	       <script type="text/javascript">
 		function load() {
 			window.opener.document.forms["$ENV{'form.form'}"]
 			    .elements["$ENV{'form.element'}"]
@@ -156,8 +158,9 @@
 			$extra
 			window.close();
 		}
-   	</script>
-    	<body onLoad=load();>
+   	       </script>
+	     </head>
+    	<body onLoad="load();">
      	</body>
     	</html>
 ENDSUBM
@@ -344,8 +347,9 @@
 	}
 
 # ---------------------------------------------------------------- Print Header
+	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<ENDHEADER);
-<html>
+$html
 <head>
 <title>The LearningOnline Network With CAPA Directory Browser</title>
 
@@ -505,11 +509,11 @@
 	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
-#        $r->print(&initdebug());
-#        $r->print(&writedebug("Omit:@Omit")) if (@Omit);
-#        $r->print(&writedebug("Only:@Only")) if (@Only);
-        $r->print("<table width='100\%' border=0><tr><td bgcolor=#777777>\n");
-	$r->print("<table width='100\%' border=0><tr bgcolor=$titleclr>\n");
+        #$r->print(&initdebug());
+        #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
+        #$r->print(&writedebug("Only:@Only")) if (@Only);
+        $r->print('<table width="100%" border="0"><tr><td bgcolor="#777777">'."\n");
+	$r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");
 	$r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
 	$r->print("<td><b>".&mt('Title')."</b></td>\n") 
 	    if ($hash{'display_attrs_0'} == 1);
@@ -717,6 +721,7 @@
 }
 
 sub initdebug {
+    my $html=&Apache::lonxml::xmlbegin();
     return <<ENDJS;
 <script>
 var debugging = true;
@@ -729,7 +734,7 @@
         debuggingWindow.document.writeln(text);
     }
 }
-output("<html><head><title>Debugging Window</title><!-- for lonindexer.pm --></head><body><pre>");   
+output('$html<head><title>Debugging Window</title><!-- for lonindexer.pm --></head><body><pre>');   
 </script>
 ENDJS
 }
Index: loncom/interface/lonmanagekeys.pm
diff -u loncom/interface/lonmanagekeys.pm:1.15 loncom/interface/lonmanagekeys.pm:1.16
--- loncom/interface/lonmanagekeys.pm:1.15	Sat May  8 20:45:01 2004
+++ loncom/interface/lonmanagekeys.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to manage course access keys 
 #
-# $Id: lonmanagekeys.pm,v 1.15 2004/05/09 00:45:01 www Exp $
+# $Id: lonmanagekeys.pm,v 1.16 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,9 +41,10 @@
 ###############################################################
 ###############################################################
 sub header {
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Access Key Management');
     return(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>LON-CAPA Access Key Management</title>
 </head>
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.146 loncom/interface/lonmenu.pm:1.147
--- loncom/interface/lonmenu.pm:1.146	Sun Feb 13 17:52:48 2005
+++ loncom/interface/lonmenu.pm	Thu Feb 17 03:29:42 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.146 2005/02/13 22:52:48 albertel Exp $
+# $Id: lonmenu.pm,v 1.147 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,8 +108,9 @@
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
 <script type="text/javascript">
-// BEGIN LON-CAPA Internal
+<!-- // BEGIN LON-CAPA Internal
 $utility
+-->
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps<br />
@@ -180,8 +181,9 @@
 	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
-// BEGIN LON-CAPA Internal
+<!-- // BEGIN LON-CAPA Internal
 $utility
+-->
 </script>
 <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
@@ -1174,8 +1176,10 @@
 	$ENV{'browser.interface'}='faketextual';
 	$ENV{'environment.remote'}='off';
     }
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEADER);
-<html><head>
+$html
+<head>
 <title>LON-CAPA Main Menu</title>
 $script_tag
 </head>
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.91 loncom/interface/lonmeta.pm:1.92
--- loncom/interface/lonmeta.pm:1.91	Thu Feb 10 17:01:40 2005
+++ loncom/interface/lonmeta.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.91 2005/02/10 22:01:40 banghart Exp $
+# $Id: lonmeta.pm,v 1.92 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -546,7 +546,8 @@
     #
     my ($resdomain,$resuser)=
         (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
-    $r->print('<html><head><title>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>'.
               'Catalog Information'.
               '</title></head>');
     if ($uri=~m:/adm/bombs/(.*)$:) {
Index: loncom/interface/lonmodifycourse.pm
diff -u loncom/interface/lonmodifycourse.pm:1.14 loncom/interface/lonmodifycourse.pm:1.15
--- loncom/interface/lonmodifycourse.pm:1.14	Sat Nov 27 12:23:09 2004
+++ loncom/interface/lonmodifycourse.pm	Thu Feb 17 03:29:43 2005
@@ -661,9 +661,11 @@
             $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>";
         }
     }
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print("
-<html>
-<head>");
+$html
+<head>
+");
     if ($action eq 'display') {
         $r->print("
 <script language=\"JavaScript\" type=\"text/javascript\">
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.315 loncom/interface/lonnavmaps.pm:1.316
--- loncom/interface/lonnavmaps.pm:1.315	Sat Feb  5 01:52:50 2005
+++ loncom/interface/lonnavmaps.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.315 2005/02/05 06:52:50 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.316 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@
 use Apache::lonnet;
 use POSIX qw (floor strftime);
 use Data::Dumper; # for debugging, not always 
+use Time::HiRes qw( gettimeofday tv_interval );
 
 # symbolic constants
 sub SYMB { return 1; }
@@ -142,7 +143,7 @@
 
 sub real_handler {
     my $r = shift;
-
+    #my $t0=[&gettimeofday()];
     # Handle header-only request
     if ($r->header_only) {
         if ($ENV{'browser.mathml'}) {
@@ -184,8 +185,9 @@
 	     $navstatus
 MENU
 	}
+	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<"ENDSUBM");
-	<html>
+	$html
         <head>
 	  <script type="text/javascript">
  	    function submitthis() {
@@ -213,8 +215,8 @@
         $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
         return HTTP_NOT_ACCEPTABLE;
     }
-
-    $r->print("<html><head>\n");
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print("$html<head>\n");
     $r->print("<title>".&mt('Navigate Course Contents')."</title>");
 # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
@@ -405,6 +407,8 @@
             $r->print("<p><font size='+1'>This course is empty.</font></p>");
         }
     }
+    #my $td=&tv_interval($t0);
+    #$r->print("<br />$td");
 
     $r->print("</body></html>");
     $r->rflush();
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.182 loncom/interface/lonparmset.pm:1.183
--- loncom/interface/lonparmset.pm:1.182	Sat Feb  5 01:21:57 2005
+++ loncom/interface/lonparmset.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.182 2005/02/05 06:21:57 albertel Exp $
+# $Id: lonparmset.pm,v 1.183 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -312,8 +312,9 @@
     my $overallhelp=
 	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
     my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Parameters</title>
 <script>
@@ -1757,12 +1758,13 @@
     my $Value=&mt('Value');
     my $Set=&mt('Set');
     my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDENV);
-<html>
+$html
+<head>
 <script type="text/javascript" language="Javascript" >
 $browse_js
 </script>
-<head>
 <title>LON-CAPA Course Environment</title>
 </head>
 $bodytag
@@ -1808,8 +1810,9 @@
                              'Set/Modify Course Assessment Parameters');
     my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDOVER);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Environment</title>
 </head>
Index: loncom/interface/lonpickcode.pm
diff -u loncom/interface/lonpickcode.pm:1.4 loncom/interface/lonpickcode.pm:1.5
--- loncom/interface/lonpickcode.pm:1.4	Tue May  4 10:17:18 2004
+++ loncom/interface/lonpickcode.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a CODE from the list of possible CODEs
 #
-# $Id: lonpickcode.pm,v 1.4 2004/05/04 14:17:18 albertel Exp $
+# $Id: lonpickcode.pm,v 1.5 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,9 +59,9 @@
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
   <head>
     <title>The LearningOnline Network with CAPA</title>
   </head>
Index: loncom/interface/lonpickcourse.pm
diff -u loncom/interface/lonpickcourse.pm:1.25 loncom/interface/lonpickcourse.pm:1.26
--- loncom/interface/lonpickcourse.pm:1.25	Fri Jan 28 14:26:54 2005
+++ loncom/interface/lonpickcourse.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.25 2005/01/28 19:26:54 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.26 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,8 +42,9 @@
     return OK if $r->header_only;
 
 # ------------------------------------------------------------ Print the screen
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/lonpickstudent.pm
diff -u loncom/interface/lonpickstudent.pm:1.7 loncom/interface/lonpickstudent.pm:1.8
--- loncom/interface/lonpickstudent.pm:1.7	Sun Sep 21 20:48:32 2003
+++ loncom/interface/lonpickstudent.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a student from the classlist
 #
-# $Id: lonpickstudent.pm,v 1.7 2003/09/22 00:48:32 www Exp $
+# $Id: lonpickstudent.pm,v 1.8 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,8 +42,9 @@
     return OK if $r->header_only;
 
 # ------------------------------------------------------------ Print the screen
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/lonpopulate.pm
diff -u loncom/interface/lonpopulate.pm:1.20 loncom/interface/lonpopulate.pm:1.21
--- loncom/interface/lonpopulate.pm:1.20	Mon Sep 13 12:21:30 2004
+++ loncom/interface/lonpopulate.pm	Thu Feb 17 03:29:43 2005
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.20 2004/09/13 16:21:30 raeburn Exp $
+# $Id: lonpopulate.pm,v 1.21 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,9 +38,10 @@
 
 ###############################################################
 sub header {
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Classlist Manager');
     return(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>LON-CAPA Classlist Manager</title>
 </head>
@@ -193,8 +194,9 @@
 // End hiding -->
 </script>
 |;
+    my $html=&Apache::lonxml::xmlbegin();
     return(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>LON-CAPA Classlist Manager</title>
 $scripttag
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.52 loncom/interface/lonpreferences.pm:1.53
--- loncom/interface/lonpreferences.pm:1.52	Thu Jan 20 16:32:55 2005
+++ loncom/interface/lonpreferences.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.52 2005/01/20 21:32:55 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.53 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -567,7 +567,8 @@
     $lkey_npass2= hex($lkey_npass2);
     # Output javascript to deal with passwords
     # Output DES javascript
-    $r->print("<html><head>");
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html."<head>");
     {
 	my $include = $r->dir_config('lonIncludes');
 	my $jsh=Apache::File->new($include."/londes.js");
@@ -648,8 +649,9 @@
     # Check for authentication types that allow changing of the password.
     return if ($currentauth !~ /^(unix|internal):/);
     #
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEADER);
-<html>
+$html
 <head>
 <title>LON-CAPA Preferences:  Change password for $user</title>
 </head>
@@ -1053,8 +1055,9 @@
                           subroutine => \&toggle_debug,
                           }));
     }
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEADER);
-<html>
+$html
 <head>
 <title>LON-CAPA Preferences</title>
 </head>
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.360 loncom/interface/lonprintout.pm:1.361
--- loncom/interface/lonprintout.pm:1.360	Thu Feb 10 16:05:03 2005
+++ loncom/interface/lonprintout.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 #  The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.360 2005/02/10 21:05:03 albertel Exp $
+# $Id: lonprintout.pm,v 1.361 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -784,13 +784,12 @@
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
     $r->print(<<ENDPART);
-
-
-
-<html>
-<script type="text/javascript" language="Javascript" >
+$html
+<head>
+<script type="text/javascript" language="Javascript">
     var editbrowser;
     function openbrowser(formname,elementname,only,omit) {
         var url = '/res/?';
@@ -814,7 +813,6 @@
         editbrowser.focus();
     }
 </script>
-<head>
 <title>LON-CAPA output for printing</title>
 </head>
 $bodytag
Index: loncom/interface/lonremote.pm
diff -u loncom/interface/lonremote.pm:1.16 loncom/interface/lonremote.pm:1.17
--- loncom/interface/lonremote.pm:1.16	Mon Jan 31 14:24:02 2005
+++ loncom/interface/lonremote.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonremote.pm,v 1.16 2005/01/31 19:24:02 albertel Exp $
+# $Id: lonremote.pm,v 1.17 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,7 @@
     &Apache::lonnet::appenv('environment.remote' => 'on');
 # -------------------------------------------------------- Menu script and info
     my $windowinfo=&Apache::lonmenu::open($ENV{'browser.os'});
+    my $html=&Apache::lonxml::xmlbegin();
     my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
     my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
     my $setflags=&Apache::lonmenu::setflags();
@@ -49,7 +50,7 @@
     my $bodytag=&Apache::loncommon::bodytag('Launch Remote Control');
     my $message=&mt("Launching of the Remote Control menu will fail if pop-up window filters are active. To use the Remote Control, disable the filter for this site.");
     $r->print(<<ENDLAUNCH);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 $startupremote
@@ -68,12 +69,13 @@
 sub collapseremote {
     my ($r,$lowerurl)=@_;
 # -------------------------------------------------------- Menu script and info
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Collapse Remote Control');
     my $windowinfo=&Apache::lonmenu::close();
 #    my $switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'">';
     my $message='<p>'.&mt("The external menu (Remote Control) has been disabled, and you will be working with the smaller inline menu.\nYou may have either closed the Remote Control window, or it was blocked by a pop-up window filter in your browser.\nTo use the Remote Control, disable the filter for this site, and re-launch the Remote Control from the inline menu.").'</p>'; 
     $r->print(<<ENDCOLLAPSE);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.237 loncom/interface/lonsearchcat.pm:1.238
--- loncom/interface/lonsearchcat.pm:1.237	Wed Feb  2 17:02:41 2005
+++ loncom/interface/lonsearchcat.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.237 2005/02/02 22:02:41 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.238 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -195,9 +195,11 @@
                 &Apache::lonnet::logthis('lonsearchcat:'.
                                          'Unable to recover data from '.
                                          $persistent_db_file);
-                $r->print(<<END);
-<html>
-<head><title>LON-CAPA Search Error</title></head>
+		my $html=&Apache::lonxml::xmlbegin();
+		$r->print(<<END);
+$html
+<head>
+<title>LON-CAPA Search Error</title></head>
 $bodytag
 We were unable to retrieve data describing your search.  This is a serious
 error and has been logged.  Please alert your LON-CAPA administrator.
@@ -224,7 +226,8 @@
 	} else {
             # This is a stupid error to give to the user.  
             # It really tells them nothing.
-	    $r->print('<html><head></head>'.$bodytag.
+	    my $html=&Apache::lonxml::xmlbegin();
+	    $r->print($html.'<head></head>'.$bodytag.
                       'Unable to tie hash to db file</body></html>');
 	    return OK;
 	}
@@ -368,8 +371,11 @@
             &Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '.
                                      'needed table.  lonmysql error:'.
                                      $errorstring);
+	    my $html=&Apache::lonxml::xmlbegin();
             $r->print(<<END);
-<html><head><title>Search Error</title></head>
+$html
+<head>
+<title>Search Error</title></head>
 $bodytag
 Unable to create table in which to store search results.  
 The search has been aborted.
@@ -380,8 +386,11 @@
         }
         delete($ENV{'form.launch'});
         if (! &make_form_data_persistent($r,$persistent_db_file)) {
-            $r->print(<<END);
-<html><head><title>Search Error</title></head>
+	    my $html=&Apache::lonxml::xmlbegin();
+	    $r->print(<<END);
+$html
+<head>
+<title>Search Error</title></head>
 $bodytag
 Unable to properly store search information.  The search has been aborted.
 </body>
@@ -477,7 +486,8 @@
     my $discuss=$ENV{'form.crsdiscuss'};
     my @allwords=($search_string,@New_Words);
     $totalfound=0;
-    $r->print('<html><head><title>LON-CAPA Course Search</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>LON-CAPA Course Search</title></head>'.
 	      $bodytag.'<hr /><center><font size="+2" face="arial">'.$pretty_search_string.'</font></center><hr /><b>'.&mt('Course content').':</b><br />');
     $r->rflush();
 # ======================================================= Go through the course
@@ -653,8 +663,9 @@
 } # End of course search scoping
 
 sub search_html_header {
+    my $html=&Apache::lonxml::xmlbegin();
     my $Str = <<ENDHEADER;
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
@@ -2111,8 +2122,9 @@
         return;
     }
     my $result;
+    my $html=&Apache::lonxml::xmlbegin();
     $result.=<<END;
-<html>
+$html
 <head>
 <script>
     function change_sort() {
@@ -2352,9 +2364,11 @@
     #
     # Print run_search header
     #
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<END);
-<html>
-<head><title>Search Status</title></head>
+$html
+<head>
+<title>Search Status</title></head>
 $bodytag
 <form name="statusform" action="" method="post">
 <input type="hidden" name="Queue" value="" />
@@ -3087,8 +3101,11 @@
 ######################################################################
 sub search_status_header {
     my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+    my $html=&Apache::lonxml::xmlbegin();
     return <<ENDSTATUS;
-<html><head><title>Search Status</title></head>
+$html
+<head>
+<title>Search Status</title></head>
 $bodytag
 <h3>Search Status</h3>
 Sending search request to LON-CAPA servers.<br />
@@ -3111,8 +3128,9 @@
         "&persistent_db_id=".$ENV{'form.persistent_db_id'};
     my $run_search_link = $basic_link."&phase=run_search";
     my $results_link = &results_link();
+    my $html=&Apache::lonxml::xmlbegin();
     my $result = <<"ENDFRAMES";
-<html>
+$html
 <head>
 <script>
 var targetwin = opener;
@@ -3508,8 +3526,9 @@
     my $heading = &mt('Unparsed Field');
     my $revise  = &mt('Revise search request');
     # make query information persistent to allow for subsequent revision
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDPAGE);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
@@ -3556,8 +3575,9 @@
     my $errormsg = &mt('You did not fill in enough information for the search to be started.  You need to fill in relevant fields on the search page in order for a query to be processed.');
     my $revise = &mt('Revise Search Request');
     my $heading = &mt('Unactionable Search Queary');
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDPAGE);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
@@ -3602,8 +3622,9 @@
     my ($r,$message,$closebutton,$hidden_fields)=@_;
     # make query information persistent to allow for subsequent revision
     my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<RESULTS);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.22 loncom/interface/lonsimplepage.pm:1.23
--- loncom/interface/lonsimplepage.pm:1.22	Tue Jul 27 19:35:34 2004
+++ loncom/interface/lonsimplepage.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.22 2004/07/27 23:35:34 www Exp $
+# $Id: lonsimplepage.pm,v 1.23 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,8 +46,9 @@
     my $target=$ENV{'form.grade_target'};
 # ------------------------------------------------------------ Print the screen
     if ($target ne 'tex') {
+	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 ENDDOCUMENT
Index: loncom/interface/lonsource.pm
diff -u loncom/interface/lonsource.pm:1.8 loncom/interface/lonsource.pm:1.9
--- loncom/interface/lonsource.pm:1.8	Thu Jul  8 16:17:59 2004
+++ loncom/interface/lonsource.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Souce Code handler
 #
-# $Id: lonsource.pm,v 1.8 2004/07/08 20:17:59 taceyjo1 Exp $
+# $Id: lonsource.pm,v 1.9 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,7 +55,8 @@
     &Apache::loncommon::content_type($r,'text/html');
     my ($uname, $udom) = &Apache::loncacc::constructaccess('/~'.$author.'/',$r->dir_config('lonDefDomain'));
     $r->send_http_header;
-    $r->print('<html><head><title>LON-CAPA Move source to construction space</title>');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>LON-CAPA Move source to construction space</title>');
     $r->print(&Apache::loncommon::bodytag('Problem source code moving operation'));
     $r->print("Please enter the directory that you would like the source code to go into, a default has also been 			provided <br />");
     $r->print("Also note, the path is in reference to the root of your construction space, and new directories will be 			automatically created. <br /><br />");
@@ -94,7 +95,8 @@
     }
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
-    $r->print('<html><head><title>LON-CAPA Move source to construction space</title>');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>LON-CAPA Move source to construction space</title>');
     $r->print(&Apache::loncommon::bodytag('Copying Source'));
     my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file);
     $r->print($result);
Index: loncom/interface/lonspeller.pm
diff -u loncom/interface/lonspeller.pm:1.9 loncom/interface/lonspeller.pm:1.10
--- loncom/interface/lonspeller.pm:1.9	Thu Dec  2 15:54:26 2004
+++ loncom/interface/lonspeller.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Interface routines for Aspell
 #
-# $Id: lonspeller.pm,v 1.9 2004/12/02 20:54:26 albertel Exp $
+# $Id: lonspeller.pm,v 1.10 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,10 +65,11 @@
 	    my $suggestions=join(' ',$speller->suggest($word));
 	    $suggestions=~s/\'/\\\'/gs;
 	    if (($suggestions) && (!$insidelink)) {
+		my $html=&Apache::lonxml::xmlbegin('encode');
 		$output.='<a href="javascript:spellwin=window.open('.
 		    &Apache::lonhtmlcommon::javascript_nothing().
 		    ',\'spellwin\',\'height=140,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no\');'.
-                    'spellwin.'.&Apache::lonhtmlcommon::javascript_docopen().';spellwin.document.writeln(\'<html><body><h3>'.$word.
+                    'spellwin.'.&Apache::lonhtmlcommon::javascript_docopen().';spellwin.document.writeln(\''.$html.'<head></head><body><h3>'.$word.
                     '</h3>'.$suggestions.'</body></html>\');spellwin.document.close();spellwin.focus()">';
 	    }
 	    $output.='<font color="red">'.$word.'</font>';
@@ -126,7 +127,8 @@
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
     &initspeller();
-    $r->print('<html><head><title>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>'.
 	      &mt('Spell Checker').
 	      '</title></head><body bgcolor="#DDDDDD">'.
 	      &Apache::lontexconvert::msgtexconverted(
Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.113 loncom/interface/lonstatistics.pm:1.114
--- loncom/interface/lonstatistics.pm:1.113	Tue Feb  1 10:15:28 2005
+++ loncom/interface/lonstatistics.pm	Thu Feb 17 03:29:43 2005
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstatistics.pm,v 1.113 2005/02/01 15:15:28 matthew Exp $
+# $Id: lonstatistics.pm,v 1.114 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1012,7 +1012,8 @@
     td.essay          { border: 1px solid gray; }
 </style>
 ENDSTYLE
-    $r->print('<html><head><title>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>'.
               &mt('Course Statistics and Charts').
               '</title>'.$style.
               "</head>\n".
Index: loncom/interface/lonsupportreq.pm
diff -u loncom/interface/lonsupportreq.pm:1.22 loncom/interface/lonsupportreq.pm:1.23
--- loncom/interface/lonsupportreq.pm:1.22	Fri Dec 31 15:29:27 2004
+++ loncom/interface/lonsupportreq.pm	Thu Feb 17 03:29:43 2005
@@ -166,8 +166,9 @@
             }
         }
     }
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
-<html>
+$html
 <head>
  <title>LON-CAPA support request</title>
 <script type"text/javascript">
@@ -663,8 +664,9 @@
 <font color="$fontcolor">URL: </font><font color="$vlinkcolor">$ENV{'form.sourceurl'}</font><br />
 <font color="$fontcolor">Date/Time: </font><font color="$vlinkcolor">$reporttime</font><br />
     |;
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<"END");
-<html>
+$html
 <head>
  <title>LON-CAPA support request recorded</title>
 </head>
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.38 loncom/interface/lonsyllabus.pm:1.39
--- loncom/interface/lonsyllabus.pm:1.38	Tue Jul 27 19:35:34 2004
+++ loncom/interface/lonsyllabus.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.38 2004/07/27 23:35:34 www Exp $
+# $Id: lonsyllabus.pm,v 1.39 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,8 +48,9 @@
 # ------------------------------------------------------------ Print the screen
     my $target=$ENV{'form.grade_target'};
     if ($target ne 'tex') {
+	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 ENDDOCUMENT
Index: loncom/interface/lontest.pm
diff -u loncom/interface/lontest.pm:1.12 loncom/interface/lontest.pm:1.13
--- loncom/interface/lontest.pm:1.12	Mon Nov  1 18:03:33 2004
+++ loncom/interface/lontest.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # A debugging harness.
 #
-# $Id: lontest.pm,v 1.12 2004/11/01 23:03:33 albertel Exp $
+# $Id: lontest.pm,v 1.13 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,12 +52,13 @@
      $r->send_http_header;
      return OK if $r->header_only;
 
+     my $html=&Apache::lonxml::xmlbegin();
      my $bodytag=&Apache::loncommon::bodytag("List Environment","admin");
-     $r->print('<html>'.$bodytag);
+     $r->print($html.'<head></head>'.$bodytag);
      
      my $envkey;
  
-     $r->print("<hr><h1>Debugging</h1><hr>\n");
+     $r->print("<hr /><h1>Debugging</h1><hr />\n");
      $r->print("<font face='Courier'>");
      
      my $i=0;
@@ -74,7 +75,7 @@
 	 if ($prevSection ne $sec) # new section, print header
 	 {
 	     $r->print('<tr><td colspan="2">');
-	     $r->print("<br><br><h2 style='color: #008800'><u>$sec</u></h2>");
+	     $r->print("<br /><br /><h2 style='color: #008800'><u>$sec</u></h2>");
 	     $r->print('</td></tr>');
 	     $prevSection = $sec;
 	 }
@@ -102,7 +103,7 @@
          if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
              $r->print('<h2>Big Hash</h2>');
              foreach (sort keys %hash) {
-	         $r->print("\n<br>".$_.': '.$hash{$_});
+	         $r->print("\n<br />".$_.': '.$hash{$_});
              }
              untie %hash;
          } else {
@@ -113,7 +114,7 @@
 		     &GDBM_READER(),0640)) {
              $r->print('<h2>Parm Hash</h2>');
              foreach (sort keys %parmhash) {
-	        $r->print("\n<br>".$_.': '.$parmhash{$_});
+	        $r->print("\n<br />".$_.': '.$parmhash{$_});
              }
              untie %parmhash;
          } else {
@@ -122,7 +123,7 @@
          if (tie(%symbhash,'GDBM_File',"$fn\_symb.db",&GDBM_READER(),0640)) {
             $r->print('<h2>Symb Hash</h2>');
             foreach (sort keys %symbhash) {
-	       $r->print("\n<br>".$_.': '.$symbhash{$_});
+	       $r->print("\n<br />".$_.': '.$symbhash{$_});
             }
             untie %symbhash;
 	 } else {
Index: loncom/interface/lontrackstudent.pm
diff -u loncom/interface/lontrackstudent.pm:1.13 loncom/interface/lontrackstudent.pm:1.14
--- loncom/interface/lontrackstudent.pm:1.13	Wed Feb  9 16:21:08 2005
+++ loncom/interface/lontrackstudent.pm	Thu Feb 17 03:29:43 2005
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lontrackstudent.pm,v 1.13 2005/02/09 21:21:08 matthew Exp $
+# $Id: lontrackstudent.pm,v 1.14 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -501,7 +501,8 @@
                                             bug=>'instructor interface'});
     #
     # Give the LON-CAPA page header
-    $r->print('<html><head>'.&styles.'<title>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head>'.&styles().'<title>'.
               &mt('Student Activity').
               "</title></head>\n".
               &Apache::loncommon::bodytag('Student Activity').
Index: loncom/interface/lonviewclasslist.pm
diff -u loncom/interface/lonviewclasslist.pm:1.3 loncom/interface/lonviewclasslist.pm:1.4
--- loncom/interface/lonviewclasslist.pm:1.3	Wed Dec  8 14:30:58 2004
+++ loncom/interface/lonviewclasslist.pm	Thu Feb 17 03:29:43 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to display the classlist 
 #
-# $Id: lonviewclasslist.pm,v 1.3 2004/12/08 19:30:58 matthew Exp $
+# $Id: lonviewclasslist.pm,v 1.4 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,8 +78,9 @@
     my $bodytag=&Apache::loncommon::bodytag('Classlist');
     my $breadcrumbs=&Apache::lonhtmlcommon::breadcrumbs(undef,
                                                         'Enrollment Manager');
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEADER);
-<html>
+$html
 <head>
 <title>Classlist</title>
 </head>
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.74 loncom/interface/portfolio.pm:1.75
--- loncom/interface/portfolio.pm:1.74	Fri Feb 11 01:18:52 2005
+++ loncom/interface/portfolio.pm	Thu Feb 17 03:29:43 2005
@@ -509,7 +509,8 @@
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     # Give the LON-CAPA page header
-    $r->print('<html><head><title>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>'.
               &mt('Portfolio Manager').
               "</title></head>\n");
     if ($ENV{"form.mode"} eq 'selectfile'){

--albertel1108628984--


