--- loncom/interface/lonconfigsettings.pm	2011/12/08 22:10:18	1.21
+++ loncom/interface/lonconfigsettings.pm	2014/01/05 19:15:48	1.21.4.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.21 2011/12/08 22:10:18 www Exp $
+# $Id: lonconfigsettings.pm,v 1.21.4.4 2014/01/05 19:15:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,11 +35,10 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
-use Apache::lonparmset();
 
 sub print_header {
     my ($r,$phase,$context,$jscript,$container) = @_;
-    my ($pagetitle,$brcrumtitle,$action,$call_category_check);
+    my ($pagetitle,$brcrumtitle,$action,$call_category_check,$crstype);
     if ($context eq 'domain') {
         ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','View/Modify Domain Settings');
         $action = '/adm/domainprefs';
@@ -56,7 +55,8 @@ sub print_header {
             }
         }
     } else {
-        if (&Apache::loncommon::course_type() eq 'Community') {
+        $crstype = &Apache::loncommon::course_type();
+        if ($crstype eq 'Community') {
             ($pagetitle,$brcrumtitle) = ('Community Configuration','Community Configuration');
         } else {
             ($pagetitle,$brcrumtitle) = ('Course Configuration','Course Configuration');
@@ -94,9 +94,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 +129,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 +150,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 +165,6 @@ sub print_footer {
     }
     if ($phase eq 'process') {
         $r->print('</form>');
-        if ($container) {
-           &Apache::lonparmset::endSettingsScreen($r);
-        }
         $r->print(&Apache::loncommon::end_page());
     }
     return;
@@ -183,7 +181,7 @@ sub make_changes {
        {href=>"javascript:changePage(document.$phase,'$phase')",
         text=>"Updated"});
     &print_header($r,$phase,$context,undef,$container);
-    my $crstype;
+    my ($crstype,%lastact);
     if ($context eq 'course') {
         $crstype = &Apache::loncommon::course_type();
     }
@@ -194,7 +192,7 @@ sub make_changes {
                 if ($context eq 'domain') {
                     $r->print('<h3>'.&mt($prefs->{$item}{'text'}).'</h3>'.
                               &Apache::domainprefs::process_changes($r,$dom,
-                                          $confname,$item,$roles,$values));
+                                          $confname,$item,$roles,$values,\%lastact));
                 } else {
                     $changes{$item} = {};
                     &Apache::courseprefs::process_changes($dom,$item,$values,
@@ -239,6 +237,7 @@ sub make_changes {
     }
     &print_footer($r,$phase,'display',$footer_text,\@actions,$container);
     $r->print('</p>');
+    return \%lastact;
 }
 
 sub display_settings {