--- loncom/interface/lonconfigsettings.pm 2011/10/19 21:15:53 1.20 +++ loncom/interface/lonconfigsettings.pm 2012/05/02 20:32:37 1.21.4.1 @@ -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.4.1 2012/05/02 20:32:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,7 +35,6 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; -use Apache::lonparmset(); sub print_header { my ($r,$phase,$context,$jscript,$container) = @_; @@ -127,9 +126,6 @@ $jscript '); - if ($container) { - &Apache::lonparmset::startSettingsScreen($r,$container); - } $r->print('
'); - if ($container) { - &Apache::lonparmset::endSettingsScreen($r); - } $r->print(&Apache::loncommon::end_page()); } return; @@ -353,15 +346,11 @@ sub display_choices { 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.'+