[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm

raeburn lon-capa-cvs-allow@mail.lon-capa.org
Fri, 13 Apr 2007 16:21:16 -0000


raeburn		Fri Apr 13 12:21:16 2007 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  Use text description of type of image in error messages for failed uploads.
  Display uploaded image instead of url in page reporting results of configuration changes.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.11 loncom/interface/domainprefs.pm:1.12
--- loncom/interface/domainprefs.pm:1.11	Thu Apr 12 16:33:31 2007
+++ loncom/interface/domainprefs.pm	Fri Apr 13 12:21:15 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.11 2007/04/12 20:33:31 albertel Exp $
+# $Id: domainprefs.pm,v 1.12 2007/04/13 16:21:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1006,7 +1006,7 @@
 
 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;
@@ -1014,6 +1014,11 @@
     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');
@@ -1038,7 +1043,7 @@
                 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) = 
@@ -1046,16 +1051,16 @@
                                            $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 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 {
-                            $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);
@@ -1086,7 +1091,7 @@
                     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};
@@ -1095,7 +1100,7 @@
                     } else {
                         if ($env{'form.'.$role.'_del_'.$img}) {
                             $confhash->{$role}{$img} = '';
-                            $changes{$role}{$img} = 1;
+                            $changes{$role}{'images'}{$img} = 1;
                         } 
                     }
                 }  
@@ -1157,7 +1162,7 @@
     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'}) {
@@ -1194,7 +1199,11 @@
                         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') {