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

[www]

www		Thu Dec  8 22:10:19 2011 EDT

  Modified files:              
    /loncom/interface	lonconfigsettings.pm loncreateuser.pm 
  Log:
  Modal windows
  
  
Index: loncom/interface/lonconfigsettings.pm
diff -u loncom/interface/lonconfigsettings.pm:1.20 loncom/interface/lonconfigsettings.pm:1.21
--- loncom/interface/lonconfigsettings.pm:1.20	Wed Oct 19 21:15:53 2011
+++ loncom/interface/lonconfigsettings.pm	Thu Dec  8 22:10:18 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.20 2011/10/19 21:15:53 www Exp $
+# $Id: lonconfigsettings.pm,v 1.21 2011/12/08 22:10:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -353,15 +353,11 @@
 sub color_pick_js {
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $output = <<"ENDCOL";
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms","height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
 
     $pjump_def
 
     function psub() {
-        pclose();
+        modalWindow.close();
         if (document.parmform.pres_marker.value!='') {
             if (document.parmform.pres_type.value!='') {
                 eval('document.display.'+
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.358 loncom/interface/loncreateuser.pm:1.359
--- loncom/interface/loncreateuser.pm:1.358	Sun Sep 25 23:07:49 2011
+++ loncom/interface/loncreateuser.pm	Thu Dec  8 22:10:18 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.358 2011/09/25 23:07:49 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.359 2011/12/08 22:10:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -742,19 +742,13 @@
 <script type="text/javascript" language="Javascript">
 // <![CDATA[
 
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
     $pjump_def
     $dc_setcourse_code
 
     function dateset() {
         eval("document.cu."+document.cu.pres_marker.value+
             ".value=document.cu.pres_value.value");
-        pclose();
+        modalWindow.close();
     }
 
     $nondc_setsection_code