--- loncom/interface/loncommon.pm	2002/08/20 21:29:34	1.54
+++ loncom/interface/loncommon.pm	2002/08/21 17:18:08	1.55
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.54 2002/08/20 21:29:34 www Exp $
+# $Id: loncommon.pm,v 1.55 2002/08/21 17:18:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1195,7 +1195,20 @@ sub findallcourses {
 ###############################################
 
 sub bodytag {
-    my ($function,$title,$addentries)=@_;
+    my ($title,$function,$addentries)=@_;
+    unless ($function) {
+	$function='student';
+        if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+	    $function='coordinator';
+        }
+	if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+            $function='admin';
+        }
+        if (($ENV{'request.role'}=~/^(au|ca)/) ||
+            ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+            $function='author';
+        }
+    }
     my $img='';
     my $pgbg='';
     my $tabbg='';
@@ -1214,49 +1227,61 @@ sub bodytag {
         $img='coordinator';
         $pgbg='#CCFFFF';
         $tabbg='#CCCCFF';
-        $font='#000033';
+        $font='#000044';
         $link='#003333';
         $vlink='#006633';
    } elsif ($function eq 'author') {
         $img='author';
         $pgbg='#CCFFFF';
         $tabbg='#CCFFCC';
-        $font='#003300';
+        $font='#004400';
         $link='#003333';
         $vlink='#006666';
     } else {
         $img='student';
-        $pgbg='#FFFF99';
+        $pgbg='#FFFFAA';
         $tabbg='#FF9900';
         $font='#991100';
         $link='#993300';
         $vlink='#996600';
     }
-    my $role=&Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]);
+# role and realm
+    my ($role,$realm)
+       =&Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]);
+# realm
     if ($ENV{'request.course.id'}) {
-	$role.='<br>'.$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+	$realm=
+         $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
     }
+    unless ($realm) { $realm='&nbsp;'; }
+# Set messages
+    my $messages=localtime();
+# Output
     return(<<ENDBODY);
 <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
 $addentries>
-<table cellspacing="0" border="0" cellpadding="2">
-<tr><td colspan="2" bgcolor="$tabbg">
-<img src="/adm/lonInterFace/$img.jpg" /></td></tr>
+<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>
+</tr>
 <tr>
-<td rowspan="2" bgcolor="$tabbg">
-<font size="5"><b>$title</b></font>
+<td rowspan="3" bgcolor="$tabbg">
+&nbsp;<font size="5"><b>$title</b></font>
 <td bgcolor="$tabbg"  align="right">
 <font size="2">
     $ENV{'environment.firstname'}
     $ENV{'environment.middlename'}
     $ENV{'environment.lastname'}
     $ENV{'environment.generation'}
-</font>
+    </font>&nbsp;
 </td>
 </tr>
 <tr><td bgcolor="$tabbg" align="right">
-<font size="2">$role</font>
+<font size="2">$role</font>&nbsp;
 </td></tr>
+<tr>
+<td bgcolor="$tabbg" align="right"><font size="2">$realm</font>&nbsp;</td></tr>
 </table><br>
 ENDBODY
 }

+	$messages
-$title +	+ $title	$ENV{'environment.firstname'} $ENV{'environment.middlename'} $ENV{'environment.lastname'} $ENV{'environment.generation'} - +
-$title +		-$role +$role
$realm