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

[raeburn]

raeburn		Sat Oct 12 01:42:30 2024 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Remove domain config unused beginning with 2.11.0 (2014)
    Headers on main page had used rolecolors->{role}->{'img'}, [role is one of
    student, coordinator,author or admin], when Remote Control was in use, prior
    to rev. 1.949 (main branch) and rev 1.1075.2.21 (2.11 branch).
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.444 loncom/interface/domainprefs.pm:1.445
--- loncom/interface/domainprefs.pm:1.444	Fri Oct 11 23:29:34 2024
+++ loncom/interface/domainprefs.pm	Sat Oct 12 01:42:29 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.444 2024/10/11 23:29:34 raeburn Exp $
+# $Id: domainprefs.pm,v 1.445 2024/10/12 01:42:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2021,7 +2021,7 @@
     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;
@@ -2029,10 +2029,6 @@
     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;
@@ -2055,10 +2051,6 @@
             }
         }
     } 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; 
@@ -2108,7 +2100,6 @@
         }
     } else {
         %defaults = (
-                       img => $defaultdesign{$role.'.img'},
                        font => $defaultdesign{$role.'.font'},
                        fontmenu => $defaultdesign{$role.'.fontmenu'},
                     );
@@ -13134,7 +13125,6 @@
 sub color_font_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            img => "Header",
             bgs => "Background colors",
             links => "Link colors",
             images => "Images",
@@ -13728,7 +13718,7 @@
             @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);
@@ -13754,7 +13744,7 @@
             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'};
             }
         }