--- loncom/xml/scripttag.pm	2011/12/19 18:00:27	1.161
+++ loncom/xml/scripttag.pm	2012/02/05 23:00:06	1.165
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.161 2011/12/19 18:00:27 www Exp $
+# $Id: scripttag.pm,v 1.165 2012/02/05 23:00:06 raeburn 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','togglebox','display','storetc','physnet',
+			     'window','windowlink','togglebox','display','storetc','physnet',
 			     'standalone','comment','num','parse','algebra',
 			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
 			     'LONCAPA_INTERNAL_TURN_STYLE_OFF'));
@@ -126,6 +126,38 @@ sub start_script {
       if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
 	  $result = $token->[4];
 	  $result.=$bodytext;
+          if ($type eq "text/javascript") {
+              my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+              if (($src =~ /\.js$/) && ($src !~ m{^(/|https?://)})) {
+                  my ($path,$scriptname) = ($src =~ m{^(.+)/([^/]*)$});
+                  my $docuri =
+                      $Apache::lonnet::env{'request.noversionuri'};
+                  my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                  my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                  if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum\E)/(docs/.*/)[^/]+$}) {
+                      my $prefix = $1;
+                      my $relpath = $2;
+                      my $cleanrelpath;
+                      foreach my $dir (split(/\//,$relpath.$path)) {
+                          next if ($dir eq '.');
+                          if ($dir eq '..') {
+                              $cleanrelpath =~ s{([^/]+/)$}{};
+                          } else {
+                              $cleanrelpath .= $dir.'/';
+                          }
+                      }
+                      $cleanrelpath =~ s{/$}{};
+                      if ($cleanrelpath ne '') {
+                          $src = $prefix.'/'.$cleanrelpath.'/'.$scriptname;
+                      } else {
+                          $src = $prefix.'/'.$scriptname;
+                      }
+                      if ($src ne '') {
+                          &Apache::lonxml::extlink($src);
+                      }
+                  }
+              }
+          }
       }
   }
   return $result;
@@ -287,12 +319,19 @@ 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('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,
@@ -314,12 +353,18 @@ sub end_window {
     if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }
-
-    my ($start_page,$end_page);
     $result=&Apache::loncommon::modal_adhoc_window
            ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext);
   } elsif ($target eq 'tex') {
-      $result = '}';
+      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 = '';
   }
@@ -327,6 +372,45 @@ sub end_window {
 }
 
 
+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;
+}
+
+
 sub start_togglebox {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
@@ -335,17 +419,9 @@ sub start_togglebox {
         my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval);
         unless ($heading) { $heading=''; } else { $heading.=' '; }
         my $showtext=&Apache::lonxml::get_param('showtext',$parstack,$safeeval);
-        unless ($showtext) { $showtext=&mt('show'); }
         my $hidetext=&Apache::lonxml::get_param('hidetext',$parstack,$safeeval);
-        unless ($hidetext) { $hidetext=&mt('hide'); }
         my $headerbg=&Apache::lonxml::get_param('headerbg',$parstack,$safeeval);
-        unless ($headerbg) { $headerbg='#FFFFFF'; }
-        $result=&Apache::loncommon::start_data_table().
-                &Apache::loncommon::start_data_table_header_row().'<td bgcolor="'.$headerbg.'">'.$heading.
-                '[<a id="'.$id.'link" href="javascript:LCtoggleDisplay(\''.$id.'\',\''.$hidetext.'\',\''.
-                $showtext.'\')">'.$showtext.'</a>]</td>'.
-                &Apache::loncommon::end_data_table_header_row().
-                '<tr id="'.$id.'" style="display:none""><td>';
+        $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.=' '; }
@@ -371,7 +447,7 @@ sub end_togglebox {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
   if ($target eq 'web' || $target eq 'webgrade') {
-    $result='</td></tr>'.&Apache::loncommon::end_data_table();
+    $result=&Apache::loncommon::end_togglebox();
   } elsif ($target eq 'tex') {
       $result = "}\n\n";
   } else {