--- loncom/auth/lonroles.pm	2003/03/19 22:22:18	1.46.2.2
+++ loncom/auth/lonroles.pm	2002/12/26 15:38:54	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.46.2.2 2003/03/19 22:22:18 albertel Exp $
+# $Id: lonroles.pm,v 1.47 2002/12/26 15:38:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -250,6 +250,7 @@ ENDHEADER
             my $tstatus='is';
             my $tpstart=' ';
             my $tpend=' ';
+            my $tfont='#000000';
             if ($tstart) {
 		if ($tstart>$then) { 
                     $tstatus='future';
@@ -273,6 +274,7 @@ ENDHEADER
                 ($ENV{'form.showall'})) {
                 if ($tstatus eq 'is') {
                     $tbg='#77FF77';
+                    $tfont='#003300';
                 } elsif ($tstatus eq 'future') {
                     $tbg='#FFFF77';
                 } elsif ($tstatus eq 'will') {
@@ -280,11 +282,13 @@ ENDHEADER
                     $tremark.='Active at next login. ';
                 } elsif ($tstatus eq 'expired') {
                     $tbg='#FF7777';
+                    $tfont='#330000';
                 } elsif ($tstatus eq 'will_not') {
                     $tbg='#AAFF77';
                     $tremark.='Expired after logout. ';
                 } elsif ($tstatus eq 'selected') {
                     $tbg='#11CC55';
+                    $tfont='#002200';
                     $tremark.='Currently selected. ';
                 }
                 my $trole;
@@ -328,18 +332,16 @@ ENDHEADER
                     if ($ENV{'course.'.$tcourseid.'.description'}) {
                         $twhere=$ENV{'course.'.$tcourseid.'.description'};
                         unless ($twhere eq 'Currently not available') {
-                           $twhere.=' <font size="-2">'.
-        &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom).
-                                    '</font>';
+                           $twhere=
+             &Apache::loncommon::syllabuswrapper($twhere,$trest,$tdom,$tfont);
 		       }
                     } else {
                         my %newhash=Apache::lonnet::coursedescription
                             ($tcourseid);
                         if (%newhash) {
-                            $twhere=$newhash{'description'}.
-                              ' <font size="-2">'.
-        &Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom).
-                              '</font>';
+                            $twhere=
+&Apache::loncommon::syllabuswrapper($newhash{'description'},$trest,$tdom,
+                            $tfont);
                         } else {
                             $twhere='Currently not available';
                             $ENV{'course.'.$tcourseid.'.description'}=$twhere;
@@ -370,17 +372,22 @@ ENDHEADER
                         $r->print('<td>&nbsp;</td>');
                     }
                 }
-            $r->print('<td>'.$trole.'</td><td>'.
-		      $ttype.'</td><td>'.$twhere.'</td><td>'.$tpstart.
-                      '</td><td>'.$tpend.
-                      '</td><td>'.$tremark.'&nbsp;</td></tr>'."\n");
+            $r->print('<td><font color="'.$tfont.'">'.$trole.
+                      '</font></td><td><font color="'.$tfont.'">'.$ttype.
+                      '</font></td><td><font color="'.$tfont.'">'.$twhere.
+                      '</font></td><td><font color="'.$tfont.'">'.$tpstart.
+                      '</font></td><td><font color="'.$tfont.'">'.$tpend.
+                      '</font></td><td><font color="'.$tfont.'">'.$tremark.
+                      '&nbsp;</font></td></tr>'."\n");
 	}
         }
     }
     my $tremark='';
+    my $tfont='#003300';
     if ($ENV{'request.role'} eq 'cm') {
 	$r->print('<tr bgcolor="#11CC55">');
         $tremark='Currently selected.';
+        $tfont='#002200';
     } else {
         $r->print('<tr bgcolor="#77FF77">');
     }
@@ -391,8 +398,9 @@ ENDHEADER
           $r->print('<td>&nbsp;</td>');
        }
     }
-    $r->print('<td colspan=5>No role specified'.
-                      '</td><td>'.$tremark.'&nbsp;</td></tr>'."\n");
+    $r->print('<td colspan=5><font color="'.$tfont.'">No role specified'.
+      '</font></td><td><font color="'.$tfont.'">'.$tremark.
+      '&nbsp;</font></td></tr>'."\n");
 
     $r->print('</table>');
     unless ($nochoose) {