--- loncom/xml/scripttag.pm	2011/12/09 22:04:55	1.158
+++ loncom/xml/scripttag.pm	2011/12/23 19:38:01	1.164
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.158 2011/12/09 22:04:55 www Exp $
+# $Id: scripttag.pm,v 1.164 2011/12/23 19:38:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,7 +41,7 @@ use Apache::style();
 BEGIN {
   &Apache::lonxml::register('Apache::scripttag',
 			    ('script','scriptlib','parserlib','import',
-			     'window','display','storetc','physnet',
+			     'window','windowlink','togglebox','display','storetc','physnet',
 			     'standalone','comment','num','parse','algebra',
 			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
 			     'LONCAPA_INTERNAL_TURN_STYLE_OFF'));
@@ -102,30 +102,15 @@ sub start_script {
 	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
 	    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
-	    my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
-	    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 $function_name = 
 		join('_','LONCAPA_scriptvars',$uname,$udom,
 		     $env{'form.counter'},$Apache::lonxml::curdepth);
-            my $scriptblocklog=$start_page.
-                               &Apache::loncommon::start_scrollbox('500px','480px','480px').
-                               '<pre>'.&Apache::run::dump($target,$safeeval).'</pre>'.
-                               &Apache::loncommon::end_scrollbox().
-                               $end_page;
-            $scriptblocklog=~s/\'/\\'/gs;
             &Apache::lonxml::add_script_result(
-	             &Apache::loncommon::modal_adhoc_script($function_name,500,500,$scriptblocklog).
-                     "<a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />"
-                                              );
+	             &Apache::loncommon::modal_adhoc_window($function_name,500,500,
+                            '<pre>'.&Apache::run::dump($target,$safeeval).'</pre>',
+                            &mt('Script Vars'))."<br />");
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -302,19 +287,24 @@ sub start_window {
     if ($target eq 'web' || $target eq 'webgrade') {
 	&Apache::lonxml::startredirection;
     } elsif ($target eq 'tex') {
-	$result = '\unskip\footnote{';
+        my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval);
+        if ($printtext=~/\w/) {
+# If printtext is given, do not output any intervening information
+           &Apache::lonxml::startredirection;
+        } else {
+           $result = '\unskip\footnote{';
+        }
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
 	$result.=&Apache::edit::text_arg('Height:','height',$token,5);
 	$result.=&Apache::edit::text_arg('Width:','width',$token,5);
-	$result.=&Apache::edit::text_arg('Mime Type:','mimetype',$token,5);
+        $result.=&Apache::edit::text_arg('Printed text (optional):','printtext',$token,20);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						     $safeeval,'linktext',
-						     'width','height',
-						     'mimetype');
+						     'width','height');
 	if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }
     return $result;  
@@ -325,47 +315,117 @@ sub end_window {
   my $result;
   if ($target eq 'web' || $target eq 'webgrade') {
     my $output=&Apache::lonxml::endredirection;
-    $output =~ s/[\n\r]/ /g;
-#    $output = &HTML::Entities::encode($output,'<>&"\'');
-    $output =~ s/\'/\\\'/g;
     my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
     if (!$linktext) { $linktext='<sup>*</sup>'; }
     my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
     if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }
-    my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
-	          || 'text/html';
+    $result=&Apache::loncommon::modal_adhoc_window
+           ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext);
+  } elsif ($target eq 'tex') {
+      my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval);
+      if ($printtext=~/\w/) {
+# If a "printtext" is given, proceed to retrieve all intervening information and trash it
+         my $output=&Apache::lonxml::endredirection;
+# Use printtext instead
+         $result=$printtext;
+      } else {
+         $result='}';
+      }
+  } else {
+      $result = '';
+  }
+  return $result; 
+}
+
+
+sub start_windowlink {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if ($target eq 'web' || $target eq 'webgrade') {
+        &Apache::lonxml::startredirection;
+    } elsif ($target eq 'edit') {
+        $result.=&Apache::edit::tag_start($target,$token);
+        $result.=&Apache::edit::text_arg('Link:','href',$token,70);
+        $result.=&Apache::edit::text_arg('Height:','height',$token,5);
+        $result.=&Apache::edit::text_arg('Width:','width',$token,5);
+        $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+        my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                     $safeeval,'href',
+                                                     'width','height');
+        if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_windowlink {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'web' || $target eq 'webgrade') {
+    my $output=&Apache::lonxml::endredirection;
+    my $href= &Apache::lonxml::get_param('href',$parstack,$safeeval);
+    if (!$href) { $href='/adm/rat/empty.html'; }
+    my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
+    if (!$width) { $width='500'; }
+    my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+    if (!$height) { $height='200'; }
+    $result=&Apache::loncommon::modal_link($href,$output,$width,$height);
+  } else {
+      $result = '';
+  }
+  return $result;
+}
+
 
-    my ($start_page,$end_page);
-    if ($mimetype eq 'text/html') {
-	$start_page =
-	    &Apache::loncommon::start_page($linktext, undef,
-					   {'only_body' => 1,
-					    'bgcolor'   => '#FFFFFF',
-					    'js_ready'  => 1,});
-	$end_page =
-	    &Apache::loncommon::end_page({'js_ready' => 1,});
+sub start_togglebox {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if ($target eq 'web' || $target eq 'webgrade') {
+        my $id="LONCAPA_togglebox_$Apache::lonxml::curdepth";
+        my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval);
+        unless ($heading) { $heading=''; } else { $heading.=' '; }
+        my $showtext=&Apache::lonxml::get_param('showtext',$parstack,$safeeval);
+        my $hidetext=&Apache::lonxml::get_param('hidetext',$parstack,$safeeval);
+        my $headerbg=&Apache::lonxml::get_param('headerbg',$parstack,$safeeval);
+        $result=&Apache::loncommon::start_togglebox($id,$heading,$headerbg,$hidetext,$showtext);
+    } elsif ($target eq 'tex') {
+        my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval);
+        unless ($heading) { $heading=''; } else { $heading.=' '; }
+        $result = "\n\n".'\fbox{{\bf '.$heading.'} \qquad '."\n";
+    } elsif ($target eq 'edit') {
+        $result.=&Apache::edit::tag_start($target,$token);
+        $result.=&Apache::edit::text_arg('Heading:','heading',$token,70);
+        $result.=&Apache::edit::text_arg('Header Background:','headerbg',$token,7);
+        $result.=&Apache::edit::text_arg('Show text:','showtext',$token,10);
+        $result.=&Apache::edit::text_arg('Hide text:','hidetext',$token,10);
+        $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+        my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                     $safeeval,'heading',
+                                                     'showtext','hidetext',
+                                                     'headerbg','textbg');
+        if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }
-    $result = "<script type=\"text/javascript\">
-//<!--
- function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
-newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W');
-newWindow.close();
-newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
-newWindow.".&Apache::lonhtmlcommon::javascript_docopen($mimetype).";
-newWindow.document.writeln('$start_page $output $end_page');
-newWindow.document.close();}
-//-->
-</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";
+    return $result;
+}
+
+sub end_togglebox {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'web' || $target eq 'webgrade') {
+    $result=&Apache::loncommon::end_togglebox();
   } elsif ($target eq 'tex') {
-      $result = '}';
+      $result = "}\n\n";
   } else {
       $result = '';
   }
-  return $result; 
+  return $result;
 }
 
+
+
 sub start_import {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $bodytext=$$parser[$#$parser]->get_text("/import");