--- loncom/interface/lonconfigsettings.pm	2011/10/19 21:15:53	1.20
+++ loncom/interface/lonconfigsettings.pm	2012/12/10 23:31:38	1.21.4.2
@@ -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.2 2012/12/10 23:31:38 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) = @_;
@@ -94,9 +93,11 @@ function changePage(formname,newphase) {
     formname.submit();
 }'."\n";
     if ($phase eq 'pickactions') {
+        $js .= &Apache::lonhtmlcommon::color_picker();
         $js .=
             &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox'})."\n";
     } elsif ($phase eq 'display') {
+        $js .= &Apache::lonhtmlcommon::color_picker();
         $js .= &color_pick_js()."\n";
     }
     $js .= &Apache::loncommon::viewport_size_js().'
@@ -127,9 +128,6 @@ $jscript
 <input type="hidden" name="pres_value" />
 </form>
 ');
-    if ($container) {
-       &Apache::lonparmset::startSettingsScreen($r,$container);
-    }
     $r->print('<form method="post" name="'.$phase.'" action="'.$action.'"'.
               ' enctype="multipart/form-data">');
     return;
@@ -151,7 +149,9 @@ sub print_footer {
     }
     my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
     if ($phase eq 'process') {
-        $r->print('<p><a href='.$dest.'>'.$button_text.'</a></p>');
+        $r->print(
+            &Apache::lonhtmlcommon::actionbox(
+                ['<a href='.$dest.'>'.$button_text.'</a>']));
     } else {
         my $onclick;
         if ($phase eq 'display') {
@@ -164,9 +164,6 @@ sub print_footer {
     }
     if ($phase eq 'process') {
         $r->print('</form>');
-        if ($container) {
-           &Apache::lonparmset::endSettingsScreen($r);
-        }
         $r->print(&Apache::loncommon::end_page());
     }
     return;
@@ -353,15 +350,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.'+