--- loncom/auth/lonroles.pm	2006/10/10 01:55:33	1.162.2.3
+++ loncom/auth/lonroles.pm	2006/07/14 17:05:02	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.162.2.3 2006/10/10 01:55:33 albertel Exp $
+# $Id: lonroles.pm,v 1.163 2006/07/14 17:05:02 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -635,7 +635,7 @@ ENDHEADER
 # More than one possible role
 # ----------------------------------------------------------------------- Table
     unless (($advanced) || ($nochoose)) {
-	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
+	$r->print("<h2>".&mt('Select a Course/Group to Enter')."</h2>\n");
     }
     $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
@@ -851,10 +851,9 @@ sub build_roletext {
             $roletext.='<td'.$rowspan.'>&nbsp;</td>';
         }
     }
-    if ($trolecode !~ m/^(dc|ca|au|aa)\./) {
-	$tremark.=&Apache::lonannounce::showday(time,1,
-			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
-    }
+    $tremark.=&Apache::lonannounce::showday(time,1,
+                 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
+
     $roletext.='<td><font color="'.$tfont.'">'.$trole.
 	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                '</font></td><td><font color="'.$tfont.'">'.$tpstart.
@@ -1013,7 +1012,7 @@ sub allcourses_row {
     my ($dcdom,$rowtype) = @_;
     my $output = '<tr bgcolor="#77FF77">'.
                  ' <td colspan="5">';
-    foreach my $type ('Course') {
+    foreach my $type ('Course','Group') {
         my $selectlink = &courselink($dcdom,$rowtype,$type);
         my $ccrole = &Apache::lonnet::plaintext('cc',$type);
         $output.= '<font color="#002200">'.$ccrole.'</font>'.