--- loncom/interface/loncommon.pm	2007/03/15 02:51:23	1.515
+++ loncom/interface/loncommon.pm	2007/04/05 21:36:15	1.519
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.515 2007/03/15 02:51:23 albertel Exp $
+# $Id: loncommon.pm,v 1.519 2007/04/05 21:36:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,8 +68,12 @@ use Apache::lontexconvert();
 use Apache::lonclonecourse();
 use LONCAPA qw(:DEFAULT :match);
 
+# ---------------------------------------------- Designs
+use vars qw(%defaultdesign);
+
 my $readit;
 
+
 ##
 ## Global Variables
 ##
@@ -82,10 +86,6 @@ my %scprtag;
 my %fe; my %fd; my %fm;
 my %category_extensions;
 
-# ---------------------------------------------- Designs
-
-my %designhash;
-
 # ---------------------------------------------- Thesaurus variables
 #
 # %Keywords:
@@ -151,30 +151,18 @@ BEGIN {
         }
     }
 
-# -------------------------------------------------------------- domain designs
-
-    my $filename;
+# -------------------------------------------------------------- default domain designs
     my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
-    opendir(DIR,$designdir);
-    while ($filename=readdir(DIR)) {
-	if ($filename!~/\.tab$/) { next; }
-	my ($domain)=($filename=~/^($match_domain)\./);
-	{
-	    my $designfile = $designdir.'/'.$filename;
-	    if ( open (my $fh,"<$designfile") ) {
-		while (my $line = <$fh>) {
-		    next if ($line =~ /^\#/);
-		    chomp($line);
-		    my ($key,$val)=(split(/\=/,$line));
-		    if ($val) { $designhash{$domain.'.'.$key}=$val; }
-		}
-		close($fh);
-	    }
-	}
-
+    my $designfile = $designdir.'/default.tab';
+    if ( open (my $fh,"<$designfile") ) {
+        while (my $line = <$fh>) {
+            next if ($line =~ /^\#/);
+            chomp($line);
+            my ($key,$val)=(split(/\=/,$line));
+            if ($val) { $defaultdesign{$key}=$val; }
+        }
+        close($fh);
     }
-    closedir(DIR);
-
 
 # ------------------------------------------------------------- file categories
     {
@@ -1284,6 +1272,12 @@ sub domain_select {
 
 =pod
 
+=head1 Routines for form select boxes
+
+=over 4
+
+=cut
+
 =item * multiple_select_form($name,$value,$size,$hash,$order)
 
 Returns a string containing a <select> element int multiple mode
@@ -1435,7 +1429,7 @@ selected");
 #-------------------------------------------
 sub select_dom_form {
     my ($defdom,$name,$includeempty) = @_;
-    my @domains = &Apache::lonnet::all_domains();
+    my @domains = sort(&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }
     my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
     foreach my $dom (@domains) {
@@ -1473,8 +1467,6 @@ sub home_server_option_list {
 
 =pod
 
-=back
-
 =cut
 
 ###############################################################
@@ -3184,6 +3176,60 @@ sub determinedomain {
     return $domain;
 }
 ###############################################
+
+sub devalidate_domconfig_cache {
+    my ($udom)=@_;
+    &Apache::lonnet::devalidate_cache_new('domainconfig',$udom);
+}
+
+# ---------------------- Get domain configuration for a domain
+sub get_domainconf {
+    my ($udom) = @_;
+    my $cachetime=1800;
+    my ($result,$cached)=&Apache::lonnet::is_cached_new('domainconfig',$udom);
+    if (defined($cached)) { return %{$result}; }
+
+    my %domconfig = &Apache::lonnet::get_dom('configuration',
+					     ['login','rolecolors'],$udom);
+    my %designhash;
+    if (keys(%domconfig) > 0) {
+        if (ref($domconfig{'login'}) eq 'HASH') {
+            foreach my $key (keys(%{$domconfig{'login'}})) {
+                $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
+            }
+        }
+        if (ref($domconfig{'rolecolors'}) eq 'HASH') {
+            foreach my $role (keys(%{$domconfig{'rolecolors'}})) {
+                if (ref($domconfig{'rolecolors'}{$role}) eq 'HASH') {
+                    foreach my $item (keys(%{$domconfig{'rolecolors'}{$role}})) {
+                        $designhash{$udom.'.'.$role.'.'.$item}=$domconfig{'rolecolors'}{$role}{$item};
+                    }
+                }
+            }
+        }
+    } else {
+        my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
+        my $designfile =  $designdir.'/'.$udom.'.tab';
+        if (-e $designfile) {
+            if ( open (my $fh,"<$designfile") ) {
+                while (my $line = <$fh>) {
+                    next if ($line =~ /^\#/);
+                    chomp($line);
+                    my ($key,$val)=(split(/\=/,$line));
+                    if ($val) { $designhash{$udom.'.'.$key}=$val; }
+                }
+                close($fh);
+            }
+        }
+        if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') {
+            $designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif";
+        }
+    }
+    &Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash,
+				  $cachetime);
+    return %designhash;
+}
+
 =pod
 
 =item * &domainlogo()
@@ -3197,11 +3243,15 @@ If the domain logo does not exist, a des
 
 ###############################################
 sub domainlogo {
-    my $domain = &determinedomain(shift);    
-     # See if there is a logo
-    if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
-	my $logo=&lonhttpdurl("/adm/lonDomLogos/$domain.gif");
-        return '<img src="'.$logo.'" alt="'.$domain.'" />';
+    my $domain = &determinedomain(shift);
+    my %designhash = &get_domainconf($domain);    
+    # See if there is a logo
+    if ($designhash{$domain.'.login.domlogo'} ne '') {
+        my $imgsrc = $designhash{$domain.'.login.domlogo'};
+        if ($imgsrc =~ /^\/adm/) {
+            $imgsrc = &lonhttpdurl($imgsrc);
+        } 
+        return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
     } elsif (defined(&Apache::lonnet::domain($domain,'description'))) {
         return &Apache::lonnet::domain($domain,'description');
     } else {
@@ -3239,10 +3289,11 @@ sub designparm {
 	return $env{'environment.color.'.$which};
     }
     $domain=&determinedomain($domain);
-    if (exists($designhash{$domain.'.'.$which})) {
-	return $designhash{$domain.'.'.$which};
+    my %domdesign = &get_domainconf($domain);
+    if ($domdesign{$domain.'.'.$which} ne '') {
+	return $domdesign{$domain.'.'.$which};
     } else {
-        return $designhash{'default.'.$which};
+        return $defaultdesign{$which};
     }
 }
 
@@ -3462,8 +3513,11 @@ ENDROLE
 # Top frame rendering, Remote is up
 #
 
-    my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
-        $lonhttpdPort.$img.'" alt="'.$function.'" />';
+    my $imgsrc = $img;
+    if ($img =~ /^\/adm/) {
+        $imgsrc = 'http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.$img;
+    }
+    my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
 
     # Explicit link to get inline menu
     my $menu= ($no_inline_link?''
@@ -4227,6 +4281,10 @@ span.LC_prior_numerical {
     white-space: pre;
 }
 
+span.LC_nobreak {
+    white-space: nowrap;
+}
+
 END
 }