--- loncom/xml/scripttag.pm	2011/12/19 18:18:32	1.162
+++ loncom/xml/scripttag.pm	2011/12/23 18:34:11	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.162 2011/12/19 18:18:32 www Exp $
+# $Id: scripttag.pm,v 1.163 2011/12/23 18:34:11 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','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'));
@@ -314,8 +314,6 @@ 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') {
@@ -327,6 +325,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 = '';