--- loncom/interface/loncommon.pm 2007/04/04 00:10:01 1.518 +++ 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.518 2007/04/04 00:10:01 albertel Exp $ +# $Id: loncommon.pm,v 1.519 2007/04/05 21:36:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1272,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 @@ -1461,8 +1467,6 @@ sub home_server_option_list { =pod -=back - =cut ############################################################### @@ -3218,8 +3222,7 @@ sub get_domainconf { } } if (-e '/home/httpd/html/adm/lonDomLogos/'.$udom.'.gif') { - $designhash{$udom.'.login.domlogo'} = - &lonhttpdurl("/adm/lonDomLogos/$udom.gif"); + $designhash{$udom.'.login.domlogo'} = "/adm/lonDomLogos/$udom.gif"; } } &Apache::lonnet::do_cache_new('domainconfig',$udom,\%designhash, @@ -3244,8 +3247,11 @@ sub domainlogo { my %designhash = &get_domainconf($domain); # See if there is a logo if ($designhash{$domain.'.login.domlogo'} ne '') { - return '<img src="'.$designhash{$domain.'.login.domlogo'}. - '" alt="'.$domain.'" />'; + 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 { @@ -4275,6 +4281,10 @@ span.LC_prior_numerical { white-space: pre; } +span.LC_nobreak { + white-space: nowrap; +} + END }