--- loncom/auth/lonroles.pm 2006/12/05 02:55:56 1.172
+++ loncom/auth/lonroles.pm 2006/12/11 21:56:53 1.173
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.172 2006/12/05 02:55:56 albertel Exp $
+# $Id: lonroles.pm,v 1.173 2006/12/11 21:56:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -639,14 +639,14 @@ ENDHEADER
# More than one possible role
# ----------------------------------------------------------------------- Table
unless (($advanced) || ($nochoose)) {
- $r->print("
".&mt('Select a Course/Group to Enter')."
\n");
+ $r->print("".&mt('Select a Course to Enter')."
\n");
}
$r->print('
');
unless ($nochoose) { $r->print(' | '); }
$r->print(''.&mt('User Role').' | '.&mt('Extent').
' | '.&mt('Start').' | '.&mt('End').' |
'."\n");
my $doheaders=-1;
- foreach my $type ('Domain','Construction Space','Course','Group','Unavailable','System') {
+ foreach my $type ('Domain','Construction Space','Course','Unavailable','System') {
my $haverole=0;
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) {
@@ -686,7 +686,7 @@ ENDHEADER
$r->print(&coursepick_jscript());
$r->print(&Apache::loncommon::coursebrowser_javascript());
}
- foreach my $type ('Construction Space','Domain','Course','Group','Unavailable','System') {
+ foreach my $type ('Construction Space','Domain','Course','Unavailable','System') {
my $output;
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) {
@@ -912,7 +912,7 @@ sub courselink {
my $courseform=&Apache::loncommon::selectcourse_link
('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
- $dcdom,$dcdom,undef,$selecttype);
+ $dcdom,$dcdom,undef);
my $hiddenitems = ''.
''.
''.
@@ -1018,13 +1018,11 @@ sub allcourses_row {
my ($dcdom,$rowtype) = @_;
my $output = ''.
' ';
- foreach my $type ('Course','Group') {
- my $selectlink = &courselink($dcdom,$rowtype,$type);
- my $ccrole = &Apache::lonnet::plaintext('cc',$type);
- $output.= ''.$ccrole.''.
+ my $selectlink = &courselink($dcdom,$rowtype);
+ my $ccrole = &Apache::lonnet::plaintext('cc');
+ $output.= ''.$ccrole.''.
' '.$selectlink.''.
' from '.&mt('Domain').' '.$dcdom.' ';
- }
$output .= ' |
|
'."\n";
return $output;
}