--- loncom/interface/lonconfigsettings.pm	2009/04/26 00:09:53	1.3
+++ loncom/interface/lonconfigsettings.pm	2009/05/12 21:20:42	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.3 2009/04/26 00:09:53 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.4 2009/05/12 21:20:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -152,9 +152,10 @@ sub print_footer {
 }
 
 sub make_changes {
-    my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles) = @_;
+    my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles,$allitems) = @_;
     my %brcrumtext = &get_crumb_text();
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
+    my ($numchanged,%changes,%disallowed);
     &Apache::lonhtmlcommon::add_breadcrumb
       ({href=>"javascript:changePage(document.$phase,'display')",
         text=>$brcrumtext{$context}},
@@ -165,17 +166,48 @@ sub make_changes {
         (ref($prefs) eq 'HASH')) {
         foreach my $item (@{$prefs_order}) {
             if (grep(/^\Q$item\E$/,@actions)) {
-                $r->print('<h3>'.&mt($prefs->{$item}{'text'}).'</h3>');
                 if ($context eq 'domain') {
-                    $r->print(&Apache::domainprefs::process_changes($r,$dom,$confname,$item,$roles,$values));
+                    $r->print('<h3>'.&mt($prefs->{$item}{'text'}).'</h3>'.
+                              &Apache::domainprefs::process_changes($r,$dom,
+                                          $confname,$item,$roles,$values,));
                 } else {
-                    $r->print(&Apache::courseprefs::process_changes($r,$dom,$item,$values));
+                    $changes{$item} = {};
+                    &Apache::courseprefs::process_changes($dom,$item,$values,
+                                                          $prefs->{$item},$changes{$item},
+                                                          $allitems,\%disallowed);
+                    if (keys(%{$changes{$item}}) > 0) {
+                        $numchanged ++;
+                    }
                 }
             }
         }
     }
+    if ($context eq 'course') {
+        if ($numchanged) {
+            $r->print(&Apache::courseprefs::store_changes($dom,$confname,$prefs_order,\@actions,
+                                                          $prefs,$values,\%changes));
+        } else {
+            $r->print(&mt('No changes made to course configuration.'));
+        }
+        if (keys(%disallowed) > 0) {
+            $r->print('<p>');
+            foreach my $item ('cloners','rolenames','feedback','discussion','localization') {
+                if (ref($disallowed{$item}) eq 'HASH') {
+                    if (keys(%{$disallowed{$item}}) > 0) {
+                        $r->print(&Apache::courseprefs::display_disallowed($item,$disallowed{$item},
+                                                                           $prefs));
+                    }
+                }
+            }
+            $r->print('</p>');
+        }
+    }
     $r->print('<p>');
-    &print_footer($r,$phase,'display','Back to configuration display',\@actions);
+    my $footer_text = 'Back to configuration display';
+    if ($context eq 'course') {
+        $footer_text = 'Back to display/edit settings'; 
+    }
+    &print_footer($r,$phase,'display',$footer_text,\@actions);
     $r->print('</p>');
 }
 
@@ -186,7 +218,7 @@ sub display_settings {
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"javascript:changePage(document.$phase,'display')",
-          text=>"Course Settings"});
+          text=>"Display/Edit Settings"});
     &print_header($r,$phase,$context,$jscript);
     if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) { 
         if (@actions > 0) {
@@ -373,7 +405,7 @@ ENDCOL
 sub get_crumb_text {
     my %brcrumbtext = (
                        domain => 'Domain Settings',
-                       course => 'Course Settings',
+                       course => 'Display/Edit Settings',
                      );
     return %brcrumbtext;
 }