';
+ $datatable .= &mt('(overrides affiliation, if set)').
+ ''.
+ ''.
+ '';
} else {
- $datatable .= ' ';
+ $datatable .= &mt('(overrides affiliation, if checked)').
+ ''.
+ ''.
+ ' ';
}
my %advcell;
foreach my $item (@usertools) {
@@ -1370,9 +1395,6 @@ sub print_quotas {
}
}
}
- if (!$curroption) {
- $curroption = 'norequest';
- }
$datatable .= ' | '.$titles{$item}.' | ';
my $checked = '';
if ($curroption eq '') {
@@ -1415,7 +1437,7 @@ sub print_quotas {
}
$advcell{$item} .= ' ';
if ($option eq 'autolimit') {
- $advcell{$item} .= $titles{'unlimited'};
+ $advcell{$item} .= $titles{'unlimited'}
}
}
} else {
@@ -1438,7 +1460,7 @@ sub print_quotas {
if ($context eq 'requestcourses') {
$datatable .= ' ';
foreach my $item (@usertools) {
- $datatable .= ''.$advcell{$item}.' | ';
+ $datatable .= ''.$advcell{$item}.' | ';
}
$datatable .= ' ';
}
@@ -1876,7 +1898,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;
@@ -2663,6 +2685,7 @@ sub coursecategories_javascript {
}
$output = <<"ENDSCRIPT";
ENDSCRIPT
@@ -3137,6 +3161,7 @@ sub color_font_choices {
links => "Link colors",
images => "Images",
font => "Font color",
+ fontmenu => "Font Menu",
pgbg => "Page",
tabbg => "Header",
sidebg => "Border",
@@ -3194,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');
@@ -3316,6 +3342,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}) {
@@ -3756,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);
@@ -3811,7 +3848,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') {
|