--- loncom/interface/domainprefs.pm	2009/08/22 18:20:20	1.105
+++ loncom/interface/domainprefs.pm	2009/08/23 17:22:54	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.105 2009/08/22 18:20:20 raeburn Exp $
+# $Id: domainprefs.pm,v 1.109 2009/08/23 17:22:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -849,20 +849,22 @@ sub display_color_options {
                   '&nbsp;<span id="css_'.$role.'_font" style="background-color: '.
                   $designs->{'font'}.';">&nbsp;&nbsp;&nbsp;</span>'.
                   '</span></td></tr>';
-    $datatable .= '<tr'.$css_class.'>'.
-        '<td>'.$choices->{'fontmenu'}.'</td>';
-    if (!$is_custom->{'fontmenu'}) {
-        $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
-    } else {
-        $datatable .= '<td>&nbsp;</td>';
+    unless ($role eq 'login') { 
+        $datatable .= '<tr'.$css_class.'>'.
+                      '<td>'.$choices->{'fontmenu'}.'</td>';
+        if (!$is_custom->{'fontmenu'}) {
+            $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
+        } else {
+            $datatable .= '<td>&nbsp;</td>';
+        }
+        $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'});
+        $datatable .= '<td><span class="LC_nobreak">'.
+                      '<input type="text" size="10" name="'.$role.'_fontmenu"'.
+                      ' value="'.$designs->{'fontmenu'}.'" />&nbsp;'.$fontlink.
+                      '&nbsp;<span id="css_'.$role.'_fontmenu" style="background-color: '.
+                      $designs->{'fontmenu'}.';">&nbsp;&nbsp;&nbsp;</span>'.
+                      '</span></td></tr>';
     }
-    $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'});
-    $datatable .= '<td><span class="LC_nobreak">'.
-                  '<input type="text" size="10" name="'.$role.'_fontmenu"'.
-                  ' value="'.$designs->{'fontmenu'}.'" />&nbsp;'.$fontlink.
-                  '&nbsp;<span id="css_'.$role.'_fontmenu" style="background-color: '.
-                  $designs->{'fontmenu'}.';">&nbsp;&nbsp;&nbsp;</span>'.
-                  '</span></td></tr>';
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
 	$itemcount ++;
@@ -1149,7 +1151,7 @@ sub print_quotas {
     my ($css_class,%titles);
     if ($context eq 'requestcourses') {
         @usertools = ('official','unofficial','community');
-        @options =('norequest','approval','autolimit','validate');
+        @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
     } else {
@@ -1249,7 +1251,7 @@ sub print_quotas {
                 if ($context eq 'requestcourses') {
                     $datatable .= '</tr><tr>';
                     foreach my $item (@usertools) {
-                        $datatable .= '<td>'.$cell{$item}.'</td>';  
+                        $datatable .= '<td style="vertical-align: top">'.$cell{$item}.'</td>';  
                     }
                     $datatable .= '</tr></table>';
                 }
@@ -1355,7 +1357,7 @@ sub print_quotas {
     if ($context eq 'requestcourses') {
         $datatable .= '</tr><tr>';
         foreach my $item (@usertools) {
-            $datatable .= '<td>'.$defcell{$item}.'</td>';
+            $datatable .= '<td style="vertical-align: top">'.$defcell{$item}.'</td>';
         }
         $datatable .= '</tr></table>';
     }
@@ -1371,16 +1373,15 @@ sub print_quotas {
     $datatable .= '<tr'.$css_class.'>'.
                   '<td>'.&mt('LON-CAPA Advanced Users').' ';
     if ($context eq 'requestcourses') {
-        $datatable .= &mt('(overrides affiliation, if set)');
-    } else {
-        $datatable .= &mt('(overrides affiliation, if checked)');
-    }
-    $datatable .= '</td>'.
-                  '<td class="LC_left_item" colspan="2">';
-    if ($context eq 'requestcourses') {
-        $datatable .= '<table><tr>';
+        $datatable .= &mt('(overrides affiliation, if set)').
+                      '</td>'.
+                      '<td class="LC_left_item">'.
+                      '<table><tr>';
     } else {
-        $datatable .= '<br />';
+        $datatable .= &mt('(overrides affiliation, if checked)').
+                      '</td>'.
+                      '<td class="LC_left_item" colspan="2">'.
+                      '<br />';
     }
     my %advcell;
     foreach my $item (@usertools) {
@@ -1459,7 +1460,7 @@ sub print_quotas {
     if ($context eq 'requestcourses') {
         $datatable .= '</tr><tr>';
         foreach my $item (@usertools) {
-            $datatable .= '<td>'.$advcell{$item}.'</td>';
+            $datatable .= '<td style="vertical-align: top">'.$advcell{$item}.'</td>';
         }
         $datatable .= '</tr></table>';
     }
@@ -2684,6 +2685,7 @@ sub coursecategories_javascript {
     }
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function reorderCats(form,parent,item,idx) {
     var changedVal;
 $jstext
@@ -2740,6 +2742,7 @@ $jstext
     }
     return;
 }
+// ]]>
 </script>
 
 ENDSCRIPT
@@ -3216,6 +3219,7 @@ sub modify_colors {
             @logintext = ('textcol','bgcol');
         } else {
             %choices = &color_font_choices();
+            $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
         }
         if ($role eq 'login') {
             @images = ('img','logo','domlogo','login');
@@ -3225,7 +3229,6 @@ sub modify_colors {
             @bgs = ('pgbg','tabbg','sidebg'); 
         }
         $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
-	$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
         foreach my $item (@bgs,@links,@logintext) {
             $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
         }
@@ -3339,13 +3342,15 @@ sub modify_colors {
                         $changes{$role}{'font'} = 1;
                     }
                 }
-                if ($domconfig->{$role}{'fontmenu'} ne '') {
-                    if ($confhash->{$role}{'fontmenu'} ne $domconfig->{$role}{'fontmenu'}) {
-                        $changes{$role}{'fontmenu'} = 1;
-                    }
-                } else {
-                    if ($confhash->{$role}{'fontmenu'}) {
-                        $changes{$role}{'fontmenu'} = 1;
+                if ($role ne 'login') {
+                    if ($domconfig->{$role}{'fontmenu'} ne '') {
+                        if ($confhash->{$role}{'fontmenu'} ne $domconfig->{$role}{'fontmenu'}) {
+                            $changes{$role}{'fontmenu'} = 1;
+                        }
+                    } else {
+                        if ($confhash->{$role}{'fontmenu'}) {
+                            $changes{$role}{'fontmenu'} = 1;
+                        }
                     }
                 }
                 foreach my $item (@bgs) {
@@ -3788,7 +3793,7 @@ sub modify_quotas {
     }
     if ($context eq 'requestcourses') {
         @usertools = ('official','unofficial','community');
-        @options =('norequest','approval','autolimit','validate');
+        @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
         $toolregexp = join('|',@usertools);
@@ -3972,8 +3977,8 @@ sub modify_quotas {
                                                           $env{'user.domain'},
                                                           $item,'reload',$context);
                     if ($context eq 'requestcourses') {
-                        if ($env{'environment.crsrequest.'.$item} ne $newacc) {
-                            $newenv{'environment.crsrequest.'.$item} = $newacc;
+                        if ($env{'environment.canrequest.'.$item} ne $newacc) {
+                            $newenv{'environment.canrequest.'.$item} = $newacc;
                         }
                     } else {
                         if ($env{'environment.availabletools.'.$item} ne $newacc) {