--- loncom/interface/loncommon.pm	2002/08/20 21:29:34	1.54
+++ loncom/interface/loncommon.pm	2002/08/22 13:39:42	1.56
@@ -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.56 2002/08/22 13:39:42 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -885,52 +885,6 @@ sub keyword {
     return exists($Keywords{$word});
 }
 
-###################################################
-#         Old code, to be removed soon            #
-###################################################
-# -------------------------------------------------------- Return related words
-#sub related {
-#    my $newword=shift;
-#    $newword=~s/\W//g;
-#    $newword=~tr/A-Z/a-z/;
-#    my $tindex=$theindex{$newword};
-#    if ($tindex) {
-#        my %found=();
-#        foreach (split(/\,/,$therelated[$tindex])) {
-## - Related word found
-#            my ($ridx,$rcount)=split(/\:/,$_);
-## - Direct relation index
-#            my $directrel=$rcount/$thecount[$tindex];
-#            if ($directrel>$thethreshold) {
-#               foreach (split(/\,/,$therelated[$ridx])) {
-#                  my ($rridx,$rrcount)=split(/\:/,$_);
-#                  if ($rridx==$tindex) {
-## - Determine reverse relation index
-#                     my $revrel=$rrcount/$thecount[$ridx];
-## - Calculate full index
-#                     $found{$ridx}=$directrel*$revrel;
-#                     if ($found{$ridx}>$thethreshold) {
-#                        foreach (split(/\,/,$therelated[$ridx])) {
-#                            my ($rrridx,$rrrcount)=split(/\:/,$_);
-#                            unless ($found{$rrridx}) {
-#                               my $revrevrel=$rrrcount/$thecount[$ridx];
-#                               if (
-#                          $directrel*$revrel*$revrevrel>$thethreshold
-#                               ) {
-#                                  $found{$rrridx}=
-#                                       $directrel*$revrel*$revrevrel;
-#                               }
-#                            }
-#                        }
-#                     }
-#                  }
-#               }
-#            }
-#        }
-#    }
-#    return ();
-#}
-
 ###############################################################
 
 =pod 
@@ -947,7 +901,6 @@ Uses global $thesaurus_db_file.
 =cut
 
 ###############################################################
-
 sub get_related_words {
     my $keyword = shift;
     my %thesaurus_db;
@@ -1195,7 +1148,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 +1180,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
 }
@@ -1345,6 +1323,8 @@ sub upfile_store {
     return $datatoken;
 }
 
+=pod
+
 =item load_tmp_file($r)
 
 Load uploaded file from tmp, $r should be the HTTP Request object,
@@ -1366,6 +1346,8 @@ sub load_tmp_file {
     $ENV{'form.upfile'}=join('',@studentdata);
 }
 
+=pod
+
 =item upfile_record_sep()
 
 Separate uploaded file into records
@@ -1381,6 +1363,8 @@ sub upfile_record_sep {
     }
 }
 
+=pod
+
 =item record_sep($record)
 
 Separate a record into fields $record should be an item from the upfile_record_sep(), needs $ENV{'form.upfiletype'}
@@ -1431,6 +1415,8 @@ sub record_sep {
     return %components;
 }
 
+=pod
+
 =item upfile_select_html()
 
 return HTML code to select file and specify its type
@@ -1449,6 +1435,8 @@ sub upfile_select_html {
 ENDUPFORM
 }
 
+=pod
+
 =item csv_print_samples($r,$records)
 
 Prints a table of sample values from each column uploaded $r is an
@@ -1479,6 +1467,8 @@ sub csv_print_samples {
     $r->print('</tr></table><br />'."\n");
 }
 
+=pod
+
 =item csv_print_select_table($r,$records,$d)
 
 Prints a table to create associations between values and table columns.
@@ -1511,6 +1501,8 @@ sub csv_print_select_table {
     return $i;
 }
 
+=pod
+
 =item csv_samples_select_table($r,$records,$d)
 
 Prints a table of sample values from the upload and can make associate samples to internal names.