--- loncom/interface/domainprefs.pm	2007/04/10 20:49:07	1.9
+++ loncom/interface/domainprefs.pm	2007/04/13 16:21:15	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.9 2007/04/10 20:49:07 raeburn Exp $
+# $Id: domainprefs.pm,v 1.12 2007/04/13 16:21:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -951,7 +951,8 @@ sub modify_login {
             $resulttext = &mt('No changes made to log-in page settings');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     if ($errors) {
         $resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'.
@@ -993,7 +994,8 @@ sub modify_rolecolors {
             $resulttext = &mt('No changes made to default color schemes');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     if ($errors) {
         $resulttext .= &mt('The following errors occurred: ').'<ul>'.
@@ -1004,7 +1006,7 @@ sub modify_rolecolors {
 
 sub modify_colors {
     my ($r,$dom,$confname,$roles,$domconfig,$confhash) = @_;
-    my %changes;
+    my (%changes,%choices);
     my @bgs = ('pgbg','mainbg','sidebg');
     my @links = ('link','alink','vlink');
     my @images;
@@ -1012,6 +1014,11 @@ sub modify_colors {
     my $errors;
     foreach my $role (@{$roles}) {
         if ($role eq 'login') {
+            %choices = &login_choices();
+        } else {
+            %choices = &color_font_choices();
+        }
+        if ($role eq 'login') {
             @images = ('img','logo','domlogo');
         } else {
             @images = ('img');
@@ -1036,7 +1043,7 @@ sub modify_colors {
                 my $error;
                 if ($configuserok eq 'ok') {
                     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 {
                         if ($author_ok eq 'ok') {
                             my ($result,$logourl) = 
@@ -1044,20 +1051,20 @@ sub modify_colors {
                                            $dom,$confname,$img,$width,$height);
                             if ($result eq 'ok') {
                                 $confhash->{$role}{$img} = $logourl;
-                                $changes{$role}{$img} = 1;
+                                $changes{$role}{'images'}{$img} = 1;
                             } else {
-                                $error = &mt("Upload of image [_1] for $role page(s) failed because an error occurred publshing 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 {
-                            $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 {
-                    $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) {
                     &Apache::lonnet::logthis($error);
-                    $errors .= '<li>'.$error.'</li>';
+                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
                 }
             } elsif ($domconfig->{$role}{$img} ne '') {
                 if ($domconfig->{$role}{$img} !~ m-^(/res/\Q$dom\E/\Q$confname\E/\Q$img\E)/([^/]+)$-) {
@@ -1084,7 +1091,7 @@ sub modify_colors {
                     if ($domconfig->{$role}{$img} ne '') {
                         if ($env{'form.'.$role.'_del_'.$img}) {
                             $confhash->{$role}{$img} = '';
-                            $changes{$role}{$img} = 1;
+                            $changes{$role}{'images'}{$img} = 1;
                         } else {
                             if ($confhash->{$role}{$img} eq '') {
                                 $confhash->{$role}{$img} = $domconfig->{$role}{$img};
@@ -1093,7 +1100,7 @@ sub modify_colors {
                     } else {
                         if ($env{'form.'.$role.'_del_'.$img}) {
                             $confhash->{$role}{$img} = '';
-                            $changes{$role}{$img} = 1;
+                            $changes{$role}{'images'}{$img} = 1;
                         } 
                     }
                 }  
@@ -1155,7 +1162,7 @@ sub default_change_checker {
     foreach my $img (@{$images}) {
         if ($env{'form.'.$role.'_del_'.$img}) {
             $confhash->{$role}{$img} = '';
-            $changes->{$role}{$img} = 1;
+            $changes->{$role}{'images'}{$img} = 1;
         }
     }
     if ($confhash->{$role}{'font'}) {
@@ -1192,7 +1199,11 @@ sub display_colorchgs {
                         if ($confhash->{$role}{$item} eq '') {
                             $resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>';
                         } 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') {
@@ -1454,10 +1465,9 @@ sub check_switchserver {
         $home = &Apache::lonnet::domain($dom,'primary');
     }
     my @ids=&Apache::lonnet::current_machine_ids();
-    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; }
-        if (!$allowed) {
-            $switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
-        }
+    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+    if (!$allowed) {
+	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
     }
     return $switchserver;
 }
@@ -1507,7 +1517,8 @@ sub modify_quotas {
             $resulttext = &mt('No changes made to default quotas');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }
@@ -1571,7 +1582,8 @@ sub modify_autoenroll {
             $resulttext = &mt('No changes made to auto-enrollment settings');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }
@@ -1690,7 +1702,8 @@ sub modify_autoupdate {
             $resulttext = &mt('No changes made to autoupdates');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }