--- loncom/interface/domainprefs.pm	2024/07/14 23:10:08	1.160.6.124
+++ loncom/interface/domainprefs.pm	2024/12/29 04:27:32	1.160.6.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.124 2024/07/14 23:10:08 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.125 2024/12/29 04:27:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1727,7 +1727,7 @@ sub print_rolecolors {
     my %choices = &color_font_choices();
     my @bgs = ('pgbg','tabbg','sidebg');
     my @links = ('link','alink','vlink');
-    my @images = ('img');
+    my @images = ();
     my %alt_text = &Apache::lonlocal::texthash(img => "Banner for $role role");
     my %designhash = &Apache::loncommon::get_domainconf($dom);
     my %defaultdesign = %Apache::loncommon::defaultdesign;
@@ -1735,10 +1735,6 @@ sub print_rolecolors {
     my %defaults = &role_defaults($role,\@bgs,\@links,\@images);
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{$role}) eq 'HASH') {
-            if ($settings->{$role}->{'img'} ne '') {
-                $designs{'img'} = $settings->{$role}->{'img'};
-                $is_custom{'img'} = 1;
-            }
             if ($settings->{$role}->{'font'} ne '') {
                 $designs{'font'} = $settings->{$role}->{'font'};
                 $is_custom{'font'} = 1;
@@ -1761,10 +1757,6 @@ sub print_rolecolors {
             }
         }
     } else {
-        if ($designhash{$dom.'.'.$role.'.img'} ne '') {
-            $designs{img} = $designhash{$dom.'.'.$role.'.img'};
-            $is_custom{'img'} = 1;
-        }
         if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') {
             $designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'};
             $is_custom{'fontmenu'} = 1; 
@@ -1814,7 +1806,6 @@ sub role_defaults {
         }
     } else {
         %defaults = (
-                       img => $defaultdesign{$role.'.img'},
                        font => $defaultdesign{$role.'.font'},
                        fontmenu => $defaultdesign{$role.'.fontmenu'},
                     );
@@ -9734,7 +9725,6 @@ sub check_exempt_addresses {
 sub color_font_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            img => "Header",
             bgs => "Background colors",
             links => "Link colors",
             images => "Images",
@@ -10083,11 +10073,15 @@ sub modify_colors {
             @images = ('img','logo','domlogo','login');
             @bgs = ('pgbg','mainbg','sidebg');
         } else {
-            @images = ('img');
+            @images = ();
             @bgs = ('pgbg','tabbg','sidebg');
         }
         my %defaults = &role_defaults($role,\@bgs,\@links,\@images,\@logintext);
-        unless ($env{'form.'.$role.'_font'} eq $defaults{'font'}) {
+        $env{'form.'.$role.'_font'} = lc($env{'form.'.$role.'_font'});
+        if ($env{'form.'.$role.'_font'} =~ /^\w+/) {
+            $env{'form.'.$role.'_font'} = '#'.$env{'form.'.$role.'_font'};
+        }
+        unless ($env{'form.'.$role.'_font'} eq lc($defaults{'font'})) {
             $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
         }
         if ($role eq 'login') {
@@ -10105,7 +10099,7 @@ sub modify_colors {
             if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) {
                 $env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'};
             }
-            unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
+            unless ($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
                 $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
             }
         }