--- loncom/interface/domainprefs.pm	2014/05/30 00:11:06	1.245
+++ loncom/interface/domainprefs.pm	2014/05/31 04:00:02	1.247
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.245 2014/05/30 00:11:06 raeburn Exp $
+# $Id: domainprefs.pm,v 1.247 2014/05/31 04:00:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -762,8 +762,9 @@ sub print_config_box {
                 $output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
             }
         } elsif ($action eq 'requestcourses') {
-            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal).
-                       &print_studentcode($settings,\$rowtotal).'
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+            $rowtotal ++;
+            $output .= &print_studentcode($settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -798,6 +799,7 @@ sub print_config_box {
             &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+            $rowtotal ++;
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -2074,7 +2076,6 @@ sub print_requestmail {
         $datatable .= &mt('There are no active Domain Coordinators');
     }
     $datatable .='</td></tr>';
-    $$rowtotal += $rows;
     return $datatable;
 }
 
@@ -2519,13 +2520,15 @@ sub print_autocreate {
                   $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
     my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                    'autocreate_xmldc',%currhash);
+    $datatable .= '</td></tr><tr class="LC_odd_row"><td>';
     if ($numdc > 1) {
-        $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
-                      &mt('Course creation processed as: (choose Dom. Coord.)').
-                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+        $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)').
+                      '</td><td class="LC_left_item">';
     } else {
-        $datatable .= $dctable.'</td></tr>';
+        $datatable .= &mt('Course creation processed as:').
+                      '</td><td class="LC_right_item">';
     }
+    $datatable .= $dctable.'</td></tr>';
     $$rowtotal += $rows;
     return $datatable;
 }
@@ -3125,13 +3128,14 @@ sub print_validation_rows {
         my $numinrow = 2;
         my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                        'validationdc',%currhash);
+        my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '</td></tr><tr'.$css_class.'><td>';
         if ($numdc > 1) {
-            $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
-                          &mt('Course creation processed as: (choose Dom. Coord.)').
-                          '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+            $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
         } else {
-            $datatable .= $dctable.'</td></tr>';
+            $datatable .=  &mt('Course creation processed as: ');
         }
+        $datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
         $itemcount ++;
     }
     if (ref($rowtotal)) {
@@ -9767,9 +9771,17 @@ sub modify_coursecategories {
             }
             $resulttext .= '</ul>';
             if ($changes{'unauth'} || $changes{'auth'}) {
-                &Apache::loncommon::devalidate_domconfig_cache($dom);
+                my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+                if ($changes{'auth'}) {
+                    $domdefaults{'catauth'} = $domconfig{'coursecategories'}{'auth'};
+                }
+                if ($changes{'unauth'}) {
+                    $domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'};
+                }
+                my $cachetime = 24*60*60;
+                &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
                 if (ref($lastactref) eq 'HASH') {
-                    $lastactref->{'domainconfig'} = 1;
+                    $lastactref->{'domdefaults'} = 1;
                 }
             }
         } else {
@@ -10977,7 +10989,7 @@ sub active_dc_picker {
         my ($dcname,$dcdom) = split(':',$domcoord[0]);
         my $user = &Apache::loncommon::plainname($dcname,$dcdom);
         if ($inputtype eq 'radio') {
-            $table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
+            $table = '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')';
             }
@@ -10986,9 +10998,9 @@ sub active_dc_picker {
             if (exists($currhash{$domcoord[0]})) {
                 $check = ' checked="checked"';
             }
-            $table .= '<span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="'.$name.'" '.
-                      'value="'.$domcoord[0].'"'.$check.' />'.$user;
+            $table = '<span class="LC_nobreak"><label>'.
+                     '<input type="checkbox" name="'.$name.'" '.
+                     'value="'.$domcoord[0].'"'.$check.' />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')';
             }