version 1.102.2.2, 2009/08/23 12:40:50
|
version 1.107, 2009/08/22 20:28:29
|
Line 763 sub print_rolecolors {
|
Line 763 sub print_rolecolors {
|
my %defaults = ( |
my %defaults = ( |
img => $defaultdesign{$role.'.img'}, |
img => $defaultdesign{$role.'.img'}, |
font => $defaultdesign{$role.'.font'}, |
font => $defaultdesign{$role.'.font'}, |
|
fontmenu => $defaultdesign{$role.'.fontmenu'}, |
); |
); |
foreach my $item (@bgs) { |
foreach my $item (@bgs) { |
$defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item}; |
$defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item}; |
Line 780 sub print_rolecolors {
|
Line 781 sub print_rolecolors {
|
$designs{'font'} = $settings->{$role}->{'font'}; |
$designs{'font'} = $settings->{$role}->{'font'}; |
$is_custom{'font'} = 1; |
$is_custom{'font'} = 1; |
} |
} |
|
if ($settings->{$role}->{'fontmenu'} ne '') { |
|
$designs{'fontmenu'} = $settings->{$role}->{'fontmenu'}; |
|
$is_custom{'fontmenu'} = 1; |
|
} |
foreach my $item (@bgs) { |
foreach my $item (@bgs) { |
if ($settings->{$role}->{$item} ne '') { |
if ($settings->{$role}->{$item} ne '') { |
$designs{'bgs'}{$item} = $settings->{$role}->{$item}; |
$designs{'bgs'}{$item} = $settings->{$role}->{$item}; |
Line 798 sub print_rolecolors {
|
Line 803 sub print_rolecolors {
|
$designs{img} = $designhash{$dom.'.'.$role.'.img'}; |
$designs{img} = $designhash{$dom.'.'.$role.'.img'}; |
$is_custom{'img'} = 1; |
$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 '') { |
if ($designhash{$dom.'.'.$role.'.font'} ne '') { |
$designs{font} = $designhash{$dom.'.'.$role.'.font'}; |
$designs{font} = $designhash{$dom.'.'.$role.'.font'}; |
$is_custom{'font'} = 1; |
$is_custom{'font'} = 1; |
Line 826 sub display_color_options {
|
Line 835 sub display_color_options {
|
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, |
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, |
$images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_; |
$images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $datatable = '<tr'.$css_class.'>'. |
my $datatable = '<tr>'. |
'<td>'.$choices->{'font'}.'</td>'; |
'<td>'.$choices->{'font'}.'</td>'; |
if (!$is_custom->{'font'}) { |
if (!$is_custom->{'font'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
Line 840 sub display_color_options {
|
Line 849 sub display_color_options {
|
' <span id="css_'.$role.'_font" style="background-color: '. |
' <span id="css_'.$role.'_font" style="background-color: '. |
$designs->{'font'}.';"> </span>'. |
$designs->{'font'}.';"> </span>'. |
'</span></td></tr>'; |
'</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:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>'; |
|
} else { |
|
$datatable .= '<td> </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'}.'" /> '.$fontlink. |
|
' <span id="css_'.$role.'_fontmenu" style="background-color: '. |
|
$designs->{'fontmenu'}.';"> </span>'. |
|
'</span></td></tr>'; |
|
} |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
foreach my $img (@{$images}) { |
foreach my $img (@{$images}) { |
$itemcount ++; |
$itemcount ++; |
Line 1126 sub print_quotas {
|
Line 1151 sub print_quotas {
|
my ($css_class,%titles); |
my ($css_class,%titles); |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
@usertools = ('official','unofficial','community'); |
@usertools = ('official','unofficial','community'); |
@options =('norequest','approval','autolimit','validate'); |
@options =('norequest','approval','validate','autolimit'); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%titles = &courserequest_titles(); |
%titles = &courserequest_titles(); |
} else { |
} else { |
Line 1201 sub print_quotas {
|
Line 1226 sub print_quotas {
|
$item.'_limit_'.$type.'" size="1" '. |
$item.'_limit_'.$type.'" size="1" '. |
'value="'.$currlimit.'" />'; |
'value="'.$currlimit.'" />'; |
} |
} |
|
$cell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$cell{$item} .= $titles{'unlimited'}; |
$cell{$item} .= $titles{'unlimited'} |
} |
} |
$cell{$item} .= '</span> '; |
|
} |
} |
} else { |
} else { |
my $checked = 'checked="checked" '; |
my $checked = 'checked="checked" '; |
Line 1226 sub print_quotas {
|
Line 1251 sub print_quotas {
|
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
$datatable .= '</tr><tr>'; |
$datatable .= '</tr><tr>'; |
foreach my $item (@usertools) { |
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>'; |
$datatable .= '</tr></table>'; |
} |
} |
Line 1309 sub print_quotas {
|
Line 1334 sub print_quotas {
|
} |
} |
$defcell{$item} .= '</span> '; |
$defcell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$defcell{$item} .= $titles{'unlimited'}; |
$defcell{$item} .= $titles{'unlimited'} |
} |
} |
} |
} |
} else { |
} else { |
Line 1332 sub print_quotas {
|
Line 1357 sub print_quotas {
|
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
$datatable .= '</tr><tr>'; |
$datatable .= '</tr><tr>'; |
foreach my $item (@usertools) { |
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>'; |
$datatable .= '</tr></table>'; |
} |
} |
Line 1353 sub print_quotas {
|
Line 1378 sub print_quotas {
|
$datatable .= &mt('(overrides affiliation, if checked)'); |
$datatable .= &mt('(overrides affiliation, if checked)'); |
} |
} |
$datatable .= '</td>'. |
$datatable .= '</td>'. |
|
'<td class="LC_left_item" colspan="2">'; |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
$datatable .= '<table><tr>'; |
$datatable .= '<table><tr>'; |
} else { |
} else { |
Line 1370 sub print_quotas {
|
Line 1396 sub print_quotas {
|
} |
} |
} |
} |
} |
} |
if (!$curroption) { |
|
$curroption = 'norequest'; |
|
} |
|
$datatable .= '<th>'.$titles{$item}.'</th>'; |
$datatable .= '<th>'.$titles{$item}.'</th>'; |
my $checked = ''; |
my $checked = ''; |
if ($curroption eq '') { |
if ($curroption eq '') { |
Line 1415 sub print_quotas {
|
Line 1438 sub print_quotas {
|
} |
} |
$advcell{$item} .= '</span> '; |
$advcell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$advcell{$item} .= $titles{'unlimited'}; |
$advcell{$item} .= $titles{'unlimited'} |
} |
} |
} |
} |
} else { |
} else { |
Line 1438 sub print_quotas {
|
Line 1461 sub print_quotas {
|
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
$datatable .= '</tr><tr>'; |
$datatable .= '</tr><tr>'; |
foreach my $item (@usertools) { |
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>'; |
$datatable .= '</tr></table>'; |
} |
} |
Line 1876 sub courserequest_titles {
|
Line 1899 sub courserequest_titles {
|
|
|
sub courserequest_conditions { |
sub courserequest_conditions { |
my %conditions = &Apache::lonlocal::texthash ( |
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).', |
validate => '(Processing of request subject to instittutional validation).', |
); |
); |
return %conditions; |
return %conditions; |
Line 3137 sub color_font_choices {
|
Line 3160 sub color_font_choices {
|
links => "Link colors", |
links => "Link colors", |
images => "Images", |
images => "Images", |
font => "Font color", |
font => "Font color", |
|
fontmenu => "Font Menu", |
pgbg => "Page", |
pgbg => "Page", |
tabbg => "Header", |
tabbg => "Header", |
sidebg => "Border", |
sidebg => "Border", |
Line 3194 sub modify_colors {
|
Line 3218 sub modify_colors {
|
@logintext = ('textcol','bgcol'); |
@logintext = ('textcol','bgcol'); |
} else { |
} else { |
%choices = &color_font_choices(); |
%choices = &color_font_choices(); |
|
$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'}; |
} |
} |
if ($role eq 'login') { |
if ($role eq 'login') { |
@images = ('img','logo','domlogo','login'); |
@images = ('img','logo','domlogo','login'); |
Line 3316 sub modify_colors {
|
Line 3341 sub modify_colors {
|
$changes{$role}{'font'} = 1; |
$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) { |
foreach my $item (@bgs) { |
if ($domconfig->{$role}{$item} ne '') { |
if ($domconfig->{$role}{$item} ne '') { |
if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) { |
if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) { |
Line 3756 sub modify_quotas {
|
Line 3792 sub modify_quotas {
|
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
@usertools = ('official','unofficial','community'); |
@usertools = ('official','unofficial','community'); |
@options =('norequest','approval','autolimit','validate'); |
@options =('norequest','approval','validate','autolimit'); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%titles = &courserequest_titles(); |
%titles = &courserequest_titles(); |
$toolregexp = join('|',@usertools); |
$toolregexp = join('|',@usertools); |
Line 3811 sub modify_quotas {
|
Line 3847 sub modify_quotas {
|
} |
} |
foreach my $item (@usertools) { |
foreach my $item (@usertools) { |
foreach my $type (@{$types},'default','_LC_adv') { |
foreach my $type (@{$types},'default','_LC_adv') { |
my $unset; |
my $unset; |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
$unset = '0'; |
$unset = '0'; |
if ($type eq '_LC_adv') { |
if ($type eq '_LC_adv') { |
Line 3940 sub modify_quotas {
|
Line 3976 sub modify_quotas {
|
$env{'user.domain'}, |
$env{'user.domain'}, |
$item,'reload',$context); |
$item,'reload',$context); |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
if ($env{'environment.canrequest.'.$item} ne $newacc) { |
if ($env{'environment.crsrequest.'.$item} ne $newacc) { |
$newenv{'environment.canrequest.'.$item} = $newacc; |
$newenv{'environment.crsrequest.'.$item} = $newacc; |
} |
} |
} else { |
} else { |
if ($env{'environment.availabletools.'.$item} ne $newacc) { |
if ($env{'environment.availabletools.'.$item} ne $newacc) { |