--- loncom/interface/loncommon.pm	2002/08/22 13:39:42	1.56
+++ loncom/interface/loncommon.pm	2002/08/26 12:47:28	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.56 2002/08/22 13:39:42 matthew Exp $
+# $Id: loncommon.pm,v 1.59 2002/08/26 12:47:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -480,7 +480,7 @@ sub help_open_topic {
 
     # Add the graphic
     $template .= <<"ENDTEMPLATE";
-<a href="$link"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: $topic)"></a>
+<a href="$link"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: $topic)" /></a>
 ENDTEMPLATE
 
     return $template;
@@ -735,7 +735,7 @@ sub authform_nochange{
     my $result='';
     $result.=<<"END";
 <input type="radio" name="login" value="nochange" checked="checked"
-       onclick="javascript:changed_radio('nochange',$in{'formname'});">
+       onclick="javascript:changed_radio('nochange',$in{'formname'});" />
 Do not change login data
 END
     return $result;
@@ -751,10 +751,12 @@ sub authform_kerberos{
     $result.=<<"END";
 <input type="radio" name="login" value="krb" 
        onclick="javascript:changed_radio('krb',$in{'formname'});"
-       onchange="javascript:changed_radio('krb',$in{'formname'});">
+       onchange="javascript:changed_radio('krb',$in{'formname'});" />
 Kerberos authenticated with domain
 <input type="text" size="10" name="krbarg" value=""
-       onchange="javascript:changed_text('krb',$in{'formname'});">
+       onchange="javascript:changed_text('krb',$in{'formname'});" />
+<input type="radio" name="krbver" value="4" checked="on" />Version 4
+<input type="radio" name="krbver" value="5" />Version 5
 END
     return $result;
 }
@@ -769,10 +771,10 @@ sub authform_internal{
     $result.=<<"END";
 <input type="radio" name="login" value="int"
        onchange="javascript:changed_radio('int',$args{'formname'});"
-       onclick="javascript:changed_radio('int',$args{'formname'});">
+       onclick="javascript:changed_radio('int',$args{'formname'});" />
 Internally authenticated (with initial password 
 <input type="text" size="10" name="intarg" value=""
-       onchange="javascript:changed_text('int',$args{'formname'});">
+       onchange="javascript:changed_text('int',$args{'formname'});" />
 END
     return $result;
 }
@@ -787,10 +789,10 @@ sub authform_local{
     $result.=<<"END";
 <input type="radio" name="login" value="loc"
        onchange="javascript:changed_radio('loc',$in{'formname'});"
-       onclick="javascript:changed_radio('loc',$in{'formname'});"> 
+       onclick="javascript:changed_radio('loc',$in{'formname'});" />
 Local Authentication with argument
 <input type="text" size="10" name="locarg" value=""
-       onchange="javascript:changed_text('loc',$in{'formname'});">
+       onchange="javascript:changed_text('loc',$in{'formname'});" />
 END
     return $result;
 }
@@ -805,7 +807,7 @@ sub authform_filesystem{
     $result.=<<"END";
 <input type="radio" name="login" value="fsys" 
        onchange="javascript:changed_radio('fsys',$in{'formname'});"
-       onclick="javascript:changed_radio('fsys',$in{'formname'});"> 
+       onclick="javascript:changed_radio('fsys',$in{'formname'});" />
 Filesystem authenticated (with initial password 
 <input type="text" size="10" name="fsysarg" value=""
        onchange="javascript:changed_text('fsys',$in{'formname'});">
@@ -1147,6 +1149,19 @@ sub findallcourses {
 
 ###############################################
 
+sub domainlogo {
+# Determine domain
+    my $domain=$Apache::lonnet::perlvar{'lonDefDomain'};
+    if ($ENV{'user.domain'}) { $domain=$ENV{'user.domain'}; }
+    if ($ENV{'request.role.domain'}) { $domain=$ENV{'request.role.domain'}; }
+# See if there is a logo
+    if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
+	return '<img src="/adm/lonDomLogos/'.$domain.'.gif" />';
+    } else {
+        return $Apache::lonnet::domaindescription{$domain};
+    }
+}
+
 sub bodytag {
     my ($title,$function,$addentries)=@_;
     unless ($function) {
@@ -1208,7 +1223,7 @@ sub bodytag {
     }
     unless ($realm) { $realm='&nbsp;'; }
 # Set messages
-    my $messages=localtime();
+    my $messages=&domainlogo();
 # Output
     return(<<ENDBODY);
 <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
@@ -1425,7 +1440,7 @@ return HTML code to select file and spec
 
 sub upfile_select_html {
     return (<<'ENDUPFORM');
-<input type="file" name="upfile" size="50">
+<input type="file" name="upfile" size="50" />
 <br />Type: <select name="upfiletype">
 <option value="csv">CSV (comma separated values, spreadsheet)</option>
 <option value="space">Space separated</option>