--- loncom/xml/scripttag.pm	2006/03/29 22:48:08	1.134.2.2
+++ loncom/xml/scripttag.pm	2007/06/11 20:52:40	1.141
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.134.2.2 2006/03/29 22:48:08 albertel Exp $
+# $Id: scripttag.pm,v 1.141 2007/06/11 20:52:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,18 +116,29 @@ sub start_script {
 	    ($env{'form.answer_output_mode'} ne 'tex') &&
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
-	    my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
+	    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
 	    my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
-	    $result.="<script type=\"text/javascript\">
+	    my $start_page =
+		&Apache::loncommon::start_page('Script Vars', undef,
+					       {'only_body' => 1,
+						'bgcolor'   => '#FFFFFF',
+						'js_ready'  => 1,});
+	    my $end_page =
+		&Apache::loncommon::end_page({'js_ready' => 1,});
+
+	    $uname =~s/\W//g;
+	    $udom  =~s/\W//g;
+	    my $script_var ="<script type=\"text/javascript\">
 // <![CDATA[
-    function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('<html><head><title>Script Vars</title></head><body bgcolor=\"#FFFFFF\"><pre>";
+    function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>";
 	    my $listing=&Apache::run::dump($target,$safeeval);
 	    $listing=~s/\\/\\\\/g;
 	    $listing=~s/\'/\\\'/g;
-	    $result.=$listing;
-	    $result.= "</pre></body></html>');newWindow.document.close();newWindow.focus()}
+	    $script_var.=$listing;
+	    $script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
 // ]]>
 </script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />";
+	    &Apache::lonxml::add_script_result($script_var);
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -334,7 +345,23 @@ sub end_window {
     if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }
-    $result = "<script type=\"text/javascript\"> function LONCAPA_newwindow_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=$width,height=$height,scrollbars=1');newWindow.document.open('text/html','replace');newWindow.document.writeln('<html><head><title>newwindow</title></head><body bgcolor=\"#FFFFFF\"> $output </body></html>');newWindow.document.close();}</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
+
+    my $start_page =
+	&Apache::loncommon::start_page($linktext, undef,
+				       {'only_body' => 1,
+					'bgcolor'   => '#FFFFFF',
+					'js_ready'  => 1,});
+    my $end_page =
+	&Apache::loncommon::end_page({'js_ready' => 1,});
+    $result = "<script type=\"text/javascript\">
+//<!--
+ function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
+newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
+newWindow.".&Apache::lonhtmlcommon::javascript_docopen().";
+newWindow.document.writeln('$start_page $output $end_page');
+newWindow.document.close();}
+//-->
+</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
   } elsif ($target eq 'tex') {
       $result = '}';
   } else {
