--- loncom/interface/lonconfigsettings.pm	2009/10/29 14:57:18	1.7
+++ loncom/interface/lonconfigsettings.pm	2010/02/13 19:32:51	1.8.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.7 2009/10/29 14:57:18 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.8.2.1 2010/02/13 19:32:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,10 +38,22 @@ use Apache::lonlocal;
 
 sub print_header {
     my ($r,$phase,$context,$jscript) = @_;
-    my ($pagetitle,$brcrumtitle,$action);
+    my ($pagetitle,$brcrumtitle,$action,$call_category_check);
     if ($context eq 'domain') {
         ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','Domain Settings');
         $action = '/adm/domainprefs';
+        if ($phase eq 'display') {
+            my @actions = &Apache::loncommon::get_env_multiple('form.actions');
+            if (grep(/^coursecategories$/,@actions)) {
+                $call_category_check = qq|
+    if (formname == document.display) {
+        if (!categoryCheck(formname)) {
+            return;
+        }
+    }
+|;
+            }
+        }
     } else {
         if (&Apache::loncommon::course_type() eq 'Community') {
             ($pagetitle,$brcrumtitle) = ('Community Configuration','Community Configuration');
@@ -77,6 +89,7 @@ function changePage(formname,newphase) {
             return;
         }
     }
+    '.$call_category_check.'
     formname.submit();
 }'."\n";
     if ($phase eq 'pickactions') {
@@ -199,13 +212,14 @@ sub make_changes {
     }
     if ($context eq 'course') {
         if ($numchanged) {
-            $r->print(&Apache::courseprefs::store_changes($dom,$confname,$prefs_order,\@actions,
-                                                          $prefs,$values,\%changes,$crstype));
+            my $message = &Apache::courseprefs::store_changes($dom,$confname,$prefs_order,\@actions,
+                                                          $prefs,$values,\%changes,$crstype);
+            $r->print(&Apache::loncommon::confirmwrapper($message));
         } else {
             if ($crstype eq 'Community') {
-                $r->print(&mt("No changes made to community configuration."));
+                $r->print(&Apache::loncommon::confirmwrapper(&mt("No changes made to community configuration.")));
             } else {
-                $r->print(&mt("No changes made to course configuration."));
+                $r->print(&Apache::loncommon::confirmwrapper(&mt("No changes made to course configuration.")));
             }
         }
         if (keys(%disallowed) > 0) {