--- loncom/publisher/testbankimport.pm	2005/04/07 06:56:27	1.6
+++ loncom/publisher/testbankimport.pm	2006/04/06 22:15:19	1.9
@@ -1,5 +1,5 @@
 # Handler for parsing text upload problem descriptions into .problems
-# $Id: testbankimport.pm,v 1.6 2005/04/07 06:56:27 albertel Exp $
+# $Id: testbankimport.pm,v 1.9 2006/04/06 22:15:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,6 @@ use strict;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 use Apache::loncommon();
-use Apache::Log();
 use Apache::lonnet;
 use HTML::Entities();
 use Apache::lonlocal;
@@ -348,6 +347,14 @@ sub jscript_three {
     if (exists($env{'form.go'}) ) {
         $source = $env{'form.go'};
     }
+
+    my $start_page = 
+	&Apache::loncommon::start_page('Create Testbank directory',undef,
+				       {'only_body'   => 1,
+					'add_entries' => "topmargin='0' leftmargin='0' marginheight='0'marginwidth='0' rightmargin='0'",
+					'js_ready'    => 1,});
+    my $end_page = 
+	&Apache::loncommon::end_page({'js_ready' => 1,});
     $$jsref = <<"END_OF_ONE";
 function verify() {
     if ((document.forms.dataForm.newdir.value == '')  || (!document.forms.dataForm.newdir.value)) {
@@ -372,8 +379,7 @@ function createWin() {
     document.dataForm.newdir.value = "";
     newWindow = window.open("","CreateDir","HEIGHT=400,WIDTH=750,scrollbars=yes")
     newWindow.document.open()
-    newWindow.document.write("<html><head><title>Create Testbank directory</title><meta http-equiv='pragma' content='no-cache'>\\n")
-    newWindow.document.write("</head><body bgcolor='#CCFFDD' topmargin='0' leftmargin='0' marginheight='0'marginwidth='0' rightmargin='0'>\\n")
+    newWindow.document.write('$start_page')
     newWindow.document.write("<img border='0' src='/adm/lonInterFace/author.jpg' alt='[Author Header]'>\\n")
     newWindow.document.write("<table border='0' cellspacing='0' cellpadding='0' width='430' bgcolor='#CCFFDD'>\\n")
     newWindow.document.write("<tr><td width='2'>&nbsp;</td><td width='3'>&nbsp;</td>\\n")
@@ -387,7 +393,8 @@ function createWin() {
     newWindow.document.write("$fullpath<input type='text' name='newfilename' value=''/>")
     newWindow.document.write("<input type='button' value='Go' onClick='document.fileaction.submit();' />")
     newWindow.document.write("</td></tr>\\n")
-    newWindow.document.write("</table></body></html>")
+    newWindow.document.write("</table>")
+    newWindow.document.write('$end_page')
     newWindow.document.close()
     newWindow.focus()
 }
@@ -1341,8 +1348,6 @@ END_OF_BLOCK
    </tr>
   </table>
  </form>
-</body>
-</html>
 END_OF_FAIL
     return;
   }
@@ -1776,12 +1781,15 @@ sub handler {
         } elsif ($page_name eq 'Confirmation') {
 	    &jscript_four(\$javascript,$fullpath);
         }
-    }                                                                                
+    }
+
+    $javascript = "<script type=\"text/javascript\">\n//<!--\n".
+	$javascript."\n// --></script>\n";
+
+    $r->print(&Apache::loncommon::start_page('Upload testbank questions to Construction Space',
+					     $javascript,
+					     {'add_entries' => $loadentries}));
 
-    $r->print("<html><head><title>LON-CAPA Construction Space</title><script type=\"text/javascript\">\n//<!--\n$javascript\n// --></script>\n</head>");
-                                                                                  
-    $r->print(&Apache::loncommon::bodytag('Upload testbank questions to Construction Space',undef,$loadentries));
-                                                                                  
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
         $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.
                   &mt(' at ').$udom.'</font></h3>');
@@ -1806,7 +1814,7 @@ sub handler {
     } else {
         &Apache::lonupload::phaseone($r,$fn,$uname,$udom,'testbank');
     }
-    $r->print('</body></html>');
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 1;
