--- loncom/interface/lonmodifycourse.pm	2023/06/05 02:22:29	1.100
+++ loncom/interface/lonmodifycourse.pm	2023/09/05 03:42:31	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.100 2023/06/05 02:22:29 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.103 2023/09/05 03:42:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,7 +104,7 @@ sub get_enrollment_settings {
     my ($cdom,$cnum) = @_;
     my ($internals,$accessdates) = &autoenroll_keys();
     my @items;
-    if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) { 
+    if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) {
         @items = map { 'internal.'.$_; } (@{$internals});
         push(@items,@{$accessdates});
     }
@@ -411,7 +411,8 @@ sub get_filters {
 sub print_modification_menu {
     my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_;
     &print_header($r,$type);
-    my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum);
+    my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum,
+        $extendedtype);
     if (ref($coursehash) eq 'HASH') {
         $cdom = $coursehash->{'domain'};
         $cnum = $coursehash->{'num'};
@@ -444,17 +445,17 @@ sub print_modification_menu {
                     );
     }
     if ($type eq 'Community') {
-        if ($permission->{'setparms'} eq 'edit') { 
+        if ($permission->{'setparms'} eq 'edit') {
             $categorytitle = 'View/Modify Community Settings';
-            $linktext{'setparms'} = 'View/Modify community owner';
+            $linktext{'setparms'} = 'View/Modify community owner, self-enrollment and table lifetime';
             $linktext{'catsettings'} = 'View/Modify catalog settings for community';
         } else {
             $categorytitle = 'View Community Settings';
-            $linktext{'setparms'} = 'View community owner';
+            $linktext{'setparms'} = 'View community owner, self-enrollment and table lifetime';
             $linktext{'catsettings'} = 'View catalog settings for community';
         }
         $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
-        $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.'); 
+        $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.');
     } else {
         if ($permission->{'setparms'} eq 'edit') {
             $categorytitle = 'View/Modify Course Settings';
@@ -475,9 +476,12 @@ sub print_modification_menu {
         }
         $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
         $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
+        my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook'],
+                                            $cdom,$cnum);
+        $extendedtype = ucfirst(&Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings));
     }
     my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.');
-    my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.'); 
+    my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.');
     my $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.');
     my $ltiauth_text = &mt('Override default for requirement for re-authentication for LTI-limited launch of deep-linked item.');
     my $exttool_text = &mt('Override default permissions for external tools use for this specific course.');
@@ -582,64 +586,19 @@ sub print_modification_menu {
         },
         );
 
-    my $menu_html =
+    $r->print(
         '<h3>'
-       .&mt('View/Modify settings for: [_1]',
-                '<span class="LC_nobreak">'.$cdesc.'</span>')
-       .'</h3>'."\n".'<p>';
-    if ($type eq 'Community') {
-        $menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:');
-    } else {
-        $menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:');
-    }
-    $menu_html .= '</p>'."\n".'<ul>';
-    if ($type eq 'Community') {
-        $menu_html .= '<li>'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'</li>'."\n".
-                      '<li>'.&mt('Override defaults for who configures self-enrollment for this specific community').'</li>'."\n";
-    } else {
-        $menu_html .=  '<li>'.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'</li>'."\n".
-                       '<li>'.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'</li>'."\n";
-        if (($type ne 'Placement') && &showcredits($dom)) {
-            $menu_html .= '<li>'.&mt('Default credits earned by student on course completion.').'</li>'."\n";
-        }
-        $menu_html .= ' <li>'.&mt('Override defaults for who configures self-enrollment for this specific course.').'</li>'."\n";
-    }
-    $menu_html .= '<li>'.$mysqltables_text.'</li>'."\n".
-                  '<li>'.$setquota_text.'</li>'."\n".
-                  '<li>'.$setuploadquota_text.'</li>'."\n".
-                  '<li>'.$anon_text.'</li>'."\n".
-                  '<li>'.$postsubmit_text.'</li>'."\n".
-                  '<li>'.$ltiauth_text.'</li>'."\n".
-                  '<li>'.$exttool_text.'</li>'."\n";
-    my ($categories_link_start,$categories_link_end);
-    if ($permission->{'catsettings'} eq 'edit') {
-        $categories_link_start = '<a href="/adm/domainprefs?actions=coursecategories&amp;phase=display">';
-        $categories_link_end = '</a>';
-    }
-    foreach my $item (@additional_params) {
-        if ($type eq 'Community') {
-            if ($item eq 'togglecats') {
-                $menu_html .= '  <li>'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'</li>'."\n";
-            } elsif ($item eq 'categorize') {
-                $menu_html .= '  <li>'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'</li>'."\n";
-            }
-        } else {
-            if ($item eq 'togglecats') {
-                $menu_html .= '  <li>'.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'</li>'."\n";
-            } elsif ($item eq 'categorize') {
-                $menu_html .= '  <li>'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'</li>'."\n";
-            }
-        }
+       .&mt($type).': <span class="LC_nobreak">'.$cdesc.'</span>'
+       .'</h3>'."\n");
+    if ($extendedtype) {
+        $r->print('<h4>'.&mt('Type').': '.&mt("$extendedtype $type").'</h4>');
     }
-    $menu_html .=
-        ' </ul>'
-       .'<form name="menu" method="post" action="/adm/modifycourse">'
+    $r->print(
+        '<form name="menu" method="post" action="/adm/modifycourse">'
        ."\n"
-       .&hidden_form_elements();
-    
-    $r->print($menu_html);
-    $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
-    $r->print('</form>');
+       .&hidden_form_elements()
+       .&Apache::lonhtmlcommon::generate_menu(@menu)
+       .'</form>');
     return;
 }
 
@@ -656,9 +615,9 @@ sub print_adhocrole_selected {
         }
         $selectrole = 1;
     } elsif ($permission->{'adhocrole'} eq 'custom') {
-        my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);      
+        my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1);
         if (ref($okroles) eq 'ARRAY') {
-            my $possrole = $env{'form.adhocrole'}; 
+            my $possrole = $env{'form.adhocrole'};
             if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) {
                 my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
                 $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum";
@@ -757,30 +716,32 @@ sub print_settings_display {
         $setparms_link_start = '<a href="javascript:changePage(document.viewparms,'."'setparms'".');">';
         $setparms_link_end = '</a>';
     }
-    $r->print('<h3>'.&mt('Current automated enrollment settings for:').
-              ' <span class="LC_nobreak">'.$cdesc.'</span></h3>'.
+    $r->print('<h3>'.&mt('Current automated enrollment settings').'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
               '<form action="/adm/modifycourse" method="post" name="viewparms">'."\n".
-              '<p>'.$lt{'cose'}.'<ul>'.
+              '<p>'.$lt{'cose'}.'</p><ul>'.
               '<li>'.&mt('Settings modifiable by a [_1] via the [_2]Automated Enrollment Manager[_3] in a course.',
                          $cctitle,$enroll_link_start,$enroll_link_end).'</li>');
     if (&showcredits($cdom)) {
-        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
+        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
     } else {
-        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, and self-enrollment[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
+        $r->print('<li>'.&mt('Settings modifiable by a [_1] via [_2]View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime[_3].',$dctitle,$setparms_link_start,$setparms_link_end)."\n");
     }
-    $r->print('</li></ul></p>'.
-              '<p>'.$lt{'cour'}.'</p><p>'.$disp_table.'</p><p>'.
-              '<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.$lt{'back'}.'</a>'."\n".
-              &hidden_form_elements().
-              '</p></form>'
-    );
+    $r->print('</li></ul><p>'.
+              $lt{'cour'}.'</p>'.$disp_table.'<p>'."\n".
+              &hidden_form_elements().'</p>'.
+              '</form>'."\n");
+    my @actions =
+        ('<a href="javascript:changePage(document.viewparms,'."'menu'".')">'.
+         $lt{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
 }
 
 sub print_setquota {
     my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_;
     my $lctype = lc($type);
-    my $headline = &mt("Set disk space quotas for $lctype: [_1]",
-                     '<span class="LC_nobreak">'.$cdesc.'</span>');
+    my $headline = '<h3>'.&mt("Set disk space quotas for $lctype").'</h3>'."\n".
+                   '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n";
     my %lt = &Apache::lonlocal::texthash(
                 'gpqu' => 'Disk space for storage of group portfolio files',
                 'upqu' => 'Disk space for storage of content directly uploaded to course via Content Editor',
@@ -795,15 +756,20 @@ sub print_setquota {
                                         $cdom,$cnum);
     my $coursequota = $settings{'internal.coursequota'};
     my $uploadquota = $settings{'internal.uploadquota'};
-    if ($coursequota eq '') {
-        $coursequota = $staticdefaults{'coursequota'};
-    }
-    if ($uploadquota eq '') {
+    if (($uploadquota eq '') || ($coursequota eq '')) {
         my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
         my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings);
-        $uploadquota = $domdefs{$quotatype.'quota'};
         if ($uploadquota eq '') {
-            $uploadquota = $staticdefaults{'uploadquota'};
+            $uploadquota = $domdefs{$quotatype.'quota'};
+            if ($uploadquota eq '') {
+                $uploadquota = $staticdefaults{'uploadquota'};
+            }
+        }
+        if ($coursequota eq '') {
+            $coursequota = $domdefs{$quotatype.'coursequota'};
+            if ($coursequota eq '') {
+                $coursequota = $staticdefaults{'coursequota'};
+            }
         }
     }
     &print_header($r,$type);
@@ -817,8 +783,8 @@ sub print_setquota {
         $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
     }
     $r->print(<<ENDDOCUMENT);
+$headline
 <form action="/adm/modifycourse" method="post" name="setquota" onsubmit="return verify_quota();">
-<h3>$headline</h3>
 <p><span class="LC_nobreak">
 $porthelpitem $lt{'gpqu'}: <input type="text" size="4" name="coursequota" value="$coursequota" $disabled /> MB
 </span>
@@ -831,9 +797,12 @@ $uploadhelpitem $lt{'upqu'}: <input type
 $submit
 </p>
 $hidden_elements
-<a href="javascript:changePage(document.setquota,'menu')">$lt{'back'}</a>
 </form>
 ENDDOCUMENT
+    my @actions =
+        ('<a href="javascript:changePage(document.setquota,'."'menu'".')">'.
+         $lt{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -848,7 +817,7 @@ sub print_set_anonsurvey_threshold {
     my %settings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
     my $threshold = $settings{'internal.anonsurvey_threshold'};
     if ($threshold eq '') {
-        my %domconfig = 
+        my %domconfig =
             &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
         if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
             $threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
@@ -863,22 +832,26 @@ sub print_set_anonsurvey_threshold {
     my $hidden_elements = &hidden_form_elements();
     my ($disabled,$submit);
     if ($readonly) {
-        $disabled = ' disabled="disabled"'; 
+        $disabled = ' disabled="disabled"';
     } else {
         $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
     }
     my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold');
+    my $showtype = &mt($type);
     $r->print(<<ENDDOCUMENT);
+<h3>$lt{'resp'}</h3>
+<h4><span class="LC_nobreak">$showtype: $cdesc</span></h4>
 <form action="/adm/modifycourse" method="post" name="setanon" onsubmit="return verify_anon_threshold();">
-<h3>$lt{'resp'} <span class="LC_nobreak">$cdesc</span></h3>
 <p>
-$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" $disabled /> &nbsp;&nbsp;&nbsp;&nbsp;
+$helpitem $lt{'sufa'}: <input type="text" size="4" name="threshold" value="$threshold" $disabled /> &nbsp;&nbsp;&nbsp;&nbsp;</p>
 $submit
-</p>
 $hidden_elements
-<a href="javascript:changePage(document.setanon,'menu')">$lt{'back'}</a>
 </form>
 ENDDOCUMENT
+    my @actions =
+        ('<a href="javascript:changePage(document.setanon,'."'menu'".')">'.
+         $lt{'back'}.'</a>');
+    $r->print('<br /><br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -899,11 +872,11 @@ sub print_postsubmit_config {
     if ($postsubmit eq '') {
         my %domconfig =
             &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
-        $postsubmit = 1; 
+        $postsubmit = 1;
         if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
             if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
                 if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
-                    $postsubmit = 0; 
+                    $postsubmit = 0;
                 }
             }
         }
@@ -931,31 +904,36 @@ sub print_postsubmit_config {
         $submit = '<input type="submit" value="'.$lt{'modi'}.'" />';
     }
     my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
+    my $showtype = &mt($type);
     $r->print(<<ENDDOCUMENT);
+<h3>$lt{'conf'}</h3>
+<h4><span class="LC_nobreak">$showtype: $cdesc</span></h4>
 <form action="/adm/modifycourse" method="post" name="setpostsubmit" onsubmit="return verify_postsubmit();">
-<h3>$lt{'conf'} <span class="LC_nobreak">($cdesc)</span></h3>
 <p>
-$helpitem $lt{'disa'}: 
+$helpitem $lt{'disa'}:
 <label><input type="radio" name="postsubmit" $checkedon onclick="togglePostsubmit('studentsubmission');" value="1" $disabled />
 $lt{'yes'}</label>&nbsp;&nbsp;
 <label><input type="radio" name="postsubmit" $checkedoff onclick="togglePostsubmit('studentsubmission');" value="0" $disabled />
-$lt{'no'}</label>
+$lt{'no'}</label></p>
 <div id="studentsubmission" style="display: $display">
 $lt{'nums'} <input type="text" name="postsubtimeout" value="$postsubtimeout" $disabled /><br />
 $zero</div>
-<br />     
+<p>
 $submit
 </p>
 $hidden_elements
-<a href="javascript:changePage(document.setpostsubmit,'menu')">$lt{'back'}</a>
 </form>
 ENDDOCUMENT
+    my @actions =
+        ('<a href="javascript:changePage(document.setpostsubmit,'."'menu'".')">'.
+         $lt{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
 sub domain_postsubtimeout {
     my ($cdom,$type,$settings) = @_;
-    return unless (ref($settings) eq 'HASH'); 
+    return unless (ref($settings) eq 'HASH');
     my $lctype = &get_lctype($type,$settings);
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
@@ -1005,8 +983,9 @@ sub print_catsettings {
         $lt{'categ'} = &mt('Categorize Community');
         $lt{'assi'} = &mt('Assign one or more subcategories to this community.');
     }
-    $r->print('<form action="/adm/modifycourse" method="post" name="catsettings">'.
-              '<h3>'.$lt{'catset'}.' <span class="LC_nobreak">'.$cdesc.'</span></h3>');
+    $r->print('<h3>'.$lt{'catset'}.'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
+              '<form action="/adm/modifycourse" method="post" name="catsettings">'."\n");
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     my @cat_params = &catalog_settable($domconf{'coursecategories'},$type);
     if (@cat_params > 0) {
@@ -1014,50 +993,65 @@ sub print_catsettings {
         if ($readonly) {
             $disabled = ' disabled="disabled"';
         }
-        my %currsettings = 
+        my %currsettings =
             &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
         if (grep(/^togglecats$/,@cat_params)) {
             my $excludeon = '';
             my $excludeoff = ' checked="checked" ';
             if ($currsettings{'hidefromcat'} eq 'yes') {
                 $excludeon = $excludeoff;
-                $excludeoff = ''; 
+                $excludeoff = '';
             }
             $r->print('<br /><h4>'.$lt{'visi'}.'</h4>'.
+                      '<p>'.
                       $lt{'exclude'}.
-                      '&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.$disabled.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.$disabled.' />'.&mt('No').'</label><br /><p>');
+                      '&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.$disabled.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.$disabled.' />'.&mt('No').'</label></p><p>');
             if ($type eq 'Community') {
-                $r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
+                $r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded.").'</p>');
             } elsif ($type eq 'Placement') {
-                $r->print(&mt("If a placement test has been categorized using at least one of the categories defined for placement tests in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded."));
+                $r->print(&mt("If a placement test has been categorized using at least one of the categories defined for placement tests in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded.").'</p>');
             } else {
-                $r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':<ul>'.
+                $r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':</p><ul>'.
                           '<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'</li>'.
                           '<li>'.&mt('The course has been categorized using at least one of the course categories defined for the domain.').'</li></ul>');
             }
-            $r->print('</ul></p>');
         }
+        my $savebutton;
+        unless ($readonly) {
+            $savebutton = '<p><br /><input type="button" name="chgcatsettings" value="'.
+                          &mt('Save').'" onclick="javascript:changePage(document.catsettings,'.
+                          "'processcat'".');" /></p>';
+        }
+        my $shownsave;
         if (grep(/^categorize$/,@cat_params)) {
-            $r->print('<br /><h4>'.$lt{'categ'}.'</h4>');
+            my $categheader = '<br /><h4>'.$lt{'categ'}.'</h4>';
             if (ref($domconf{'coursecategories'}) eq 'HASH') {
                 my $cathash = $domconf{'coursecategories'}{'cats'};
                 if (ref($cathash) eq 'HASH') {
-                    $r->print($lt{'assi'}.'<br /><br />'.
+                    $r->print($categheader.
+                              '<p>'.$lt{'assi'}.'</p>'.
                               &Apache::loncommon::assign_categories_table($cathash,
                                                      $currsettings{'categories'},$type,$disabled));
                 } else {
-                    $r->print(&mt('No categories defined for this domain'));
+                    $r->print($savebutton.$categheader.
+                              '<p>'.&mt('No categories defined for this domain.'));
+                    $shownsave = 1;
                 }
             } else {
-                $r->print(&mt('No categories defined for this domain'));
+                $r->print($savebutton.$categheader.
+                          '<p>'.&mt('No categories defined for this domain.'));
+                $shownsave = 1;
             }
-            unless (($type eq 'Community') || ($type eq 'Placement')) { 
-                $r->print('<p>'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'</p>');
+            if (($type eq 'Community') || ($type eq 'Placement')) {
+                $r->print('</p>');
+            } elsif ($shownsave) {
+                $r->print('<br />'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses.').'</p>');
+            } else {
+                $r->print('</p><p>'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'</p>');
             }
         }
-        unless ($readonly) {
-            $r->print('<p><input type="button" name="chgcatsettings" value="'.
-                      &mt('Save').'" onclick="javascript:changePage(document.catsettings,'."'processcat'".');" /></p>');
+        unless ($readonly || $shownsave) {
+            $r->print($savebutton);
         }
     } else {
         $r->print('<span class="LC_warning">');
@@ -1066,11 +1060,13 @@ sub print_catsettings {
         } else {
             $r->print(&mt('Catalog settings in this domain are set in course context via "Course Configuration".'));
         }
-        $r->print('</span><br /><br />'."\n".
-                  '<a href="javascript:changePage(document.catsettings,'."'menu'".');">'.
-                  $lt{'back'}.'</a>');
+        $r->print('</span>'."\n");
     }
     $r->print(&hidden_form_elements().'</form>'."\n");
+    my @actions =
+        ('<a href="javascript:changePage(document.catsettings,'."'menu'".')">'.
+         $lt{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -1087,7 +1083,7 @@ sub print_course_modification_page {
             'gobt' => "Save",
             'sett' => 'Setting',
             'domd' => 'Domain default',
-            'whom' => 'Who configures',  
+            'whom' => 'Who configures',
     );
     my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled);
     my %enrollvar = &get_enrollment_settings($cdom,$cnum);
@@ -1121,11 +1117,11 @@ sub print_course_modification_page {
             $cc_status{$uname.':'.$udom} = $lt{'actv'};
         }
     }
-    if (($enrollvar{'courseowner'} ne '') && 
+    if (($enrollvar{'courseowner'} ne '') &&
         (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs))) {
         push(@local_ccs,$enrollvar{'courseowner'});
         my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'});
-        $pname{$enrollvar{'courseowner'}} = 
+        $pname{$enrollvar{'courseowner'}} =
                          &Apache::loncommon::plainname($owneruname,$ownerdom);
         my $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname,
                                                               $cdom,$cnum,$ccrole);
@@ -1155,7 +1151,7 @@ sub print_course_modification_page {
             } else {
                 $ownertable .= '<td><input type="radio" name="courseowner" value="'.$cc.'"'.$disabled.' /></td>'."\n";
             }
-            $ownertable .= 
+            $ownertable .=
                  '<td>'.$pname{$cc}.'</td>'."\n".
                  '<td>'.$cc.'</td>'."\n".
                  '<td>'.$cc_status{$cc}.' '.$ccname.'</td>'."\n".
@@ -1165,10 +1161,14 @@ sub print_course_modification_page {
     }
     &print_header($r,$crstype,$javascript_validations);
     my $dctitle = &Apache::lonnet::plaintext('dc');
-    my $mainheader = &modifiable_only_title($crstype);
     my $hidden_elements = &hidden_form_elements();
-    $r->print('<form action="/adm/modifycourse" method="post" name="'.$env{'form.phase'}.'">'."\n".
-              '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3><p>'.
+    my $showtype;
+    if (($type eq 'official') || ($type eq 'unofficial') || ($type eq 'textbook')) {
+        $showtype = ' ('.&mt($type).')';
+    }
+    $r->print('<h3>'.&modifiable_only_title($crstype).'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.&mt($crstype).': '.$cdesc.$showtype.'</span></h4><br />'."\n".
+              '<form action="/adm/modifycourse" method="post" name="'.$env{'form.phase'}.'">'."\n".
               &Apache::lonhtmlcommon::start_pick_box());
     if ($crstype eq 'Community') {
         $r->print(&Apache::lonhtmlcommon::row_title(
@@ -1206,7 +1206,7 @@ sub print_course_modification_page {
                          &Apache::loncommon::help_open_topic('Modify_Course_Chgpasswd').
                          '&nbsp;'.&mt('Changing passwords (internal)'))."\n".
                          '<label><input type="checkbox" value="1" name="nopasswdchg"'.$checked.$disabled.' />'.
-                         &mt('Disable changing password for users with student role by course owner').'<label>'."\n".
+                         &mt('Disable changing password for users with student role by course owner').'</label>'."\n".
                          &Apache::lonhtmlcommon::row_closure());
         }
     }
@@ -1228,7 +1228,7 @@ sub print_course_modification_page {
               '<th>'.$lt{'whom'}.'</th>'.
               &Apache::loncommon::end_data_table_header_row()."\n");
     my %optionname;
-    $optionname{''} = &mt('Use domain default'); 
+    $optionname{''} = &mt('Use domain default');
     $optionname{'0'} = $dctitle;
     $optionname{'1'} = $cctitle;
     foreach my $item (@{$selfenrollrows}) {
@@ -1243,12 +1243,12 @@ sub print_course_modification_page {
             $checked{'1'} = ' checked="checked"';
         } else {
             $checked{''} = ' checked="checked"';
-        } 
+        }
         $r->print(&Apache::loncommon::start_data_table_row()."\n".
                  '<td>'.$selfenrolltitles->{$item}.'</td>'."\n".
                  '<td>'.&mt('[_1] configures',$default).'</td>'."\n".
                  '<td>');
-        foreach my $option ('','0','1') {  
+        foreach my $option ('','0','1') {
             $r->print('<span class="LC_nobreak"><label>'.
                       '<input type="radio" name="selfenrollmgr_'.$item.'" '.
                       'value="'.$option.'"'.$checked{$option}.$disabled.' />'.
@@ -1264,7 +1264,7 @@ sub print_course_modification_page {
               '&nbsp;'.&mt('"Temporary" Tables Lifetime (s)'))."\n".
               '<input type="text" size="10" name="mysqltables" value="'.$settings{'internal.mysqltables'}.'"'.$disabled.' />'.
               &Apache::lonhtmlcommon::row_closure(1).
-              &Apache::lonhtmlcommon::end_pick_box().'</p><p>'.$hidden_elements);
+              &Apache::lonhtmlcommon::end_pick_box().'<br />'.$hidden_elements);
     unless ($readonly) {
         $r->print('<input type="button" onclick="javascript:changePage(this.form,'."'processparms'".');');
         if ($crstype eq 'Community') {
@@ -1274,7 +1274,11 @@ sub print_course_modification_page {
         }
         $r->print(' value="'.$lt{'gobt'}.'" />');
     }
-    $r->print('</p></form>');
+    $r->print('</form>');
+    my @actions =
+        ('<a href="javascript:changePage(document.'.$env{'form.phase'}.','."'menu'".')">'.
+         &mt('Pick another action').'</a>');
+    $r->print('<br /><br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -1285,11 +1289,15 @@ sub print_selfenrollconfig {
     my $cdom = $coursehash->{'domain'};
     my %currsettings = &get_selfenroll_settings($coursehash);
     &print_header($r,$type);
-    $r->print('<h3>'.&mt('Self-enrollment with a student role in: [_1]',
-              '<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
+    $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n");
     &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'},
                                                   $cdom,$cnum,\%currsettings,
                                                   &hidden_form_elements(),$readonly);
+    my @actions =
+        ('<a href="javascript:changePage(document.selfenroll,'."'menu'".')">'.
+         &mt('Pick another action').'</a>');
+    $r->print('<br /><br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -1309,7 +1317,7 @@ sub print_set_ltiauth {
     my ($domdef,$checkeddom,$checkedcrs,$domdefdisplay,$divsty,$authok,$authno);
     $domdef = 0;
     $checkeddom = ' checked="checked"';
-    $domdefdisplay = $lt{'logi'}; 
+    $domdefdisplay = $lt{'logi'};
     $divsty = 'display:none';
     $authno = ' checked="checked"';
     my %domconfig =
@@ -1340,14 +1348,16 @@ sub print_set_ltiauth {
         $submit = '<input type="button" onclick="javascript:changePage(this.form,'."'processltiauth'".');" value="'.$lt{'modi'}.'" />';
     }
     my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_LTI_Authen');
+    my $showtype = &mt($type);
     $r->print(<<ENDDOCUMENT);
+<h3>$helpitem $lt{'requ'}</h3>
+<h4><span class="LC_nobreak">$showtype: $cdesc</span></h4>
 <form action="/adm/modifycourse" method="post" name="setltiauth">
-<h3>$helpitem $lt{'requ'} <span class="LC_nobreak">$cdesc</span></h3>
-<p><span class="LC_nobreak">$lt{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span</p>
+<p><span class="LC_nobreak">$lt{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span></p>
 <p><span class="LC_nobreak">
 <label><input type="radio" name="ltiauthset" value="dom" onclick="toggleLTIOptions(this.form);"$checkeddom$disabled />$lt{'used'}</label></span><br />
 <span class="LC_nobreak">
-<label><input type="radio" name="ltiauthset" value="course" onclick="toggleLTIOptions(this.form);"$checkedcrs$disabled />$lt{'cour'}</label></span>
+<label><input type="radio" name="ltiauthset" value="course" onclick="toggleLTIOptions(this.form);"$checkedcrs$disabled />$lt{'cour'}</label></span></p>
 <fieldset id="crsltiauth" style="$divsty">
 <legend>$lt{'valu'}</legend>
 <span class="LC_nobreak">
@@ -1356,13 +1366,16 @@ sub print_set_ltiauth {
 <span class="LC_nobreak">
 <label><input type="radio" name="ltiauth" value="1"$authok$disabled />$lt{'link'}</label>
 </span>
-</fieldset>
+</fieldset><p>
 $submit
-</p>
 $hidden_elements
-<a href="javascript:changePage(document.setltiauth,'menu')">$lt{'back'}</a>
+</p>
 </form>
 ENDDOCUMENT
+    my @actions =
+        ('<a href="javascript:changePage(document.setltiauth,'."'menu'".')">'.
+         $lt{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -1396,7 +1409,7 @@ sub print_set_exttool {
     } elsif ($domdef) {
         $domdefdisplay = $titles{'crs'};
     } elsif ($domdefdom) {
-        $domdefdisplay = $titles{'dom'}; 
+        $domdefdisplay = $titles{'dom'};
     } else {
         $domdefdisplay = $titles{'none'};
     }
@@ -1407,14 +1420,14 @@ sub print_set_exttool {
                          dom  => '',
                          crs => '',
                          none => '',
-                     ); 
+                     );
     if ($crsexttool ne '') {
         $checkedcrs = $checkeddom;
         $checkeddom = '';
         $divsty = 'display:inline-block';
         foreach my $option ('both','dom','crs','none') {
             if ($crsexttool eq $option) {
-                $crschecked{$option} = ' checked="checked"'; 
+                $crschecked{$option} = ' checked="checked"';
             } else {
                 $crschecked{$option} = '';
             }
@@ -1429,15 +1442,16 @@ sub print_set_exttool {
         $submit = '<input type="button" onclick="javascript:changePage(this.form,'."'processexttool'".');" value="'.$titles{'modi'}.'" />';
     }
     my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_External_Tool');
+    my $showtype = &mt($type);
     $r->print(<<ENDDOCUMENT);
-<form action="/adm/modifycourse" method="post" name="setexttool">
 <h3>$helpitem $titles{'extt'}</h3>
-<h4><span class="LC_nobreak">$type: $cdesc</span></h4>
-<p><span class="LC_nobreak">$titles{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span</p>
+<h4><span class="LC_nobreak">$showtype: $cdesc</span></h4>
+<form action="/adm/modifycourse" method="post" name="setexttool">
+<p><span class="LC_nobreak">$titles{'curd'}: <span style="font-style:italic">$domdefdisplay</span></span></p>
 <p><span class="LC_nobreak">
 <label><input type="radio" name="exttoolset" value="dom" onclick="toggleExtToolOptions(this.form);"$checkeddom$disabled />$titles{'used'}</label></span><br />
 <span class="LC_nobreak">
-<label><input type="radio" name="exttoolset" value="course" onclick="toggleExtToolOptions(this.form);"$checkedcrs$disabled />$titles{'cour'}</label></span>
+<label><input type="radio" name="exttoolset" value="course" onclick="toggleExtToolOptions(this.form);"$checkedcrs$disabled />$titles{'cour'}</label></span></p>
 <fieldset id="crsexttool" style="$divsty">
 <legend>$titles{'valu'}</legend>
 <span class="LC_nobreak">
@@ -1452,13 +1466,16 @@ sub print_set_exttool {
 <span class="LC_nobreak">
 <label><input type="radio" name="exttool" value="none"$crschecked{'none'}$disabled />$titles{'none'}</label>
 </span>
-</fieldset><br />
+</fieldset><p>
 $submit
-</p>
 $hidden_elements
-<a href="javascript:changePage(document.setexttool,'menu')">$titles{'back'}</a>
+</p>
 </form>
 ENDDOCUMENT
+    my @actions =
+        ('<a href="javascript:changePage(document.setexttool,'."'menu'".')">'.
+         $titles{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -1493,13 +1510,17 @@ sub modify_selfenrollconfig {
     my $cdom = $coursehash->{'domain'};
     my %currsettings = &get_selfenroll_settings($coursehash);
     &print_header($r,$type);
-    $r->print('<h3>'.&mt('Self-enrollment with a student role in: [_1]',
-             '<span class="LC_nobreak">'.$cdesc.'</span>').'</h3>'."\n");
-    $r->print('<form action="/adm/modifycourse" method="post" name="selfenroll">'."\n".
+    $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'.
+              '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
+              '<form action="/adm/modifycourse" method="post" name="selfenrollchg">'."\n".
               &hidden_form_elements().'<br />');
     &Apache::loncreateuser::update_selfenroll_config($r,$env{'form.pickedcourse'},
                                                      $cdom,$cnum,'domain',$type,\%currsettings);
     $r->print('</form>');
+    my @actions =
+        ('<a href="javascript:changePage(document.selfenrollchg,'."'menu'".')">'.
+         &mt('Pick another action').'</a>');
+    $r->print('<br /><br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -1531,9 +1552,9 @@ sub modifiable_only_title {
     my ($type) = @_;
     my $dctitle = &Apache::lonnet::plaintext('dc');
     if ($type eq 'Community') {
-        return &mt('Community settings modifiable only by [_1] for:',$dctitle);
+        return &mt('Community settings modifiable only by [_1]',$dctitle);
     } else {
-        return &mt('Course settings modifiable only by [_1] for:',$dctitle);
+        return &mt('Course settings modifiable only by [_1]',$dctitle);
     }
 }
 
@@ -1556,7 +1577,7 @@ sub gather_authenitems {
     unless ($curr_authtype eq '') {
         $curr_authfield = $curr_authtype.'arg';
     }
-    my $javascript_validations = 
+    my $javascript_validations =
         &Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,
                                                       $curr_authtype,$curr_authfield);
     my %param = ( formname => 'document.'.$env{'form.phase'},
@@ -1590,7 +1611,7 @@ sub modify_course {
     unless (($type eq 'Community') || ($type eq 'Placement')) {
         push(@items,('internal.coursecode','internal.authtype','internal.autharg',
                      'internal.sectionnums','internal.crosslistings'));
-        if (&showcredits($cdom)) {  
+        if (&showcredits($cdom)) {
             push(@items,'internal.defaultcredits');
         }
         my %passwdconf = &Apache::lonnet::get_passwdconf($cdom);
@@ -1713,7 +1734,7 @@ sub modify_course {
         $newattr{'courseowner'}=$env{'form.courseowner'};
         unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
             $changed{'owner'} = 1;
-        } 
+        }
     }
 
     if ($changed{'owner'} || $changed{'code'} || $changed{'passwd'}) {
@@ -1780,7 +1801,7 @@ sub modify_course {
         } else {
             if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') {
                 my %newenv;
-                map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;   
+                map { $newenv{'course.'.$cdom.'_'.$cnum.'.internal.'.$_} = $newattr{$_}; } @changes;
                 &Apache::lonnet::appenv(\%newenv);
             }
             foreach my $attr (@modifiable_params) {
@@ -1839,7 +1860,6 @@ sub modify_course {
 			            if ($course_check eq 'ok') {
                                         my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners);
 			                unless ($outcome eq 'ok') {
-                               
 				            push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'<br/>');
 			                }
 			            } else {
@@ -1903,7 +1923,7 @@ sub modify_course {
         $nochgresponse .=  "</ul><br/><br/>";
     }
     my ($warning,$numwarnings);
-    my $numwarnings = scalar(@warnings); 
+    my $numwarnings = scalar(@warnings);
     if ($numwarnings) {
         $warning = &mt('The following [quant,_1,warning was,warnings were] generated when applying your changes to automated enrollment:',$numwarnings).'<p><ul>';
         foreach my $warn (@warnings) {
@@ -1917,8 +1937,8 @@ sub modify_course {
         $reply = $chgresponse.$nochgresponse.$warning;
     }
     &print_header($r,$type);
-    my $mainheader = &modifiable_only_title($type);
-    $reply = '<h3>'.$mainheader.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'."\n".
+    $reply = '<h3>'.&modifiable_only_title($type).'</h3>'."\n".
+             '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
              '<p>'.$reply.'</p>'."\n".
              '<form action="/adm/modifycourse" method="post" name="processparms">'.
              &hidden_form_elements();
@@ -1933,7 +1953,8 @@ sub modify_course {
         push(@actions, '<a href="'.$escuri.'">'.
                   &mt('Go to Automated Enrollment Manager for course').'</a>');
     }
-    $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).'</form>';
+    $reply .= '</form>'.
+              '<br />'.&Apache::lonhtmlcommon::actionbox(\@actions);
     $r->print($reply);
     return;
 }
@@ -2102,10 +2123,9 @@ sub modify_quota {
     my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
     &print_header($r,$type);
     my $lctype = lc($type);
-    my $headline = &mt("Disk space quotas for $lctype: [_1]",
-                     '<span class="LC_nobreak">'.$cdesc.'</span>');
-    $r->print('<form action="/adm/modifycourse" method="post" name="processquota">'."\n".
-              '<h3>'.$headline.'</h3>');
+    $r->print('<h3>'.&mt("Disk space quotas for $lctype")."</h3>\n".
+              '<h4><span class="LC_nobreak">'.&mt($type).' :'.$cdesc.'</span></h4>'."\n".
+              '<form action="/adm/modifycourse" method="post" name="processquota">'."\n");
     my %oldsettings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota'],$cdom,$cnum);
     my %staticdefaults = (
                            coursequota   => 20,
@@ -2135,7 +2155,7 @@ sub modify_quota {
                     $showresult{$item} = 1;
                 }
             } else {
-                if ($item eq 'coursequota') { 
+                if ($item eq 'coursequota') {
                     $r->print(&mt('The proposed group portfolio quota contained invalid characters, so the quota is unchanged.').'<br />');
                 } else {
                     $r->print(&mt('The proposed quota for content uploaded via the Content Editor contained invalid characters, so the quota is unchanged.').'<br />');
@@ -2148,7 +2168,7 @@ sub modify_quota {
         my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,
                                             $cnum);
         foreach my $key (sort(keys(%showresult))) {
-            if (($oldsettings{'internal.'.$key} eq '') && 
+            if (($oldsettings{'internal.'.$key} eq '') &&
                 ($env{'form.'.$key} == $default{$key})) {
                 if ($key eq 'uploadquota') {
                     if ($type eq 'Community') {
@@ -2158,7 +2178,7 @@ sub modify_quota {
                         $r->print(&mt('The disk space allocated for files uploaded to this course via the Content Editor is the default quota for this domain: [_1] MB.',
                                       $default{$key}).'<br />');
                     }
-                } else { 
+                } else {
                     if ($type eq 'Community') {
                         $r->print(&mt('The disk space allocated for group portfolio files in this community is the default quota for this domain: [_1] MB.',
                                       $default{$key}).'<br />');
@@ -2201,23 +2221,24 @@ sub modify_quota {
                       $putreply);
         }
     }
-    $r->print('<p>'.
-              '<a href="javascript:changePage(document.processquota,'."'menu'".')">'.
-              &mt('Pick another action').'</a>');
     $r->print(&hidden_form_elements().'</form>');
+    my @actions =
+        ('<a href="javascript:changePage(document.processparms,'."'menu'".')">'.
+         &mt('Pick another action').'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
 sub modify_anonsurvey_threshold {
     my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
     &print_header($r,$type);
-    $r->print('<form action="/adm/modifycourse" method="post" name="processthreshold">'."\n".
-              '<h3>'.&mt('Responder threshold required for display of anonymous survey submissions:').
-              ' <span class="LC_nobreak">'.$cdesc.'</span></h3><br />');
+    $r->print('<h3>'.&mt('Responder threshold required for display of anonymous survey submissions').'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
+              '<form action="/adm/modifycourse" method="post" name="processthreshold">'."\n");
     my %oldsettings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum);
     my %domconfig =
         &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
-    my $defaultthreshold; 
+    my $defaultthreshold;
     if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
         $defaultthreshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};
         if ($defaultthreshold eq '') {
@@ -2263,10 +2284,11 @@ sub modify_anonsurvey_threshold {
             $r->print(&mt('The proposed responder threshold for display of anonymous submissions contained invalid characters, so the threshold is unchanged.'));
         }
     }
-    $r->print('<p>'.
-              '<a href="javascript:changePage(document.processthreshold,'."'menu'".')">'.
-              &mt('Pick another action').'</a></p>');
     $r->print(&hidden_form_elements().'</form>');
+    my @actions =
+        ('<a href="javascript:changePage(document.processthreshold,'."'menu'".')">'.
+         &mt('Pick another action').'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -2278,18 +2300,19 @@ sub modify_postsubmit_config {
                 unch => 'Post submission behavior of the Submit button is unchanged.',
                 erro => 'An error occurred when saving your proposed changes.',
                 inva => 'An invalid response was recorded.',
-                pick => 'Pick another action',
+                back => 'Pick another action',
              );
-    $r->print('<form action="/adm/modifycourse" method="post" name="processpostsubmit">'."\n".
-              '<h3>'.$lt{'subb'}.' <span class="LC_nobreak">('.$cdesc.')</span></h3><br />');
-    my %oldsettings = 
+    $r->print('<h3>'.$lt{'subb'}.'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
+              '<form action="/adm/modifycourse" method="post" name="processpostsubmit"><p>'."\n");
+    my %oldsettings =
         &Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout','internal.coursecode','internal.textbook'],$cdom,$cnum);
     my $postsubmit = $env{'form.postsubmit'};
     if ($postsubmit eq '1') {
         my $postsubtimeout = $env{'form.postsubtimeout'};
         $postsubtimeout =~ s/[^\d\.]+//g;
         if (($oldsettings{'internal.postsubmit'} eq $postsubmit) && ($oldsettings{'internal.postsubtimeout'} eq $postsubtimeout)) {
-            $r->print($lt{'unch'}); 
+            $r->print($lt{'unch'});
         } else {
             my %cenv = (
                          'internal.postsubmit' => $postsubmit,
@@ -2305,12 +2328,12 @@ sub modify_postsubmit_config {
                 } else {
                     $r->print($lt{'erro'});
                 }
-            } else { 
+            } else {
                 $cenv{'internal.postsubtimeout'} = $postsubtimeout;
                 my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum);
                 if ($putreply eq 'ok') {
                     if ($postsubtimeout eq '0') {
-                        $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.')); 
+                        $r->print(&mt('Submit button will be disabled after student submission until page is reloaded.'));
                     } else {
                         $r->print(&mt('Submit button will be disabled after student submission for [quant,_1,second].',$postsubtimeout));
                     }
@@ -2324,7 +2347,7 @@ sub modify_postsubmit_config {
             $r->print($lt{'unch'});
         } else {
             if (exists($oldsettings{'internal.postsubtimeout'})) {
-                &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);  
+                &Apache::lonnet::del('environment',['internal.postsubtimeout'],$cdom,$cnum);
             }
             my %cenv = (
                          'internal.postsubmit' => $postsubmit,
@@ -2339,10 +2362,11 @@ sub modify_postsubmit_config {
     } else {
         $r->print($lt{'inva'}.' '.$lt{'unch'});
     }
-    $r->print('<p>'.
-              '<a href="javascript:changePage(document.processpostsubmit,'."'menu'".')">'.
-              &mt('Pick another action').'</a></p>');
-    $r->print(&hidden_form_elements().'</form>');
+    $r->print('</p>'.&hidden_form_elements().'</form>');
+    my @actions =
+        ('<a href="javascript:changePage(document.processpostsubmit,'."'menu'".')">'.
+         $lt{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -2359,16 +2383,16 @@ sub modify_catsettings {
         $desc{'categories'} = &mt('Assigned categories for this course');
         $ccrole = 'cc';
     }
-    $r->print('
-<form action="/adm/modifycourse" method="post" name="processcat">
-<h3>'.&mt('Category settings').'</h3>');
+    $r->print('<h3>'.&mt('Category settings').'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
+              '<form action="/adm/modifycourse" method="post" name="processcat"><br />'."\n");
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     my @cat_params = &catalog_settable($domconf{'coursecategories'},$type);
     if (@cat_params > 0) {
         my (%cenv,@changes,@nochanges);
         my %currsettings =
             &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
-        my (@newcategories,%showitem); 
+        my (@newcategories,%showitem);
         if (grep(/^togglecats$/,@cat_params)) {
             if ($currsettings{'hidefromcat'} ne $env{'form.hidefromcat'}) {
                 push(@changes,'hidefromcat');
@@ -2414,9 +2438,9 @@ sub modify_catsettings {
                     foreach my $cat (@newcategories) {
                         if (!grep(/^\Q$cat\E$/,@currcategories)) {
                             $catchg = 1;
-                            last;                     
-                        } 
-                    } 
+                            last;
+                        }
+                    }
                 }
             } else {
                 if (@newcategories > 0) {
@@ -2476,10 +2500,11 @@ sub modify_catsettings {
             $r->print(&mt('Category settings for courses in this domain should be modified in course context (via "[_1]Course Configuration[_2]").','<a href="$escuri">','</a>').'<br />');
         }
     }
-    $r->print('<br />'."\n".
-              '<a href="javascript:changePage(document.processcat,'."'menu'".')">'.
-              &mt('Pick another action').'</a>');
-    $r->print(&hidden_form_elements().'</form>');
+    $r->print('<br />'.&hidden_form_elements().'</form>');
+    my @actions =
+        ('<a href="javascript:changePage(document.processcat,'."'menu'".')">'.
+         &mt('Pick another action').'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -2495,9 +2520,9 @@ sub modify_ltiauth {
                 'back' => 'Pick another action',
     );
     &print_header($r,$type);
-    $r->print('<form action="/adm/modifycourse" method="post" name="processltiauth">'."\n".
-              '<h3>'.$lt{'requ'}.
-              ' <span class="LC_nobreak">'.$cdesc.'</span></h3>');
+    $r->print('<h3>'.$lt{'requ'}.'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.&mt($type).': '.$cdesc.'</span></h4>'."\n".
+              '<form action="/adm/modifycourse" method="post" name="processltiauth">'."\n");
     my %oldsettings = &Apache::lonnet::get('environment',['internal.ltiauth'],$cdom,$cnum);
     my $oldltiauth = $oldsettings{'internal.ltiauth'};
     my $domdef;
@@ -2514,7 +2539,7 @@ sub modify_ltiauth {
             $change = 1;
         }
     } elsif ($env{'form.ltiauthset'} eq 'course') {
-        if ($env{'form.ltiauth'} =~ /^0|1$/) { 
+        if ($env{'form.ltiauth'} =~ /^0|1$/) {
             $newltiauth = $env{'form.ltiauth'};
         }
         if ($oldltiauth == $newltiauth) {
@@ -2578,11 +2603,12 @@ sub modify_ltiauth {
     } elsif ($change) {
         $r->print(&mt('Re-authentication requirement for LTI launch of deep-linked changed'));
     }
-    $r->print('<br />'.$status);
-    $r->print('</p><p>'.
-              '<a href="javascript:changePage(document.processltiauth,'."'menu'".')">'.
-              $lt{'back'}.'</a></p>');
-    $r->print(&hidden_form_elements().'</form>');
+    $r->print('<br />'.$status.'</p>'.
+              &hidden_form_elements().'</form>');
+    my @actions =
+        ('<a href="javascript:changePage(document.processltiauth,'."'menu'".')">'.
+         $lt{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -2590,9 +2616,9 @@ sub modify_exttool {
     my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_;
     my %titles = &exttool_titles($type);
     &print_header($r,$type);
-    $r->print('<form action="/adm/modifycourse" method="post" name="processexttool">'."\n".
-              '<h3>'.$titles{'extt'}.'</h3>'.
-              '<h4><span class="LC_nobreak">'.$type.': '.$cdesc.'</span></h4>');
+    $r->print('<h3>'.$titles{'extt'}.'</h3>'."\n".
+              '<h4><span class="LC_nobreak">'.$type.': '.$cdesc.'</span></h4>'."\n".
+              '<form action="/adm/modifycourse" method="post" name="processexttool">'."\n");
     my %oldsettings = &Apache::lonnet::get('environment',['internal.exttool'],$cdom,$cnum);
     my $oldcrsexttool = $oldsettings{'internal.exttool'};
     my $domdefdom = 1;
@@ -2686,11 +2712,12 @@ sub modify_exttool {
     } elsif ($change) {
         $r->print(&mt('External Tool permissions changed'));
     }
-    $r->print('<br />'.$status);
-    $r->print('</p><p>'.
-              '<a href="javascript:changePage(document.processexttool,'."'menu'".')">'.
-              $titles{'back'}.'</a></p>');
-    $r->print(&hidden_form_elements().'</form>');
+    $r->print('<br />'.$status.'</p>'.
+              &hidden_form_elements().'</form>');
+    my @actions =
+        ('<a href="javascript:changePage(document.processexttool,'."'menu'".')">'.
+         $titles{'back'}.'</a>');
+    $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     return;
 }
 
@@ -2732,9 +2759,10 @@ ENDJS
         $js .= <<"ENDSCRIPT";
 
 function verify_quota() {
-    var newquota = document.setquota.coursequota.value; 
+    var newcoursequota = document.setquota.coursequota.value;
+    var newuploadquota = document.setquota.uploadquota.value;
     var num_reg = $regexp;
-    if (num_reg.test(newquota)) {
+    if ((num_reg.test(newcoursequota)) && (num_reg.test(newuploadquota))) {
         changePage(document.setquota,'processquota');
     } else {
         alert("$invalid\\n$alert");
@@ -2779,7 +2807,7 @@ ENDSCRIPT
         &js_escape(\$alert);
         my $regexp = ' /^\s*\d+\s*$/';
 
-        $js .= <<"ENDSCRIPT"; 
+        $js .= <<"ENDSCRIPT";
 
 function verify_postsubmit() {
     var optionsElement = document.setpostsubmit.postsubmit;
@@ -2811,7 +2839,7 @@ function verify_postsubmit() {
             }
         } else {
             if (currval == 0) {
-               verified = 'ok'; 
+               verified = 'ok';
             } else {
                alert('$invalid');
                return false;
@@ -2829,7 +2857,7 @@ function togglePostsubmit(caller) {
     var optionsElement = document.setpostsubmit.postsubmit;
     if (document.getElementById(caller)) {
         var divitem = document.getElementById(caller);
-        var optionsElement = document.setpostsubmit.postsubmit; 
+        var optionsElement = document.setpostsubmit.postsubmit;
         if (optionsElement.length) {
             var currval;
             for (var i=0; i<optionsElement.length; i++) {
@@ -2937,7 +2965,15 @@ ENDJS
     } else {
         $bread_text = 'Course Settings';
     }
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text));
+    my $helpcomponent;
+    if ($env{'form.phase'} eq 'menu') {
+        if ($type eq 'Community') {
+            $helpcomponent = 'Domain_Modify_Community';
+        } else {
+            $helpcomponent = 'Domain_Modify_Course';
+        }
+    }
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs($bread_text,$helpcomponent));
     return;
 }
 
@@ -3018,7 +3054,7 @@ sub course_settings_descrip {
 }
 
 sub hidden_form_elements {
-    my $hidden_elements = 
+    my $hidden_elements =
       &Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode',
           'prevphase','numlocalcc','courseowner','login','coursequota','intarg',
           'locarg','krbarg','krbver','counter','hidefromcat','usecategory',
@@ -3148,7 +3184,7 @@ sub handler {
                 $choose_text = "Choose a placement test";
             } else {
                 $choose_text = "Choose a course";
-            } 
+            }
             &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"javascript:changePage(document.$firstform,'')",
               text=>"Course/Community search"},
@@ -3163,7 +3199,7 @@ sub handler {
                     if ($type eq 'Community') {
                         $enter_text = 'Enter community';
                     } elsif ($type eq 'Placement') {
-                        $enter_text = 'Enter placement test'; 
+                        $enter_text = 'Enter placement test';
                     } else {
                         $enter_text = 'Enter course';
                     }
@@ -3186,11 +3222,11 @@ sub handler {
                         my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
                         my ($readonly,$linktext);
                         if ($permission->{$phase} eq 'view') {
-                           $readonly = 1; 
+                           $readonly = 1;
                         }
                         if (($phase eq 'setquota') && ($permission->{'setquota'})) {
                             if ($permission->{'setquota'} eq 'view') {
-                                $linktext = 'Set quota'; 
+                                $linktext = 'Set quota';
                             } else {
                                 $linktext = 'Display quota';
                             }
@@ -3198,7 +3234,7 @@ sub handler {
                             ({href=>"javascript:changePage(document.$phase,'$phase')",
                               text=>$linktext});
                             &print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly);
-                        } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) { 
+                        } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) {
                             &Apache::lonhtmlcommon::add_breadcrumb
                             ({href=>"javascript:changePage(document.$phase,'setquota')",
                               text=>"Set quota"});
@@ -3277,7 +3313,7 @@ sub handler {
                             if (!exists($env{'form.state'})) {
                                 &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly);
                             } elsif ($env{'form.state'} eq 'done') {
-                                &Apache::lonhtmlcommon::add_breadcrumb 
+                                &Apache::lonhtmlcommon::add_breadcrumb
                                 ({href=>"javascript:changePage(document.$phase,'$phase')",
                                   text=>"Result"});
                                 &modify_selfenrollconfig($r,$type,$cdesc,$coursehash);