--- rat/client/parameter.html	2000/11/19 03:23:54	1.2
+++ rat/client/parameter.html	2000/11/27 12:11:55	1.4
@@ -2,7 +2,7 @@
 <!--
 The LearningOnline Network with CAPA
 Parameter Input Window
-06/16/00,06/17,11/17,11/18 Gerd Kortemeyer
+06/16/00,06/17,11/17,11/18,11/23,11/27 Gerd Kortemeyer
 -->
 <head>
 <title>LON-CAPA</title>
@@ -378,7 +378,6 @@ function assemble() {
         svalue=Math.round(cdate.getTime()/1000);
     }
     stype=ptype+'_'+pscat;
-    alert(stype+'   '+svalue);
 }
 
 
@@ -390,6 +389,7 @@ function init() {
 
   for (i=0;i<namevalue.length;i++) {
      var pair=namevalue[i].split('=');
+     pair[1]=unescape(pair[1]);
      if (pair[0]=='value') { pvalue=pair[1]; }
      if (pair[0]=='type') { subs=pair[1].split('_');
                             ptype=subs[0];
@@ -461,16 +461,32 @@ function init() {
 
   selwrite('<a href="javascript:parent.assemble();');
   if (preturn!='') {
-     selwrite('parent.opener.'+preturn+'=parent.window.svalue;');
-     selwrite('parent.opener.'+preturn+'_type=parent.window.stype;');
+     selwrite(
+      'parent.opener.document.'+preturn+'_value.value=parent.window.svalue;');
+     selwrite(
+      'parent.opener.document.'+preturn+'_type.value=parent.window.stype;');
   }
   if (pmarker!='') {
-     selwrite('parent.opener.'+pmarker+'=parent.window.pmarker;');
+     selwrite(
+     'parent.opener.document.'+preturn+'_marker.value=parent.window.pmarker;');
   }
   if (pcode!='') {
-     selwrite('parent.opener.'+pcode+';');
+     selwrite('parent.opener.'+pcode+'();');
   }
-  selwrite('">Store</a>'); 
+  selwrite('">Store</a>&nbsp;&nbsp;');
+ 
+  selwrite('<a href="javascript:');
+  if (preturn!='') {
+     selwrite('parent.opener.document.'+preturn+'_value.value='+"'';");
+     selwrite('parent.opener.document.'+preturn+'_type.value='+"'';");
+  }
+  if (pmarker!='') {
+     selwrite('parent.opener.document.'+preturn+'_marker.value='+"'';");
+  }
+  if (pcode!='') {
+     selwrite('parent.opener.'+pcode+'();');
+  }
+  selwrite('">Cancel</a>'); 
  
   selwrite('</body></html>');
   this.window.selector.document.close();
