version 1.11, 2007/04/12 20:33:31
|
version 1.13, 2007/05/02 01:33:48
|
Line 145 sub handler {
|
Line 145 sub handler {
|
</td> |
</td> |
</tr> |
</tr> |
</table>'); |
</table>'); |
&print_footer($r,$phase,'process','Store changes'); |
&print_footer($r,$phase,'process','Save changes'); |
} |
} |
return OK; |
return OK; |
} |
} |
Line 1006 sub modify_rolecolors {
|
Line 1006 sub modify_rolecolors {
|
|
|
sub modify_colors { |
sub modify_colors { |
my ($r,$dom,$confname,$roles,$domconfig,$confhash) = @_; |
my ($r,$dom,$confname,$roles,$domconfig,$confhash) = @_; |
my %changes; |
my (%changes,%choices); |
my @bgs = ('pgbg','mainbg','sidebg'); |
my @bgs = ('pgbg','mainbg','sidebg'); |
my @links = ('link','alink','vlink'); |
my @links = ('link','alink','vlink'); |
my @images; |
my @images; |
Line 1014 sub modify_colors {
|
Line 1014 sub modify_colors {
|
my $errors; |
my $errors; |
foreach my $role (@{$roles}) { |
foreach my $role (@{$roles}) { |
if ($role eq 'login') { |
if ($role eq 'login') { |
|
%choices = &login_choices(); |
|
} else { |
|
%choices = &color_font_choices(); |
|
} |
|
if ($role eq 'login') { |
@images = ('img','logo','domlogo'); |
@images = ('img','logo','domlogo'); |
} else { |
} else { |
@images = ('img'); |
@images = ('img'); |
Line 1038 sub modify_colors {
|
Line 1043 sub modify_colors {
|
my $error; |
my $error; |
if ($configuserok eq 'ok') { |
if ($configuserok eq 'ok') { |
if ($switchserver) { |
if ($switchserver) { |
$error = &mt("Upload of image [_1] for $role page(s) is not permitted to this server: [_2]",$img,$switchserver); |
$error = &mt("Upload of [_1] image for $role page(s) is not permitted to this server: [_2]",$choices{$img},$switchserver); |
} else { |
} else { |
if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
my ($result,$logourl) = |
my ($result,$logourl) = |
Line 1046 sub modify_colors {
|
Line 1051 sub modify_colors {
|
$dom,$confname,$img,$width,$height); |
$dom,$confname,$img,$width,$height); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$confhash->{$role}{$img} = $logourl; |
$confhash->{$role}{$img} = $logourl; |
$changes{$role}{$img} = 1; |
$changes{$role}{'images'}{$img} = 1; |
} else { |
} else { |
$error = &mt("Upload of image [_1] for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$img,$result); |
$error = &mt("Upload of [_1] image for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$choices{img},$result); |
} |
} |
} else { |
} else { |
$error = &mt("Upload of image [_1] for $role page(s) failed because an author role could not be assigned to a Domain Configuation user ([_2]) in domain: [_3]. Error was: [_4].",$img,$confname,$dom,$author_ok); |
$error = &mt("Upload of [_1] image for $role page(s) failed because an author role could not be assigned to a Domain Configuation user ([_2]) in domain: [_3]. Error was: [_4].",$choices{$img},$confname,$dom,$author_ok); |
} |
} |
} |
} |
} else { |
} else { |
$error = &mt("Upload of image [_1] for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$img,$confname,$dom,$configuserok); |
$error = &mt("Upload of [_1] image for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$choices{$img},$confname,$dom,$configuserok); |
} |
} |
if ($error) { |
if ($error) { |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($error); |
Line 1086 sub modify_colors {
|
Line 1091 sub modify_colors {
|
if ($domconfig->{$role}{$img} ne '') { |
if ($domconfig->{$role}{$img} ne '') { |
if ($env{'form.'.$role.'_del_'.$img}) { |
if ($env{'form.'.$role.'_del_'.$img}) { |
$confhash->{$role}{$img} = ''; |
$confhash->{$role}{$img} = ''; |
$changes{$role}{$img} = 1; |
$changes{$role}{'images'}{$img} = 1; |
} else { |
} else { |
if ($confhash->{$role}{$img} eq '') { |
if ($confhash->{$role}{$img} eq '') { |
$confhash->{$role}{$img} = $domconfig->{$role}{$img}; |
$confhash->{$role}{$img} = $domconfig->{$role}{$img}; |
Line 1095 sub modify_colors {
|
Line 1100 sub modify_colors {
|
} else { |
} else { |
if ($env{'form.'.$role.'_del_'.$img}) { |
if ($env{'form.'.$role.'_del_'.$img}) { |
$confhash->{$role}{$img} = ''; |
$confhash->{$role}{$img} = ''; |
$changes{$role}{$img} = 1; |
$changes{$role}{'images'}{$img} = 1; |
} |
} |
} |
} |
} |
} |
Line 1157 sub default_change_checker {
|
Line 1162 sub default_change_checker {
|
foreach my $img (@{$images}) { |
foreach my $img (@{$images}) { |
if ($env{'form.'.$role.'_del_'.$img}) { |
if ($env{'form.'.$role.'_del_'.$img}) { |
$confhash->{$role}{$img} = ''; |
$confhash->{$role}{$img} = ''; |
$changes->{$role}{$img} = 1; |
$changes->{$role}{'images'}{$img} = 1; |
} |
} |
} |
} |
if ($confhash->{$role}{'font'}) { |
if ($confhash->{$role}{'font'}) { |
Line 1194 sub display_colorchgs {
|
Line 1199 sub display_colorchgs {
|
if ($confhash->{$role}{$item} eq '') { |
if ($confhash->{$role}{$item} eq '') { |
$resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>'; |
$resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$confhash->{$role}{$item}).'</li>'; |
my $newitem = $confhash->{$role}{$item}; |
|
if ($key eq 'images') { |
|
$newitem = '<img src="'.$confhash->{$role}{$item}.'" alt="'.$choices{$item}.'" valign="bottom" />'; |
|
} |
|
$resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$newitem).'</li>'; |
} |
} |
} |
} |
if ($role ne 'login') { |
if ($role ne 'login') { |