--- loncom/interface/domainprefs.pm	2010/01/02 22:02:44	1.102.2.7
+++ loncom/interface/domainprefs.pm	2009/08/20 20:13:06	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.102.2.7 2010/01/02 22:02:44 raeburn Exp $
+# $Id: domainprefs.pm,v 1.103 2009/08/20 20:13:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,7 +105,7 @@ affiliate type (and also default, and _L
 (official, unofficial and community).  In each case the radio buttons allow the 
 selection of one of four values:
 
-0, approval, validate, autolimit=N (where N is blank, or a positive integer).
+0, approve, validate, autolimit=N (where N is blank, or a positive integer).
 which have the following effects:
 
 0
@@ -116,7 +116,7 @@ which have the following effects:
 
 =back
 
-approval 
+approve 
 
 =over 
 
@@ -202,12 +202,11 @@ sub handler {
                 'quotas','autoenroll','autoupdate','directorysrch',
                 'usercreation','usermodification','contacts','defaults',
                 'scantron','coursecategories','serverstatuses',
-                'requestcourses','coursedefaults'],$dom);
+                'requestcourses'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','directorysrch','contacts',
                        'usercreation','usermodification','scantron',
-                       'requestcourses','coursecategories','serverstatuses',
-                       'coursedefaults');
+                       'requestcourses','coursecategories','serverstatuses');
     my %prefs = (
         'rolecolors' =>
                    { text => 'Default color schemes',
@@ -303,7 +302,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,12 +318,6 @@ sub handler {
                               col3 => 'Specific IPs',
                             }],
                  },
-        'coursedefaults' =>
-                 {text => 'Course/Community defaults',
-                  help => 'Domain_Configuration_Course_Defaults',
-                  header => [{col1 => 'Setting',
-                              col2 => 'Value',}],
-                 },
     );
     my @roles = ('student','coordinator','author','admin');
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
@@ -411,8 +404,6 @@ sub process_changes {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
         $output = &modify_quotas($dom,$action,%domconfig);
-    } elsif ($action eq 'coursedefaults') {
-        $output = &modify_coursedefaults($dom,%domconfig);
     }
     return $output;
 }
@@ -590,8 +581,6 @@ sub print_config_box {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'serverstatuses') {
             $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
-        } elsif ($action eq 'coursedefaults') {
-            $output .= &print_coursedefaults($dom,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -739,7 +728,7 @@ sub print_login {
 sub login_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            coursecatalog => 'Display Course/Community Catalog link?',
+            coursecatalog => 'Display Course Catalog link?',
             adminmail => "Display Administrator's E-mail Address?",
             newuser   => "Link to create a user account",
             img => "Header",
@@ -774,6 +763,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};
@@ -791,6 +781,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};
@@ -809,6 +803,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;
@@ -837,7 +835,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>';
@@ -851,6 +849,20 @@ 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>';
+    }
+    $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 ++;
@@ -1137,7 +1149,7 @@ sub print_quotas {
     my ($css_class,%titles);
     if ($context eq 'requestcourses') {
         @usertools = ('official','unofficial','community');
-        @options =('norequest','approval','autolimit','validate');
+        @options =('norequest','approve','autolimit','validate');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
     } else {
@@ -1212,10 +1224,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" ';
@@ -1237,7 +1249,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>'.$cell{$item}.'</td>';  
                     }
                     $datatable .= '</tr></table>';
                 }
@@ -1319,9 +1331,6 @@ sub print_quotas {
                                        'value="'.$currlimit.'" />';
                 }
                 $defcell{$item} .= '</span>&nbsp; ';
-                if ($option eq 'autolimit') {
-                    $defcell{$item} .= $titles{'unlimited'};
-                }
             }
         } else {
             my $checked = 'checked="checked" ';
@@ -1343,7 +1352,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>'.$defcell{$item}.'</td>';
         }
         $datatable .= '</tr></table>';
     }
@@ -1357,17 +1366,14 @@ sub print_quotas {
     $typecount ++;
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
-                  '<td>'.&mt('LON-CAPA Advanced Users').' ';
+                  '<td>'.&mt('LON-CAPA Advanced Users').
+                  ' <span class="LC_nobreak">('.
+                  &mt('overrides affiliation').')</span></td>'.
+                  '<td class="LC_left_item" colspan="2">';
     if ($context eq 'requestcourses') {
-        $datatable .= &mt('(overrides affiliation, if set)').
-                      '</td>'.
-                      '<td class="LC_left_item">'.
-                      '<table><tr>';
+        $datatable .= '<table><tr>';
     } else {
-        $datatable .= &mt('(overrides affiliation, if checked)').
-                      '</td>'.
-                      '<td class="LC_left_item" colspan="2">'.
-                      '<br />';
+        $datatable .= '<br />';
     }
     my %advcell;
     foreach my $item (@usertools) {
@@ -1381,15 +1387,10 @@ sub print_quotas {
                     }
                 }
             }
+            if (!$curroption) {
+                $curroption = 'norequest';
+            }
             $datatable .= '<th>'.$titles{$item}.'</th>';
-            my $checked = '';
-            if ($curroption eq '') {
-                $checked = ' checked="checked"';
-            }
-            $advcell{$item} .= '<span class="LC_nobreak"><label>'.
-                               '<input type="radio" name="crsreq_'.$item.
-                               '__LC_adv" value=""'.$checked.' />'.
-                               &mt('No override set').'</label></span>&nbsp; ';
             foreach my $option (@options) {
                 my $val = $option;
                 if ($option eq 'norequest') {
@@ -1405,7 +1406,7 @@ sub print_quotas {
                     next if (!$canvalidate);
                 }
                 my $checked = '';
-                if ($val eq $curroption) {
+                if ($option eq $curroption) {
                     $checked = ' checked="checked"';
                 } elsif ($option eq 'autolimit') {
                     if ($curroption =~ /^autolimit/) {
@@ -1422,9 +1423,6 @@ sub print_quotas {
                                        'value="'.$currlimit.'" />';
                 }
                 $advcell{$item} .= '</span>&nbsp; ';
-                if ($option eq 'autolimit') {
-                    $advcell{$item} .= $titles{'unlimited'};
-                }
             }
         } else {
             my $checked = 'checked="checked" ';
@@ -1446,7 +1444,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>'.$advcell{$item}.'</td>';
         }
         $datatable .= '</tr></table>';
     }
@@ -1457,7 +1455,7 @@ sub print_quotas {
 
 sub print_courserequestmail {
     my ($dom,$settings,$rowtotal) = @_;
-    my ($now,$datatable,%dompersonnel,@domcoord,@currapproval,$rows);
+    my ($now,$datatable,%dompersonnel,@domcoord,@currapprove,$rows);
     $now = time;
     $rows = 0;
     %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now);
@@ -1472,12 +1470,12 @@ sub print_courserequestmail {
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'notify'}) eq 'HASH') {
             if ($settings->{'notify'}{'approval'} ne '') {
-               @currapproval = split(',',$settings->{'notify'}{'approval'});
+               @currapprove = split(',',$settings->{'notify'}{'approval'});
             }
         }
     }
-    if (@currapproval) {
-        foreach my $dc (@currapproval) {
+    if (@currapprove) {
+        foreach my $dc (@currapprove) {
             unless (grep(/^\Q$dc\E$/,@domcoord)) {
                 push(@domcoord,$dc);
             }
@@ -1503,7 +1501,7 @@ sub print_courserequestmail {
                 $rows ++;
             }
             my $check = ' ';
-            if (grep(/^\Q$domcoord[$i]\E$/,@currapproval)) {
+            if (grep(/^\Q$domcoord[$i]\E$/,@currapprove)) {
                 $check = ' checked="checked" ';
             }
             my ($uname,$udom) = split(':',$domcoord[$i]);
@@ -1839,67 +1837,6 @@ sub print_contacts {
     return $datatable;
 }
 
-sub radiobutton_prefs {
-    my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_;
-    return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
-                   (ref($choices) eq 'HASH'));
-
-    my (%checkedon,%checkedoff,$datatable,$css_class);
-
-    foreach my $item (@{$toggles}) {
-        if ($defaultchecked->{$item} eq 'on') {
-            $checkedon{$item} = ' checked="checked" ';
-            $checkedoff{$item} = ' ';
-        } elsif ($defaultchecked->{$item} eq 'off') {
-            $checkedoff{$item} = ' checked="checked" ';
-            $checkedon{$item} = ' ';
-        }
-    }
-    if (ref($settings) eq 'HASH') {
-        foreach my $item (@{$toggles}) {
-            if ($settings->{$item} eq '1') {
-                $checkedon{$item} =  ' checked="checked" ';
-                $checkedoff{$item} = ' ';
-            } elsif ($settings->{$item} eq '0') {
-                $checkedoff{$item} =  ' checked="checked" ';
-                $checkedon{$item} = ' ';
-            }
-        }
-    }
-    foreach my $item (@{$toggles}) {
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .=
-            '<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices->{$item}.
-            '</span></td>'.
-            '<td class="LC_right_item"><span class="LC_nobreak">'.
-            '<label><input type="radio" name="'.
-            $item.'" '.$checkedon{$item}.' value="1" />'.&mt('Yes').
-            '</label>&nbsp;<label><input type="radio" name="'.$item.'" '.
-            $checkedoff{$item}.' value="0" />'.&mt('No').'</label>'.
-            '</span></td>'.
-            '</tr>';
-        $itemcount ++;
-    }
-    return ($datatable,$itemcount);
-}
-
-sub print_coursedefaults {
-    my ($dom,$settings,$rowtotal) = @_;
-    my ($css_class,$datatable);
-    my $itemcount = 1;
-    my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles);
-    %choices =
-        &Apache::lonlocal::texthash (
-            canuse_pdfforms => 'Course/Community users can create/upload PDF forms',
-    );
-    %defaultchecked = ('canuse_pdfforms' => 'off');
-    @toggles = ('canuse_pdfforms',);
-    ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                 \%choices,$itemcount);
-    $$rowtotal += $itemcount;
-    return $datatable;
-}
-
 sub contact_titles {
     my %titles = &Apache::lonlocal::texthash (
                    'supportemail' => 'Support E-mail address',
@@ -1935,7 +1872,7 @@ sub courserequest_titles {
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
                                    norequest  => 'Not allowed',
-                                   approval   => 'Approval by Dom. Coord.',
+                                   approve    => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
                                    autolimit  => 'Numerical limit',
                                    unlimited  => '(blank for unlimited)',
@@ -1945,7 +1882,7 @@ sub courserequest_titles {
 
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
-       approval   => '(Processing of request subject to approval by Domain Coordinator).',
+       approve    => '(Processing of request subject to approval by Domain Coordinator).',
        validate   => '(Processing of request subject to instittutional validation).',
                  );
     return %conditions;
@@ -2511,11 +2448,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;
@@ -2525,25 +2457,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>'.
@@ -2559,22 +2480,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;
@@ -2596,15 +2503,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;
@@ -2625,33 +2524,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" '
@@ -2679,33 +2559,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 {
@@ -2769,7 +2642,7 @@ sub print_serverstatuses {
 sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
             'clusterstatus','metadata_keywords','metadata_harvest',
-            'takeoffline','takeonline','showenv','toggledebug');
+            'takeoffline','takeonline','showenv');
 }
 
 sub coursecategories_javascript {
@@ -2794,12 +2667,8 @@ 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[
 function reorderCats(form,parent,item,idx) {
     var changedVal;
 $jstext
@@ -2856,20 +2725,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>
 
 ENDSCRIPT
@@ -2878,40 +2733,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;
@@ -3303,6 +3143,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
+            fontmenu => "Font Menu",
             pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
@@ -3369,6 +3210,7 @@ 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};
         }
@@ -3482,6 +3324,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;
+                    }
+                }
                 foreach my $item (@bgs) {
                     if ($domconfig->{$role}{$item} ne '') {
                         if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) {
@@ -3922,7 +3773,7 @@ sub modify_quotas {
     }
     if ($context eq 'requestcourses') {
         @usertools = ('official','unofficial','community');
-        @options =('norequest','approval','autolimit','validate');
+        @options =('norequest','approve','autolimit','validate');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
         $toolregexp = join('|',@usertools);
@@ -3977,12 +3828,7 @@ sub modify_quotas {
     }
     foreach my $item (@usertools) {
         foreach my $type (@{$types},'default','_LC_adv') {
-            my $unset;
             if ($context eq 'requestcourses') {
-                $unset = '0';
-                if ($type eq '_LC_adv') {
-                    $unset = '';
-                }
                 if ($confhash{$item}{$type} eq 'autolimit') {
                     $confhash{$item}{$type} .= '=';
                     unless ($limithash{$item}{$type} =~ /\D/) {
@@ -4003,7 +3849,7 @@ sub modify_quotas {
                     }
                 } else {
                     if ($context eq 'requestcourses') {
-                        if ($confhash{$item}{$type} ne $unset) {
+                        if ($confhash{$item}{$type} ne 'norequest') {
                             $changes{$item}{$type} = 1;
                         }
                     } else {
@@ -4014,7 +3860,7 @@ sub modify_quotas {
                 }
             } else {
                 if ($context eq 'requestcourses') {
-                    if ($confhash{$item}{$type} ne $unset) {
+                    if ($confhash{$item}{$type} eq 'norequest') {
                         $changes{$item}{$type} = 1;
                     }
                 } else {
@@ -4106,8 +3952,8 @@ sub modify_quotas {
                                                           $env{'user.domain'},
                                                           $item,'reload',$context);
                     if ($context eq 'requestcourses') {
-                        if ($env{'environment.canrequest.'.$item} ne $newacc) {
-                            $newenv{'environment.canrequest.'.$item} = $newacc;
+                        if ($env{'environment.crsrequest.'.$item} ne $newacc) {
+                            $newenv{'environment.crsrequest.'.$item} = $newacc;
                         }
                     } else {
                         if ($env{'environment.availabletools.'.$item} ne $newacc) { 
@@ -4140,15 +3986,7 @@ sub modify_quotas {
                                     $resulttext .= '<li>'.&mt('Set to be available to [_1]',$typetitle).'</li>';
                                 }
                             } else {
-                                if ($type eq '_LC_adv') {
-                                    if ($confhash{$item}{$type} eq '0') {
-                                        $resulttext .= '<li>'.&mt('Set to be unavailable to [_1]',$typetitle).'</li>';
-                                    } else { 
-                                        $resulttext .= '<li>'.&mt('No override set for [_1]',$typetitle).'</li>';
-                                    }
-                                } else {
-                                    $resulttext .= '<li>'.&mt('Set to be unavailable to [_1]',$typetitle).'</li>';
-                                }
+                                $resulttext .= '<li>'.&mt('Set to be unavailable to [_1]',$typetitle).'</li>';
                             }
                         }
                     }
@@ -5356,33 +5194,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') {
@@ -5432,26 +5255,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)) {
@@ -5488,15 +5295,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'}) {
@@ -5505,12 +5309,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') {
@@ -5560,7 +5358,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;
 }
@@ -5689,72 +5487,6 @@ sub modify_serverstatuses {
     }
     return $resulttext;
 }
-
-sub modify_coursedefaults {
-    my ($dom,%domconfig) = @_;
-    my ($resulttext,$errors,%changes,%defaultshash);
-    my %defaultchecked = ('canuse_pdfforms' => 'off');
-    my @offon = ('off','on');
-    my @toggles = ('canuse_pdfforms');
-
-    $defaultshash{'coursedefaults'} = {};
-
-    if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
-        if ($domconfig{'coursedefaults'} eq '') {
-            $domconfig{'coursedefaults'} = {};
-        }
-    }
-
-    if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
-        foreach my $item (@toggles) {
-            if ($defaultchecked{$item} eq 'on') {
-                if (($domconfig{'coursedefaults'}{$item} eq '') &&
-                    ($env{'form.'.$item} eq '0')) {
-                    $changes{$item} = 1;
-                } elsif ($domconfig{'coursdefaults'}{$item} ne $env{'form.'.$item}) {
-                    $changes{$item} = 1;
-                }
-            } elsif ($defaultchecked{$item} eq 'off') {
-                if (($domconfig{'coursedefaults'}{$item} eq '') &&
-                    ($env{'form.'.$item} eq '1')) {
-                    $changes{$item} = 1;
-                } elsif ($domconfig{'coursedefaults'}{$item} ne $env{'form.'.$item}) {
-                    $changes{$item} = 1;
-                }
-            }
-            $defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item};
-        }
-    }
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
-                                             $dom);
-    if ($putresult eq 'ok') {
-        if (keys(%changes) > 0) {
-            if ($changes{'canuse_pdfforms'}) {
-                my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-                $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
-                my $cachetime = 24*60*60;
-                &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-            }
-            $resulttext = &mt('Changes made:').'<ul>';
-            foreach my $item (sort(keys(%changes))) {
-                if ($item eq 'canuse_pdfforms') {
-                    if ($env{'form.'.$item} eq '1') {
-                        $resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>';
-                    }
-                }
-            }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made to course defaults');
-        }
-    } else {
-        $resulttext = '<span class="LC_error">'.
-            &mt('An error occurred: [_1]',$putresult).'</span>';
-    }
-    return $resulttext;
-}
 
 sub recurse_check {
     my ($chkcats,$categories,$depth,$name) = @_;