--- loncom/interface/domainprefs.pm	2010/01/02 21:50:54	1.102.2.6
+++ loncom/interface/domainprefs.pm	2009/10/08 22:37:33	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.102.2.6 2010/01/02 21:50:54 raeburn Exp $
+# $Id: domainprefs.pm,v 1.113 2009/10/08 22:37:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -220,12 +220,13 @@ sub handler {
                                 {col1 => 'Administrator Settings',
                                  col2 => '',}],
                     },
-        'login' =>  
+        'login' =>
                     { text => 'Log-in page options',
                       help => 'Domain_Configuration_Login_Page',
                       header => [{col1 => 'Item',
                                   col2 => '',}],
                     },
+
         'defaults' => 
                     { text => 'Default authentication/language/timezone',
                       help => 'Domain_Configuration_LangTZAuth',
@@ -302,7 +303,7 @@ sub handler {
                               col2 => 'Value'}],
                  },
         'coursecategories' =>
-                  { text => 'Cataloging of courses/communities',
+                  { text => 'Cataloging of courses',
                     help => 'Domain_Configuration_Cataloging_Courses',
                     header => [{col1 => 'Category settings',
                                 col2 => '',},
@@ -319,6 +320,16 @@ sub handler {
                             }],
                  },
     );
+    my %servers = &Apache::lonnet::get_servers($dom);
+    if (keys(%servers) > 1) {
+        $prefs{'login'}  = { text   => 'Log-in page options',
+                             help   => 'Domain_Configuration_Login_Page',
+                            header => [{col1 => 'Log-in Service',
+                                        col2 => 'Server Setting',},
+                                       {col1 => 'Log-in Page Items',
+                                        col2 => ''}],
+                           };
+    }
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -423,9 +434,11 @@ sub print_config_box {
            &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
           '</tr>';
     $rowtotal ++;
-    if (($action eq 'autoupdate') || ($action eq 'rolecolors') || 
-        ($action eq 'usercreation') || ($action eq 'usermodification') ||
-        ($action eq 'coursecategories') || ($action eq 'requestcourses')) {
+    my $numheaders = 1;
+    if (ref($item->{'header'}) eq 'ARRAY') {
+        $numheaders = scalar(@{$item->{'header'}});
+    }
+    if ($numheaders > 1) {
         my $colspan = '';
         if (($action eq 'rolecolors') || ($action eq 'coursecategories')) {
             $colspan = ' colspan="2"';
@@ -447,6 +460,9 @@ sub print_config_box {
             $output .= &print_usermodification('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= &print_coursecategories('top',$dom,$item,$settings,\$rowtotal);
+        } elsif ($action eq 'login') {
+            $output .= &print_login('top',$dom,$confname,$phase,$settings,\$rowtotal);
+            $colspan = ' colspan="2"';
         } elsif ($action eq 'requestcourses') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } else {
@@ -496,6 +512,8 @@ sub print_config_box {
             $rowtotal ++;
         } elsif ($action eq 'coursecategories') {
             $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
+        } elsif ($action eq 'login') {
+            $output .= &print_login('bottom',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
             $output .= &print_courserequestmail($dom,$settings,\$rowtotal);
         } else {
@@ -566,7 +584,8 @@ sub print_config_box {
         $output .= '</tr>';
         $rowtotal ++;
         if ($action eq 'login') {
-            $output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal);
+            $output .= &print_login('bottom',$dom,$confname,$phase,$settings,
+                                    \$rowtotal);
         } elsif ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif ($action eq 'autoenroll') {
@@ -592,8 +611,48 @@ sub print_config_box {
 }
 
 sub print_login {
-    my ($dom,$confname,$phase,$settings,$rowtotal) = @_;
+    my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_;
+    my ($css_class,$datatable);
     my %choices = &login_choices();
+    my $itemcount = 1;
+
+    if ($position eq 'top') {
+        my %servers = &Apache::lonnet::get_servers($dom);
+        my $choice = $choices{'disallowlogin'};
+        $css_class = ' class="LC_odd_row"';
+        $datatable .= '<tr'.$css_class.'><td>'.$choices{'disallowlogin'}.'</td>'.
+                      '<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'.
+                      '<th>'.$choices{'serverurl'}.'</th></tr>'."\n";
+        my %disallowed;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'loginvia'}) eq 'HASH') {
+               %disallowed = %{$settings->{'loginvia'}};
+            }
+        }
+        foreach my $lonhost (sort(keys(%servers))) {
+            my $direct = 'selected="selected"';
+            if ($disallowed{$lonhost} eq '') {
+                $direct = '';
+            }
+            $datatable .= '<tr><td>'.$lonhost.'</td>'.
+                          '<td><select name="'.$lonhost.'_serverurl">'.
+                          '<option value=""'.$direct.'>'.$choices{'directlogin'}.
+                          '</option>';
+            foreach my $hostid (keys(%servers)) {
+                next if ($hostid eq $lonhost);
+                my $selected = '';
+                if ($hostid eq $disallowed{$lonhost}) {
+                    $selected = 'selected="selected"';
+                }
+                $datatable .= '<option value="'.$hostid.'"'.$selected.'>'.
+                              $servers{$hostid}.'</option>';
+            }
+            $datatable .= '</select></td></tr>';
+        }
+        $datatable .= '</table></td></tr>';
+        return $datatable;
+    }
+
     my %defaultchecked = ( 
                            'coursecatalog' => 'on',
                            'adminmail'     => 'off',
@@ -728,24 +787,28 @@ sub print_login {
 sub login_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            coursecatalog => 'Display Course/Community Catalog link?',
-            adminmail => "Display Administrator's E-mail Address?",
-            newuser   => "Link to create a user account",
-            img => "Header",
-            logo => "Main Logo",
-            domlogo => "Domain Logo",
-            login => "Log-in Header", 
-            textcol => "Text color",
-            bgcol   => "Box color",
-            bgs => "Background colors",
-            links => "Link colors",
-            font => "Font color",
-            pgbg => "Header",
-            mainbg => "Page",
-            sidebg => "Login box",
-            link => "Link",
-            alink => "Active link",
-            vlink => "Visited link",
+            coursecatalog => 'Display Course Catalog link?',
+            adminmail     => "Display Administrator's E-mail Address?",
+            disallowlogin => "Login page requests redirected",
+            hostid        => "Server",
+            serverurl     => "Redirect to log-in via:",
+            directlogin   => "No redirect",
+            newuser       => "Link to create a user account",
+            img           => "Header",
+            logo          => "Main Logo",
+            domlogo       => "Domain Logo",
+            login         => "Log-in Header", 
+            textcol       => "Text color",
+            bgcol         => "Box color",
+            bgs           => "Background colors",
+            links         => "Link colors",
+            font          => "Font color",
+            pgbg          => "Header",
+            mainbg        => "Page",
+            sidebg        => "Login box",
+            link          => "Link",
+            alink         => "Active link",
+            vlink         => "Visited link",
         );
     return %choices;
 }
@@ -763,6 +826,7 @@ sub print_rolecolors {
     my %defaults = (
                    img => $defaultdesign{$role.'.img'},
                    font => $defaultdesign{$role.'.font'},
+		   fontmenu => $defaultdesign{$role.'.fontmenu'},
                    );
     foreach my $item (@bgs) {
         $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
@@ -780,6 +844,10 @@ sub print_rolecolors {
                 $designs{'font'} = $settings->{$role}->{'font'};
                 $is_custom{'font'} = 1;
             }
+            if ($settings->{$role}->{'fontmenu'} ne '') {
+                $designs{'fontmenu'} = $settings->{$role}->{'fontmenu'};
+                $is_custom{'fontmenu'} = 1;
+            }
             foreach my $item (@bgs) {
                 if ($settings->{$role}->{$item} ne '') {
                     $designs{'bgs'}{$item} = $settings->{$role}->{$item};
@@ -798,6 +866,10 @@ sub print_rolecolors {
             $designs{img} = $designhash{$dom.'.'.$role.'.img'};
             $is_custom{'img'} = 1;
         }
+        if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') {
+            $designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'};
+            $is_custom{'fontmenu'} = 1; 
+        }
         if ($designhash{$dom.'.'.$role.'.font'} ne '') {
             $designs{font} = $designhash{$dom.'.'.$role.'.font'};
             $is_custom{'font'} = 1;
@@ -826,7 +898,7 @@ sub display_color_options {
     my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
         $images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_;
     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $datatable = '<tr'.$css_class.'>'.
+    my $datatable = '<tr>'.
         '<td>'.$choices->{'font'}.'</td>';
     if (!$is_custom->{'font'}) {
         $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
@@ -840,6 +912,22 @@ sub display_color_options {
                   '&nbsp;<span id="css_'.$role.'_font" style="background-color: '.
                   $designs->{'font'}.';">&nbsp;&nbsp;&nbsp;</span>'.
                   '</span></td></tr>';
+    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>';
+    }
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
 	$itemcount ++;
@@ -1126,7 +1214,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 {
@@ -1201,10 +1289,10 @@ sub print_quotas {
                                                 $item.'_limit_'.$type.'" size="1" '.
                                                 'value="'.$currlimit.'" />';
                             }
+                            $cell{$item} .= '</span>&nbsp; ';
                             if ($option eq 'autolimit') {
-                                $cell{$item} .= $titles{'unlimited'};
+                                $cell{$item} .= $titles{'unlimited'}
                             }
-                            $cell{$item} .= '</span>&nbsp; ';
                         }
                     } else {
                         my $checked = 'checked="checked" ';
@@ -1226,7 +1314,7 @@ sub print_quotas {
                 if ($context eq 'requestcourses') {
                     $datatable .= '</tr><tr>';
                     foreach my $item (@usertools) {
-                        $datatable .= '<td style="vertical-align: top;">'.$cell{$item}.'</td>';  
+                        $datatable .= '<td style="vertical-align: top">'.$cell{$item}.'</td>';  
                     }
                     $datatable .= '</tr></table>';
                 }
@@ -1309,7 +1397,7 @@ sub print_quotas {
                 }
                 $defcell{$item} .= '</span>&nbsp; ';
                 if ($option eq 'autolimit') {
-                    $defcell{$item} .= $titles{'unlimited'};
+                    $defcell{$item} .= $titles{'unlimited'}
                 }
             }
         } else {
@@ -1332,7 +1420,7 @@ sub print_quotas {
     if ($context eq 'requestcourses') {
         $datatable .= '</tr><tr>';
         foreach my $item (@usertools) {
-            $datatable .= '<td style="vertical-align: top;">'.$defcell{$item}.'</td>';
+            $datatable .= '<td style="vertical-align: top">'.$defcell{$item}.'</td>';
         }
         $datatable .= '</tr></table>';
     }
@@ -1412,7 +1500,7 @@ sub print_quotas {
                 }
                 $advcell{$item} .= '</span>&nbsp; ';
                 if ($option eq 'autolimit') {
-                    $advcell{$item} .= $titles{'unlimited'};
+                    $advcell{$item} .= $titles{'unlimited'}
                 }
             }
         } else {
@@ -1435,7 +1523,7 @@ sub print_quotas {
     if ($context eq 'requestcourses') {
         $datatable .= '</tr><tr>';
         foreach my $item (@usertools) {
-            $datatable .= '<td style="vertical-align: top;">'.$advcell{$item}.'</td>';
+            $datatable .= '<td style="vertical-align: top">'.$advcell{$item}.'</td>';
         }
         $datatable .= '</tr></table>';
     }
@@ -1873,7 +1961,7 @@ sub courserequest_titles {
 
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
-       approval   => '(Processing of request subject to approval by Domain Coordinator).',
+       approval    => '(Processing of request subject to approval by Domain Coordinator).',
        validate   => '(Processing of request subject to instittutional validation).',
                  );
     return %conditions;
@@ -2439,11 +2527,6 @@ sub print_coursecategories {
         my $toggle_cats_dom = ' checked="checked" ';
         my $can_cat_crs = ' ';
         my $can_cat_dom = ' checked="checked" ';
-        my $toggle_catscomm_comm = ' ';
-        my $toggle_catscomm_dom = ' checked="checked" ';
-        my $can_catcomm_comm = ' ';
-        my $can_catcomm_dom = ' checked="checked" ';
-
         if (ref($settings) eq 'HASH') {
             if ($settings->{'togglecats'} eq 'crs') {
                 $toggle_cats_crs = $toggle_cats_dom;
@@ -2453,25 +2536,14 @@ sub print_coursecategories {
                 $can_cat_crs = $can_cat_dom;
                 $can_cat_dom = ' ';
             }
-            if ($settings->{'togglecatscomm'} eq 'comm') {
-                $toggle_catscomm_comm = $toggle_catscomm_dom;
-                $toggle_catscomm_dom = ' ';
-            }
-            if ($settings->{'categorizecomm'} eq 'comm') {
-                $can_catcomm_comm = $can_catcomm_dom;
-                $can_catcomm_dom = ' ';
-            }
         }
         my %title = &Apache::lonlocal::texthash (
-                     togglecats     => 'Show/Hide a course in catalog',
-                     togglecatscomm => 'Show/Hide a community in catalog',
-                     categorize     => 'Assign a category to a course',
-                     categorizecomm => 'Assign a category to a community',
+                     togglecats => 'Show/Hide a course in the catalog',
+                     categorize    => 'Assign a category to a course',
                     );
         my %level = &Apache::lonlocal::texthash (
-                     dom => 'Set in Domain',
-                     crs => 'Set in Course',   
-                     comm => 'Set in Community',
+                     dom => 'Set in "Modify Course" (Domain)',
+                     crs => 'Set in "Modify Parameters" (Course)',   
                     );
         $datatable = '<tr class="LC_odd_row">'.
                   '<td>'.$title{'togglecats'}.'</td>'.
@@ -2487,22 +2559,8 @@ sub print_coursecategories {
                   $can_cat_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
                   '<label><input type="radio" name="categorize"'.
                   $can_cat_crs.'value="crs" />'.$level{'crs'}.'</label></span></td>'.
-                  '</tr><tr class="LC_odd_row">'.
-                  '<td>'.$title{'togglecatscomm'}.'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                  '<input type="radio" name="togglecatscomm"'.
-                  $toggle_catscomm_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
-                  '<label><input type="radio" name="togglecatscomm"'.
-                  $toggle_catscomm_comm.' value="comm" />'.$level{'comm'}.'</label></span></td>'.
-                  '</tr><tr>'.
-                  '<td>'.$title{'categorizecomm'}.'</td>'.
-                  '<td class="LC_right_item"><span class="LC_nobreak">'.
-                  '<label><input type="radio" name="categorizecomm"'.
-                  $can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label>&nbsp;'.
-                  '<label><input type="radio" name="categorizecomm"'.
-                  $can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'.
                   '</tr>';
-        $$rowtotal += 4;
+        $$rowtotal += 2;
     } else {
         my $css_class;
         my $itemcount = 1;
@@ -2524,15 +2582,7 @@ sub print_coursecategories {
                 if (ref($cats[0]) eq 'ARRAY') {
                     my $numtop = @{$cats[0]};
                     my $maxnum = $numtop;
-                    my %default_names = (
-                          instcode    => &mt('Official courses'),
-                          communities => &mt('Communities'),
-                    );
-
-                    if ((!grep(/^instcode$/,@{$cats[0]})) ||
-                        ($cathash->{'instcode::0'} eq '') ||
-                        (!grep(/^communities$/,@{$cats[0]})) ||
-                        ($cathash->{'communities::0'} eq '')) {
+                    if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) {
                         $maxnum ++;
                     }
                     my $lastidx;
@@ -2553,33 +2603,14 @@ sub print_coursecategories {
                             $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                         }
                         $datatable .= '</select></td><td>';
-                        if ($parent eq 'instcode' || $parent eq 'communities') {
-                            $datatable .=  '<span class="LC_nobreak">'.
-                                           .$default_names{$parent}.'</span>';
-                            if ($parent eq 'instcode') {
-                                $datatable .= '<br /><span class="LC_nobreak">('
-                                              .&mt('with institutional codes')
-                                              .')</span></td><td'.$colattrib.'>';
-                            } else {
-                                $datatable .= '<table><tr><td>';
-                            }
-                            $datatable .= '<span class="LC_nobreak">'
-                                          .'<label><input type="radio" name="'
-                                          .$parent.'" value="1" checked="checked" />'
-                                          .&mt('Display').'</label>';
-                            if ($parent eq 'instcode') {
-                                $datatable .= '&nbsp;';
-                            } else {
-                                $datatable .= '</span></td></tr><tr><td>'
-                                              .'<span class="LC_nobreak">';
-                            }
-                            $datatable .= '<label><input type="radio" name="'
-                                          .$parent.'" value="0" />'
-                                          .&mt('Do not display').'</label></span>';
-                            if ($parent eq 'communities') {
-                                $datatable .= '</td></tr></table>';
-                            }
-                            $datatable .= '</td>';
+                        if ($parent eq 'instcode') {
+                            $datatable .=  '<span class="LC_nobreak">'.&mt('Official courses')
+                                           .'</span><br /><span class="LC_nobreak">('
+                                           .&mt('with institutional codes').')</span></td>'
+                                           .'<td'.$colattrib.'><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" checked="checked" />'
+                                            .&mt('Display').'</label>&nbsp;'
+                                            .'<label><input type="radio" name="instcode" value="0" />'
+                                            .&mt('Do not display').'</label></span></td>';
                         } else {
                             $datatable .= $parent
                                           .'&nbsp;<label><input type="checkbox" name="deletecategory" '
@@ -2607,33 +2638,26 @@ sub print_coursecategories {
                                   .'<input type="text" size="20" name="addcategory_name" value="" /></td>'
                                   .'</tr>'."\n";
                     $itemcount ++;
-                    foreach my $default ('instcode','communities') {
-                        if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) {
-                            $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                            my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"';
-                            $datatable .= '<tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr><tr '.$css_class.'><td>'.
-                                          '<span class="LC_nobreak"><select name="'.$default.'_pos"'.$chgstr.'>';
-                            for (my $k=0; $k<=$maxnum; $k++) {
-                                my $vpos = $k+1;
-                                my $selstr;
-                                if ($k == $maxnum) {
-                                    $selstr = ' selected="selected" ';
-                                }
-                                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+                    if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) {
+                        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                        my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','$lastidx'".');"';
+                        $datatable .= '<tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr><tr '.$css_class.'><td>'.
+                                      '<span class="LC_nobreak"><select name="instcode_pos"'.$chgstr.'>';
+                        for (my $k=0; $k<=$maxnum; $k++) {
+                            my $vpos = $k+1;
+                            my $selstr;
+                            if ($k == $maxnum) {
+                                $selstr = ' selected="selected" ';
                             }
-                            $datatable .= '</select></span></td>'.
-                                          '<td><span class="LC_nobreak">'.
-                                          $default_names{$default}.'</span>';
-                            if ($default eq 'instcode') {
-                                $datatable .= '<br /><span class="LC_nobreak">('
-                                              .&mt('with institutional codes').')</span>';
-                            }
-                            $datatable .= '</td>'
-                                          .'<td><span class="LC_nobreak"><label><input type="radio" name="'.$default.'" value="1" />'
-                                          .&mt('Display').'</label>&nbsp;'
-                                          .'<label><input type="radio" name="'.$default.'" value="0" checked="checked"/>'
-                                          .&mt('Do not display').'</label></span></td></tr>';
+                            $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                         }
+                        $datatable .= '</select></span></td><td><span class="LC_nobreak">'
+                                      .&mt('Official courses').'</span>'.'<br /><span class="LC_nobreak">('
+                                      .&mt('with institutional codes').')</span></td>'
+                                      .'<td><span class="LC_nobreak"><label><input type="radio" name="instcode" value="1" />'
+                                      .&mt('Display').'</label>&nbsp;'
+                                      .'<label><input type="radio" name="instcode" value="0" checked="checked"/>'
+                                      .&mt('Do not display').'</label></span></td></tr>';
                     }
                 }
             } else {
@@ -2722,9 +2746,6 @@ sub coursecategories_javascript {
         $jstext  = '    var categories = Array(1);'."\n".
                    '    categories[0] = Array("instcode_pos");'."\n"; 
     }
-    my $instcode_reserved = &mt('The name: "instcode" is a reserved category');
-    my $communities_reserved = &mt('The name: "communities" is a reserved category');
-    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category');
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -2784,19 +2805,6 @@ $jstext
     }
     return;
 }
-
-function categoryCheck(form) {
-    if (form.elements['addcategory_name'].value == 'instcode') {
-        alert('$instcode_reserved\\n$choose_again');
-        return false;
-    }
-    if (form.elements['addcategory_name'].value == 'communities') {
-        alert('$communities_reserved\\n$choose_again');
-        return false;
-    }
-    return true;
-}
-
 // ]]>
 </script>
 
@@ -2806,40 +2814,25 @@ ENDSCRIPT
 
 sub initialize_categories {
     my ($itemcount) = @_;
-    my ($datatable,$css_class,$chgstr);
-    my %default_names = (
-                      instcode    => 'Official courses (with institutional codes)',
-                      communities => 'Communities',
-                        );
-    my $select0 = ' selected="selected"';
-    my $select1 = '';
-    foreach my $default ('instcode','communities') {
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"';
-        if ($default eq 'communities') {
-            $select1 = $select0;
-            $select0 = '';
-        }
-        $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                     .'<select name="'.$default.'_pos">'
-                     .'<option value="0"'.$select0.'>1</option>'
-                     .'<option value="1"'.$select1.'>2</option>'
-                     .'<option value="2">3</option></select>&nbsp;'
-                     .$default_names{$default}
-                     .'</span></td><td><span class="LC_nobreak">'
-                     .'<label><input type="radio" name="'.$default.'" value="1" checked="checked" />'
-                     .&mt('Display').'</label>&nbsp;<label>'
-                     .'<input type="radio" name="'.$default.'" value="0" />'.&mt('Do not display')
+    my $datatable;
+    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','instcode_pos','0'".');"';
+
+    $datatable = '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                 .'<select name="instcode_pos"><option value="0" selected="selected">1</option>'
+                 .'<option value="1">2</option></select>&nbsp;'
+                 .&mt('Official courses (with institutional codes)')
+                 .'</span></td><td><span class="LC_nobreak">'
+                 .'<label><input type="radio" name="instcode" value="1" checked="checked" />'
+                 .&mt('Display').'</label>&nbsp;<label>'
+                 .'<input type="radio" name="instcode" value="0" />'.&mt('Do not display')
                  .'</label></span></td></tr>';
-        $itemcount ++;
-    }
+    $itemcount ++;
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
     $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','addcategory_pos','0'".');"';
     $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                  .'<select name="addcategory_pos"'.$chgstr.'>'
-                  .'<option value="0">1</option>'
-                  .'<option value="1">2</option>'
-                  .'<option value="2" selected="selected">3</option></select>&nbsp;'
+                  .'<select name="addcategory_pos"'.$chgstr.'><option value="0">1</option>'
+                  .'<option value="1" selected="selected">2</option></select>&nbsp;'
                   .&mt('Add category').'</td><td>'.&mt('Name:')
                   .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></td></tr>';
     return $datatable;
@@ -3146,6 +3139,14 @@ sub modify_login {
                   newuser => 'Link for visitors to create a user account',
                   loginheader => 'Log-in box header');
     my @offon = ('off','on');
+    my %curr_loginvia;
+    if (ref($domconfig{login}) eq 'HASH') {
+        if (ref($domconfig{login}{loginvia}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$domconfig{login}{loginvia}})) {
+                $curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost};
+            }
+        }
+    }
     my %loginhash;
     ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
                                            \%domconfig,\%loginhash);
@@ -3158,6 +3159,24 @@ sub modify_login {
         $colchgtext = &display_colorchgs($dom,\%colchanges,['login'],
                                          \%loginhash);
     }
+
+    my %servers = &Apache::lonnet::get_servers($dom);
+    if (keys(%servers) > 1) {
+        foreach my $lonhost (keys(%servers)) {
+            next if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost});
+            next if ($env{'form.'.$lonhost.'_serverurl'} eq $lonhost);
+            if ($curr_loginvia{$lonhost} ne '') {
+                $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'};
+                $changes{'loginvia'}{$lonhost} = 1;
+            } else {
+                if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) {
+                    $loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'};
+                    $changes{'loginvia'}{$lonhost} = 1;
+                }
+            }
+        }
+    }
+    
     my $putresult = &Apache::lonnet::put_dom('configuration',\%loginhash,
                                              $dom);
     if ($putresult eq 'ok') {
@@ -3204,6 +3223,18 @@ sub modify_login {
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'loginheader') {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>';
+                } elsif ($item eq 'loginvia') {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>';
+                        foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
+                            if ($servers{$env{'form.'.$lonhost.'_serverurl'}} ne '') {
+                                $resulttext .= '<li>'.&mt('Server: [_1] log-in page now redirects to [_2]',$lonhost,$servers{$env{'form.'.$lonhost.'_serverurl'}}).'</li>';
+                            } else {
+                                $resulttext .= '<li>'.&mt('Server: [_1] now has standard log-in page.',$lonhost).'</li>';
+                            }
+                        }
+                        $resulttext .= '</ul></li>'; 
+                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -3231,6 +3262,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
+            fontmenu => "Font Menu",
             pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
@@ -3288,6 +3320,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');
@@ -3410,6 +3443,17 @@ sub modify_colors {
                         $changes{$role}{'font'} = 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) {
                     if ($domconfig->{$role}{$item} ne '') {
                         if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) {
@@ -3850,7 +3894,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);
@@ -3905,7 +3949,7 @@ sub modify_quotas {
     }
     foreach my $item (@usertools) {
         foreach my $type (@{$types},'default','_LC_adv') {
-            my $unset;
+            my $unset; 
             if ($context eq 'requestcourses') {
                 $unset = '0';
                 if ($type eq '_LC_adv') {
@@ -5284,33 +5328,18 @@ sub modify_coursecategories {
             $changes{'categorize'} = 1;
             $domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'};
         }
-        if ($domconfig{'coursecategories'}{'togglecatscomm'} ne $env{'form.togglecatscomm'}) {
-            $changes{'togglecatscomm'} = 1;
-            $domconfig{'coursecategories'}{'togglecatscomm'} = $env{'form.togglecatscomm'};
-        }
-        if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) {
-            $changes{'categorizecomm'} = 1;
-            $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'};
-        }
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
-        $changes{'togglecatscomm'} = 1;
-        $changes{'categorizecomm'} = 1;
         $domconfig{'coursecategories'} = {
                                              togglecats => $env{'form.togglecats'},
                                              categorize => $env{'form.categorize'},
-                                             togglecatscomm => $env{'form.togglecatscomm'},
-                                             categorizecomm => $env{'form.categorizecomm'},
                                          };
     }
     if (ref($cathash) eq 'HASH') {
         if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
             push (@deletecategory,'instcode::0');
         }
-        if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '')  && ($env{'form.communities'} == 0)) {
-            push(@deletecategory,'communities::0');
-        }
     }
     my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail);
     if (ref($cathash) eq 'HASH') {
@@ -5360,26 +5389,10 @@ sub modify_coursecategories {
             $adds{$newitem} = 1;
         }
     }
-    if ($env{'form.communities'} eq '1') {
-        if (ref($cathash) eq 'HASH') {
-            my $newitem = 'communities::0';
-            if ($cathash->{$newitem} eq '') {
-                $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.communities_pos'};
-                $adds{$newitem} = 1;
-            }
-        } else {
-            my $newitem = 'communities::0';
-            $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.communities_pos'};
-            $adds{$newitem} = 1;
-        }
-    }
     if ($env{'form.addcategory_name'} ne '') {
-        if (($env{'form.addcategory_name'} ne 'instcode') &&
-            ($env{'form.addcategory_name'} ne 'communities')) {
-            my $newitem = &escape($env{'form.addcategory_name'}).'::0';
-            $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'};
-            $adds{$newitem} = 1;
-        }
+        my $newitem = &escape($env{'form.addcategory_name'}).'::0';
+        $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'};
+        $adds{$newitem} = 1;
     }
     my $putresult;
     if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
@@ -5416,15 +5429,12 @@ sub modify_coursecategories {
         $putresult = &Apache::lonnet::put_dom('configuration',\%domconfig,$dom);
         if ($putresult eq 'ok') {
             my %title = (
-                         togglecats     => 'Show/Hide a course in catalog',
-                         categorize     => 'Assign a category to a course',
-                         togglecatscomm => 'Show/Hide a community in catalog',
-                         categorizecomm => 'Assign a category to a community',
+                         togglecats  => 'Show/Hide a course in the catalog',
+                         categorize     => 'Category assigned to course',
                         );
             my %level = (
-                         dom  => 'set in Domain ("Modify Course/Community")',
-                         crs  => 'set in Course ("Course Configuration")',
-                         comm => 'set in Community ("Community Configuration")',
+                         dom => 'set from "Modify Course" (Domain)',
+                         crs => 'set from "Parameters" (Course)',
                         );
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'togglecats'}) {
@@ -5433,12 +5443,6 @@ sub modify_coursecategories {
             if ($changes{'categorize'}) {
                 $resulttext .= '<li>'.&mt("$title{'categorize'} $level{$env{'form.categorize'}}").'</li>';
             }
-            if ($changes{'togglecatscomm'}) {
-                $resulttext .= '<li>'.&mt("$title{'togglecatscomm'} $level{$env{'form.togglecatscomm'}}").'</li>';
-            }
-            if ($changes{'categorizecomm'}) {
-                $resulttext .= '<li>'.&mt("$title{'categorizecomm'} $level{$env{'form.categorizecomm'}}").'</li>';
-            }
             if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
                 my $cathash;
                 if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -5488,7 +5492,7 @@ sub modify_coursecategories {
                           &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext = &mt('No changes made to course and community categories');
+        $resulttext = &mt('No changes made to course categories');
     }
     return $resulttext;
 }