--- loncom/auth/lonroles.pm	2006/06/22 23:22:47	1.158
+++ loncom/auth/lonroles.pm	2006/10/10 01:55:33	1.162.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.158 2006/06/22 23:22:47 albertel Exp $
+# $Id: lonroles.pm,v 1.162.2.3 2006/10/10 01:55:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -266,15 +266,14 @@ ENDENTERKEY
 			    }
 			    return OK;
 			} else {
-                            my $type = 'Course/Group';
 			    if (!$env{'request.course.id'}) {
-				$type = &Apache::loncommon::course_type();
 				&Apache::lonnet::appenv(
 				      "request.course.id"  => $cdom.'_'.$cnum);
 				$furl='/adm/roles?tryagain=1';
 				$msg=
 				    '<h1><span class="LC_error">'.
-				    &mt('Could not initialize '.lc($type).' at this time.').
+				    &mt('Could not initialize [_1] at this time.',
+					$env{'course.'.$cdom.'_'.$cnum.'.description'}).
 				    '</span></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
 			    }
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
@@ -303,7 +302,8 @@ ENDENTERKEY
 					) {
 					my $startpage = &courseloadpage($courseid);
 					unless ($startpage eq 'firstres') {         
-					    $msg = &mt('Entering '.lc($type).' ....');
+					    $msg = &mt('Entering [_1] ....',
+						       $env{'course.'.$courseid.'.description'});
 					    &redirect_user($r,&mt('New in course'),
 							   '/adm/whatsnew?refpage=start',$msg,
 							   $env{'environment.remotenavmap'});
@@ -316,8 +316,10 @@ ENDENTERKEY
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
-                                $msg = &mt('Entering '.lc($type).' ...');
-				&redirect_user($r,&mt('Entering '.$type),
+                                $msg = &mt('Entering [_1] ...',
+					   $env{'course.'.$courseid.'.description'});
+				&redirect_user($r,&mt('Entering [_1]',
+						      $env{'course.'.$courseid.'.description'}),
 					       $furl,$msg,
 					       $env{'environment.remotenavmap'});
 			    }
@@ -362,10 +364,10 @@ ENDENTERKEY
     my $start_page=&Apache::loncommon::start_page('User Roles');
     my $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
-    my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'</td></td></tr></table>';
+
     $r->print(<<ENDHEADER);
 $start_page
-$helptag<br />
+<br />
 <script>
 $swinfo
 window.focus();
@@ -516,10 +518,8 @@ ENDHEADER
 		    if ($tremark) { $tremark.='<br />'; }
                     $tremark.=&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
-                    $trole=$rrole;
-                } else {
-                    $trole=Apache::lonnet::plaintext($role);
-                }
+		}
+		$trole=Apache::lonnet::plaintext($role);
                 my $ttype;
                 my $twhere;
                 my ($tdom,$trest,$tsection)=
@@ -635,7 +635,7 @@ ENDHEADER
 # More than one possible role
 # ----------------------------------------------------------------------- Table
     unless (($advanced) || ($nochoose)) {
-	$r->print("<h2>".&mt('Select a Course/Group to Enter')."</h2>\n");
+	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
     $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
@@ -851,9 +851,10 @@ sub build_roletext {
             $roletext.='<td'.$rowspan.'>&nbsp;</td>';
         }
     }
-    $tremark.=&Apache::lonannounce::showday(time,1,
-                 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
-
+    if ($trolecode !~ m/^(dc|ca|au|aa)\./) {
+	$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.
@@ -1012,7 +1013,7 @@ sub allcourses_row {
     my ($dcdom,$rowtype) = @_;
     my $output = '<tr bgcolor="#77FF77">'.
                  ' <td colspan="5">';
-    foreach my $type ('Course','Group') {
+    foreach my $type ('Course') {
         my $selectlink = &courselink($dcdom,$rowtype,$type);
         my $ccrole = &Apache::lonnet::plaintext('cc',$type);
         $output.= '<font color="#002200">'.$ccrole.'</font>'.