[LON-CAPA-cvs] cvs: loncom /interface lonevaluate.pm

www lon-capa-cvs@mail.lon-capa.org
Fri, 29 Mar 2002 15:15:54 -0000


www		Fri Mar 29 10:15:54 2002 EDT

  Modified files:              
    /loncom/interface	lonevaluate.pm 
  Log:
  Should not return to location if it was opened in separate window
  
  
Index: loncom/interface/lonevaluate.pm
diff -u loncom/interface/lonevaluate.pm:1.7 loncom/interface/lonevaluate.pm:1.8
--- loncom/interface/lonevaluate.pm:1.7	Thu Mar 28 16:38:53 2002
+++ loncom/interface/lonevaluate.pm	Fri Mar 29 10:15:54 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.7 2002/03/28 21:38:53 www Exp $
+# $Id: lonevaluate.pm,v 1.8 2002/03/29 15:15:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,8 +90,14 @@
 <html>
 <head>
 <title>Evaluation submitted</title>
+<script>
+    function go() {
+	if (window.name!='LONcatInfo') {
+            window.location='/res/$feedurl';
+        }
+    }
+</script>
 <meta http-equiv="pragma" content="no-cache"></meta>
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=/res/$feedurl">
 </head>
 <body bgcolor="#FFFFFF">
 <h1>Thank you for your input!</h1>
@@ -101,12 +107,13 @@
            unless ($already) {
 	       $r->print('<br>Logging first evaluation');
            }
-           $r->print('</body></html>');
+           $r->print(
+            '<script>setTimeout("go()",2000);</script></body></html>');
            return OK;
         } else {
 	    $warning='Please fill out all fields below';
         }
-    
+   
     }
 
 # ---------------------------------------------------------- Dial in old values