loncom/auth/lonroles.pm - diff

Return to lonroles.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonroles.pm between versions 1.162.2.3 and 1.164

version 1.162.2.3, 2006/10/10 01:55:33	version 1.164, 2006/08/31 13:25:18
Line 485 ENDHEADER	Line 485 ENDHEADER
$tstatus='selected';	$tstatus='selected';
}	}
my $tbg;	my $tbg;
if (($tstatus eq 'is') \|\| ($tstatus eq 'selected') \|\|	if (($tstatus eq 'is')
($env{'form.showall'})) {	\|\| ($tstatus eq 'selected')
	\|\| ($tstatus eq 'will')
	\|\| ($tstatus eq 'future')
	\|\| ($env{'form.showall'})) {
if ($tstatus eq 'is') {	if ($tstatus eq 'is') {
$tbg='#77FF77';	$tbg='#77FF77';
$tfont='#003300';	$tfont='#003300';
Line 635 ENDHEADER	Line 638 ENDHEADER
# More than one possible role	# More than one possible role
# ----------------------------------------------------------------------- Table	# ----------------------------------------------------------------------- Table
unless (($advanced) \|\| ($nochoose)) {	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>');	$r->print('<br /><table><tr>');
unless ($nochoose) { $r->print('<th> </th>'); }	unless ($nochoose) { $r->print('<th> </th>'); }
Line 831 sub build_roletext {	Line 834 sub build_roletext {
$roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.	$roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
$switchserver.'">'.&mt('Switch Server').'</a></td>';	$switchserver.'">'.&mt('Switch Server').'</a></td>';
} else {	} else {
$roletext.=('<td> </td>');	$roletext.=('<td'.$rowspan.'> </td>');
}	}
} elsif ($tstatus eq 'is') {	} elsif ($tstatus eq 'is') {
$roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.	$roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
Line 851 sub build_roletext {	Line 854 sub build_roletext {
$roletext.='<td'.$rowspan.'> </td>';	$roletext.='<td'.$rowspan.'> </td>';
}	}
}	}
if ($trolecode !~ m/^(dc\|ca\|au\|aa)\./) {	$tremark.=&Apache::lonannounce::showday(time,1,
$tremark.=&Apache::lonannounce::showday(time,1,	&Apache::lonannounce::readcalendar($tdom.'_'.$trest));
&Apache::lonannounce::readcalendar($tdom.'_'.$trest));
}
$roletext.='<td><font color="'.$tfont.'">'.$trole.	$roletext.='<td><font color="'.$tfont.'">'.$trole.
'</font></td><td><font color="'.$tfont.'">'.$twhere.	'</font></td><td><font color="'.$tfont.'">'.$twhere.
'</font></td><td><font color="'.$tfont.'">'.$tpstart.	'</font></td><td><font color="'.$tfont.'">'.$tpstart.
Line 1013 sub allcourses_row {	Line 1015 sub allcourses_row {
my ($dcdom,$rowtype) = @_;	my ($dcdom,$rowtype) = @_;
my $output = '<tr bgcolor="#77FF77">'.	my $output = '<tr bgcolor="#77FF77">'.
' <td colspan="5">';	' <td colspan="5">';
foreach my $type ('Course') {	foreach my $type ('Course','Group') {
my $selectlink = &courselink($dcdom,$rowtype,$type);	my $selectlink = &courselink($dcdom,$rowtype,$type);
my $ccrole = &Apache::lonnet::plaintext('cc',$type);	my $ccrole = &Apache::lonnet::plaintext('cc',$type);
$output.= '<font color="#002200">'.$ccrole.'</font>'.	$output.= '<font color="#002200">'.$ccrole.'</font>'.

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.162.2.3
changed lines
	Added in v.1.164