--- loncom/interface/courseprefs.pm	2021/08/04 19:59:10	1.93
+++ loncom/interface/courseprefs.pm	2021/10/18 22:29:20	1.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.93 2021/08/04 19:59:10 raeburn Exp $
+# $Id: courseprefs.pm,v 1.94 2021/10/18 22:29:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -995,8 +995,8 @@ sub process_changes {
                                 }
                             }
                         }
-
                     }
+
                     foreach my $idx (@items) {
                         my $itemid = $itemids{$idx};
                         next unless ($itemid);
@@ -4076,8 +4076,8 @@ sub print_feedback {
         }
         if ($position eq 'top') {
             my $includeempty = 0;
-            $datatable .=  '</td><td align="right">'.
-                           &user_table($cdom,$item,\@sections,
+            $datatable .= '</td><td align="right">'.
+                          &user_table($cdom,$item,\@sections,
                                       $settings->{$item},\%lt,$noedit);
         } else {
             $datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
@@ -4300,8 +4300,8 @@ sub print_discussion {
                           '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
                           '</table>';
         } elsif ($item eq 'plc.users.denied') {
-            $datatable .=  '</td><td align="right">'.
-                           &user_table($cdom,$item,undef,
+            $datatable .= '</td><td align="right">'.
+                          &user_table($cdom,$item,undef,
                                       $settings->{$item},\%lt,$noedit);
         } elsif ($item eq 'pch.roles.denied') {
             $datatable .= '</td><td align="right">'.
@@ -5064,7 +5064,7 @@ sub print_menuitems {
                     my %checked;
                     my $on = ' checked="checked"';
                     foreach my $key (keys(%{$menu{$num}})) {
-                        if (($key eq 'top') || ($key eq 'inline') || ($key eq 'main')) {
+                        if (($key eq 'top') || ($key eq 'inline') || ($key eq 'foot') || ($key eq 'main')) {
                             if ($menu{$num}{$key} eq 'y') {
                                 $checked{$key} = $on;
                             }
@@ -5081,7 +5081,13 @@ sub print_menuitems {
                         foreach my $category (@order) {
                             if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
                                 $datatable .= '<fieldset style="vertical-align:top; display:inline-block"><legend>'.$menutitles{$category}.'</legend>'."\n";
+                                if ($category eq 'text') {
+                                    $datatable .= '<i>'.&mt('Header').'</i><br />';
+                                }
                                 foreach my $field (@{$categories{$category}}) {
+                                    if ($field eq 'disc') {
+                                        $datatable .= '<br /><i>'.&mt('Footer').'</i><br />';
+                                    }
                                     $datatable .= '<label><input type="checkbox" name="menucollections_'.$num.'" value="'.$field.'"'.$checked{$field}.$disabled.' />'.
                                                   $menufields{$field}.'</label><br />';
                                 }
@@ -5131,8 +5137,8 @@ sub menuitems_abbreviations {
 sub menuitems_categories {
     my @order = ('shown','text','links','list','inline');
     my %categories = (
-                       shown => ['top','inline','main'],
-                       text  => ['name','role','crs'],
+                       shown => ['top','inline','foot','main'],
+                       text  => ['name','role','crs','disc','fdbk'],
                        links => ['pers','logo','menu','comm','roles','help','logout'],
                        list => ['about','prefs','port','wish','anno','rss'],
                        inline => ['cont','grades','chat','people','groups','resv','syll','feeds'],
@@ -5143,7 +5149,7 @@ sub menuitems_categories {
 sub menuitems_titles {
     return &Apache::lonlocal::texthash (
         shown => 'Hierarchy',
-        text  => 'Header text',
+        text  => 'Text',
         links => 'Header links',
         list => 'Drop-down list',
         inline => 'Inline links',
@@ -5154,6 +5160,7 @@ sub menuitems_fields {
     return &Apache::lonlocal::texthash (
                top => 'Display header',
                inline => 'Display inline menu',
+               foot => 'Display footer',
                main => 'Access to main menu',
                pers => 'Personal',
                logo => 'LON-CAPA',
@@ -5165,6 +5172,8 @@ sub menuitems_fields {
                name => 'Fullname',
                crs => 'Course Title',
                role => 'Current Role',
+               disc => 'Discussion',
+               fdbk => 'Feedback',
                about => 'Information',
                prefs => 'Preferences',
                port => 'Portfolio',
@@ -5206,7 +5215,7 @@ sub menucollections_display {
         foreach my $num (@current) {
             my %checked;
             foreach my $key (keys(%{$menu{$num}})) {
-                if (($key eq 'top') || ($key eq 'inline') || ($key eq 'main')) {
+                if (($key eq 'top') || ($key eq 'inline') || ($key eq 'foot') || ($key eq 'main')) {
                     if ($menu{$num}{$key} eq 'y') {
                         $checked{$key} = 1;
                     }
@@ -5224,7 +5233,13 @@ sub menucollections_display {
                     if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
                         $output .= '<fieldset style="vertical-align:top; display:inline-block">'.
                                    '<legend>'.$menutitles{$category}.'</legend>'."\n";
+                        if ($category eq 'text') {
+                            $output .= '<b>'.&mt('Header Text').'</b><br /><br />';
+                        } 
                         foreach my $field (@{$categories{$category}}) {
+                            if ($field eq 'disc') {
+                                $output .= '<br /><b>'.&mt('Footer Text').'</b><br /><br />';
+                            }
                             if ($checked{$field}) {
                                 $output .= &Apache::lonhtmlcommon::confirm_success($menufields{$field});
                             } else {