--- loncom/interface/loncommon.pm	2002/08/28 14:11:27	1.62
+++ loncom/interface/loncommon.pm	2002/08/28 19:42:49	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.62 2002/08/28 14:11:27 www Exp $
+# $Id: loncommon.pm,v 1.63 2002/08/28 19:42:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,6 +98,10 @@ my %cprtag;
 my %fe; my %fd;
 my %category_extensions;
 
+# ---------------------------------------------- Designs
+
+my %designhash;
+
 # ---------------------------------------------- Thesaurus variables
 
 =pod
@@ -166,6 +170,30 @@ BEGIN {
 	    }
 	}
     }
+
+# -------------------------------------------------------------- domain designs
+
+    my $filename;
+    my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
+    opendir(DIR,$designdir);
+    while ($filename=readdir(DIR)) {
+	my ($domain)=($filename=~/^(\w+)\./);
+    {
+	my $fh=Apache::File->new($designdir.'/'.$filename);
+	if ($fh) {
+	    while (<$fh>) {
+		next if /^\#/;
+		chomp;
+		my ($key,$val)=(split(/\=/,$_));
+		if ($val) { $designhash{$domain.'.'.$key}=$val; }
+	    }
+	}
+    }
+
+    }
+    closedir(DIR);
+
+
 # ------------------------------------------------------------- file categories
     {
 	my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
@@ -1197,20 +1225,18 @@ sub findallcourses {
 
 =pod
 
-=item &domainlogo()
+=item &determinedomain()
 
 Inputs: $domain (usually will be undef)
 
-Returns: A link to a domain logo, if the domain logo exists.
-If the domain logo does not exist, a description of the domain.
+Returns: Determines which domain should be used for designs
 
 =cut
 
 ###############################################
-###############################################
-sub domainlogo {
-    my ($domain) = @_;    
-    if (! $domain) {
+sub determinedomain {
+    my $domain=shift;
+   if (! $domain) {
         # Determine domain if we have not been given one
         $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
         if ($ENV{'user.domain'}) { $domain=$ENV{'user.domain'}; }
@@ -1218,7 +1244,23 @@ sub domainlogo {
             $domain=$ENV{'request.role.domain'}; 
         }
     }
-    # See if there is a logo
+    return $domain;
+}
+###############################################
+=pod
+
+=item &domainlogo()
+
+Inputs: $domain (usually will be undef)
+
+Returns: A link to a domain logo, if the domain logo exists.
+If the domain logo does not exist, a description of the domain.
+
+=cut
+###############################################
+sub domainlogo {
+    my $domain = &determinedomain(shift);    
+     # See if there is a logo
     if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
         return '<img src="/adm/lonDomLogos/'.$domain.'.gif" />';
     } elsif(exists($Apache::lonnet::domaindescription{$domain})) {
@@ -1227,6 +1269,27 @@ sub domainlogo {
         return '';
     }
 }
+##############################################
+
+=pod
+
+=item &designparm()
+
+Inputs: $which parameter; $domain (usually will be undef)
+
+Returns: value of designparamter $which
+
+=cut
+##############################################
+sub designparm {
+    my ($which,$domain)=@_;
+    $domain=&determinedomain($domain);
+    if ($designhash{$domain.'.'.$which}) {
+	return $designhash{$domain.'.'.$which};
+    } else {
+        return $designhash{'default.'.$which};
+    }
+}
 
 ###############################################
 ###############################################
@@ -1253,6 +1316,8 @@ other decorations will be returned.
 =cut
 
 ###############################################
+
+
 ###############################################
 sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain)=@_;
@@ -1269,43 +1334,16 @@ sub bodytag {
             $function='author';
         }
     }
-    my $img='';
-    my $pgbg='';
-    my $tabbg='';
-    my $font='';
-    my $link='';
-    my $alink='#CC0000';
-    my $vlink='';
-    if ($function eq 'admin') {
-        $img='admin';
-        $pgbg='#FFFFCC';
-        $tabbg='#CCCC99';
-        $font='#772200';
-        $link='#663300';
-        $vlink='#666600';
-    } elsif ($function eq 'coordinator') {
-        $img='coordinator';
-        $pgbg='#CCFFFF';
-        $tabbg='#CCCCFF';
-        $font='#000044';
-        $link='#003333';
-        $vlink='#006633';
-   } elsif ($function eq 'author') {
-        $img='author';
-        $pgbg='#CCFFFF';
-        $tabbg='#CCFFCC';
-        $font='#004400';
-        $link='#003333';
-        $vlink='#006666';
-    } else {
-        $img='student';
-        $pgbg='#FFFFAA';
-        $tabbg='#FF9900';
-        $font='#991100';
-        $link='#993300';
-        $vlink='#996600';
-    }
-# role and realm
+    my $img=&designparm($function.'.img',$domain);
+    my $pgbg=&designparm($function.'.pgbg',$domain);
+    my $tabbg=&designparm($function.'.tabbg',$domain);
+    my $font=&designparm($function.'.font',$domain);
+    my $link=&designparm($function.'.link',$domain);
+    my $alink=&designparm($function.'.alink',$domain);
+    my $vlink=&designparm($function.'.vlink',$domain);
+    my $sidebg=&designparm($function.'.sidebg',$domain);
+
+ # role and realm
     my ($role,$realm)
        =&Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]);
 # realm
@@ -1328,8 +1366,8 @@ END
 $bodytag
 <table width="100%" cellspacing="0" border="0" cellpadding="0">
 <tr><td bgcolor="$font">
-<img src="/adm/lonInterFace/$img.jpg" /></td>
-<td bgcolor="$font"><font color='$pgbg'>$messages</font></td>
+<img src="$img" /></td>
+<td bgcolor="$font"><font color='$sidebg'>$messages</font></td>
 </tr>
 <tr>
 <td rowspan="3" bgcolor="$tabbg">