loncom/interface/lonmenu.pm - diff

Return to lonmenu.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmenu.pm between versions 1.244.2.2 and 1.244.2.13

version 1.244.2.2, 2009/08/13 13:28:51	version 1.244.2.13, 2010/01/18 21:58:59
Line 120 The javascript is usually similar to "go	Line 120 The javascript is usually similar to "go

=item get_nav_status()	=item get_nav_status()

=item convert_menu_function()

FIXME this needs to move into mydesktab and the other locations
the text is generated

=item hidden_button_check()	=item hidden_button_check()

=item roles_selector()	=item roles_selector()
Line 144 use Apache::loncommon();	Line 139 use Apache::loncommon();
use Apache::lonenc();	use Apache::lonenc();
use Apache::lonlocal;	use Apache::lonlocal;
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
	use HTML::Entities();

use vars qw(@desklines %category_names %category_members %category_positions $readdesk);	use vars qw(@desklines %category_names %category_members %category_positions $readdesk);

Line 178 sub initlittle {	Line 174 sub initlittle {
'login' => 'Log In',	'login' => 'Log In',
'launch' => 'Launch Remote Control',	'launch' => 'Launch Remote Control',
'groups' => 'Groups',	'groups' => 'Groups',
'gdoc' => 'Group Documents',	'gdoc' => 'Community Documents',
);	);
}	}

Line 246 ENDNAV	Line 242 ENDNAV
<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>	<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
ENDRELOAD	ENDRELOAD
}	}
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {	my $is_community =
$docs=(<<ENDDOCS);	(&Apache::loncommon::course_type() eq 'Community');
<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>	if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
	my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
	$docs=(<<ENDDOCS);
	<a href="/adm/coursedocs" target="_top">$text</a>
ENDDOCS	ENDDOCS
}	}
if ($showgroups) {	if ($showgroups) {
Line 313 ENDINLINEMENU	Line 312 ENDINLINEMENU
$navmaps=(<<ENDNAV);	$navmaps=(<<ENDNAV);
<td><a href="$link" target="_top">$lt{'nav'}</a></td>	<td><a href="$link" target="_top">$lt{'nav'}</a></td>
ENDNAV	ENDNAV
my $is_group = (&Apache::loncommon::course_type() eq 'Group');	my $is_community =
	(&Apache::loncommon::course_type() eq 'Community');
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};	my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
$docs=(<<ENDDOCS);	$docs=(<<ENDDOCS);
<td><a href="/adm/coursedocs" target="_top">$text</a></td>	<td><a href="/adm/coursedocs" target="_top">$text</a></td>
ENDDOCS	ENDDOCS
Line 351 ENDCRELOAD	Line 351 ENDCRELOAD
my $helplink=&Apache::loncommon::top_nav_help('Help');	my $helplink=&Apache::loncommon::top_nav_help('Help');
return (<<ENDINLINEMENU);	return (<<ENDINLINEMENU);
<script type="text/javascript">	<script type="text/javascript">
// BEGIN LON-CAPA Internal
// <![CDATA[	// <![CDATA[
	// BEGIN LON-CAPA Internal
$utility	$utility
// ]]>	// ]]>
</script>	</script>
Line 409 sub registerurl {	Line 409 sub registerurl {
&unescape($env{'request.noversionuri'})))) &&	&unescape($env{'request.noversionuri'})))) &&
(!$forcereg))) {	(!$forcereg))) {
return $result.	return $result.
'<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;	'<script type="text/javascript">'."\n".
	'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n".
	'</script>'.$force_title;
}	}
# Graphical display after login only	# Graphical display after login only
if ($env{'request.registered'} && !$forcereg) { return ''; }	if ($env{'request.registered'} && !$forcereg) { return ''; }
Line 574 sub innerregister {	Line 576 sub innerregister {
}	}
# Finally, turn the button on or off	# Finally, turn the button on or off
if ($cfile && !$const_space) {	if ($cfile && !$const_space) {
$editbutton=&switch	my $nocrsedit;
('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',	# Suppress display where CC has switched to student role.
	if ($env{'request.course.id'}) {
	unless(&Apache::lonnet::allowed('mdc',
	$env{'request.course.id'})) {
	$nocrsedit = 1;
	}
	}
	if ($nocrsedit) {
	$editbutton=&clear(6,1);
	} else {
	$editbutton=&switch
	('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
"go('".$cfile."');","Edit this resource");	"go('".$cfile."');","Edit this resource");
$noeditbutton = 0;	$noeditbutton = 0;
	}
} elsif ($editbutton eq '') {	} elsif ($editbutton eq '') {
$editbutton=&clear(6,1);	$editbutton=&clear(6,1);
}	}
Line 645 if(length($annotation) > 0){	Line 659 if(length($annotation) > 0){
$menuitems.="&anno-[_1]&tations[_1]&annotate()&";	$menuitems.="&anno-[_1]&tations[_1]&annotate()&";
$menuitems.="Make notes and annotations about this resource&&1\n";	$menuitems.="Make notes and annotations about this resource&&1\n";

	unless ($noremote) {
	my $showreqcrs = &check_for_rcrs();
	if ($showreqcrs) {
	$menuitems.="s&8&1&rcrs.gif&request[_1]&course[_16]".
	"&go('/adm/requestcourse')&Course requests\n";
	}
	}
unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme)(\?\|$)/) {	unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme)(\?\|$)/) {
if (!$env{'request.enc'}) {	if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata	s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata
ENDREALRES	ENDREALRES
Line 750 ENDREGTEXT	Line 771 ENDREGTEXT
$result = (<<ENDREGTHIS);	$result = (<<ENDREGTHIS);

<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
// BEGIN LON-CAPA Internal	// BEGIN LON-CAPA Internal
var swmenu=null;	var swmenu=null;

Line 785 var swmenu=null;	Line 807 var swmenu=null;
}	}

// END LON-CAPA Internal	// END LON-CAPA Internal
	// ]]>
</script>	</script>
ENDREGTHIS	ENDREGTHIS
}	}
Line 800 ENDDONOTREGTEXT	Line 823 ENDDONOTREGTEXT
$result = (<<ENDDONOTREGTHIS);	$result = (<<ENDDONOTREGTHIS);

<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
// BEGIN LON-CAPA Internal	// BEGIN LON-CAPA Internal
var swmenu=null;	var swmenu=null;

Line 824 var swmenu=null;	Line 848 var swmenu=null;
}	}

// END LON-CAPA Internal	// END LON-CAPA Internal
	// ]]>
</script>	</script>
ENDDONOTREGTHIS	ENDDONOTREGTHIS
}	}
Line 895 sub startupremote {	Line 920 sub startupremote {
my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');	my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
return(<<ENDREMOTESTARTUP);	return(<<ENDREMOTESTARTUP);
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
var timestart;	var timestart;
function wheelswitch() {	function wheelswitch() {
if (typeof(document.wheel) != 'undefined') {	if (typeof(document.wheel) != 'undefined') {
Line 944 function main() {	Line 970 function main() {
timestart=date.getTime();	timestart=date.getTime();
wait();	wait();
}	}
	// ]]>
</script>	</script>
ENDREMOTESTARTUP	ENDREMOTESTARTUP
}	}
Line 952 ENDREMOTESTARTUP	Line 978 ENDREMOTESTARTUP
sub setflags() {	sub setflags() {
return(<<ENDSETFLAGS);	return(<<ENDSETFLAGS);
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
menuloaded=0;	menuloaded=0;
tim=0;	tim=0;
	// ]]>
</script>	</script>
ENDSETFLAGS	ENDSETFLAGS
}	}
Line 963 sub maincall() {	Line 991 sub maincall() {
($env{'environment.remote'} eq 'off')) { return ''; }	($env{'environment.remote'} eq 'off')) { return ''; }
return(<<ENDMAINCALL);	return(<<ENDMAINCALL);
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
main();	main();
	// ]]>
</script>	</script>
ENDMAINCALL	ENDMAINCALL
}	}
Line 1008 sub open {	Line 1038 sub open {
my $returnval='';	my $returnval='';
if (($env{'browser.interface'} eq 'textual') \|\|	if (($env{'browser.interface'} eq 'textual') \|\|
($env{'environment.remote'} eq 'off')) {	($env{'environment.remote'} eq 'off')) {
return '<script type="text/javascript">self.name="loncapaclient";</script>';	return
	'<script type="text/javascript">'."\n".
	'// <![CDATA['."\n".
	'self.name="loncapaclient";'."\n".
	'// ]]>'."\n".
	'</script>';
}	}
my $menuname = &get_menu_name();	my $menuname = &get_menu_name();

Line 1021 sub open {	Line 1056 sub open {
#}	#}
#ENDRESIZE	#ENDRESIZE
# }	# }
$returnval.=(<<ENDOPEN);	$returnval=(<<ENDOPEN);
	// <![CDATA[
window.status='Opening LON-CAPA Remote Control';	window.status='Opening LON-CAPA Remote Control';
var menu=window.open("/res/adm/pages/menu.html","$menuname",	var menu=window.open("/res/adm/pages/menu.html","$menuname",
"height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");	"height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
self.name='loncapaclient';	self.name='loncapaclient';
	// ]]>
ENDOPEN	ENDOPEN
return '<script type="text/javascript">'.$returnval.'</script>';	return '<script type="text/javascript">'.$returnval.'</script>';
}	}
Line 1168 sub inlinemenu {	Line 1205 sub inlinemenu {
}	}
foreach my $item (sort(keys(%active))) {	foreach my $item (sort(keys(%active))) {
$output.=$inlineremote[$item];	$output.=$inlineremote[$item];
&Apache::lonnet::logthis("item=$item output=$inlineremote[$item]");
}	}
$output.='</table>';	$output.='</table>';
$output.='</fieldset>';	$output.='</fieldset>';
Line 1197 sub rawconfig {	Line 1233 sub rawconfig {
my $show_course=&Apache::loncommon::show_course();	my $show_course=&Apache::loncommon::show_course();
my $author=$env{'user.author'};	my $author=$env{'user.author'};
my $crs='';	my $crs='';
	my $crstype='';
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
$crs='/'.$env{'request.course.id'};	$crs='/'.$env{'request.course.id'};
if ($env{'request.course.sec'}) {	if ($env{'request.course.sec'}) {
$crs.='_'.$env{'request.course.sec'};	$crs.='_'.$env{'request.course.sec'};
}	}
$crs=~s/\_/\//g;	$crs=~s/\_/\//g;
	$crstype = &Apache::loncommon::course_type();
}	}
my $pub=($env{'request.state'} eq 'published');	my $pub=($env{'request.state'} eq 'published');
my $con=($env{'request.state'} eq 'construct');	my $con=($env{'request.state'} eq 'construct');
Line 1212 sub rawconfig {	Line 1250 sub rawconfig {
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);	my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);
$prt=~s/\$uname/$uname/g;	$prt=~s/\$uname/$uname/g;
$prt=~s/\$udom/$udom/g;	$prt=~s/\$udom/$udom/g;
$prt=~s/\$crs/$crs/g;	$prt=~s/\$crs/$crs/g;
	if ($prt =~ /\$crs/) {
	next unless ($env{'request.course.id'});
	next if ($crstype eq 'Community');
	$prt=~s/\$crs/$crs/g;
	} elsif ($prt =~ /\$cmty/) {
	next unless ($env{'request.course.id'});
	next if ($crstype ne 'Community');
	$prt=~s/\$cmty/$crs/g;
	}
$prt=~s/\$requested_domain/$requested_domain/g;	$prt=~s/\$requested_domain/$requested_domain/g;
if ($category_names{$cat}!~/\w/) { $cat='oth'; }	if ($category_names{$cat}!~/\w/) { $cat='oth'; }
my $type = &Apache::loncommon::course_type();
if ($type eq 'Group') {
$desc = &convert_menu_function($desc,$type);
}
if ($pro eq 'clear') {	if ($pro eq 'clear') {
$output.=&clear($row,$col);	$output.=&clear($row,$col);
} elsif ($pro eq 'any') {	} elsif ($pro eq 'any') {
Line 1245 sub rawconfig {	Line 1288 sub rawconfig {
$uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);	$uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
}	}
} elsif (($pro=~/^p(\w+)/) && ($prt)) {	} elsif (($pro=~/^p(\w+)/) && ($prt)) {
if (&Apache::lonnet::allowed($1,$prt)) {	my $priv = $1;
	if ($priv =~ /^mdc(Course\|Community)/) {
	if ($crstype eq $1) {
	$priv = 'mdc';
	} else {
	next;
	}
	}
	if (&Apache::lonnet::allowed($priv,$prt)) {
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);	$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
}	}
} elsif ($pro eq 'course') {	} elsif ($pro eq 'course') {
if ($env{'request.course.fn'}) {	if (($env{'request.course.fn'}) && ($crstype ne 'Community')) {
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);	$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
}	}
	} elsif ($pro eq 'community') {
	if (($env{'request.course.fn'}) && ($crstype eq 'Community')) {
	$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
	}
} elsif ($pro =~ /^courseenv_(.*)$/) {	} elsif ($pro =~ /^courseenv_(.*)$/) {
my $key = $1;	my $key = $1;
if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) {	if ($crstype ne 'Community') {
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);	my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key};
	if ($key eq 'canuse_pdfforms') {
	if ($env{'request.course.id'} && $coursepref eq '') {
	my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
	$coursepref = $domdefs{'canuse_pdfforms'};
	}
	}
	if ($coursepref) {
	$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
	}
	}
	} elsif ($pro =~ /^communityenv_(.*)$/) {
	my $key = $1;
	if ($crstype eq 'Community') {
	my $coursepref = $env{'course.'.$env{'request.course.id'}.'.'.$key};
	if ($key eq 'canuse_pdfforms') {
	if ($env{'request.course.id'} && $coursepref eq '') {
	my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
	$coursepref = $domdefs{'canuse_pdfforms'};
	}
	}
	if ($coursepref) {
	$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
	}
}	}
} elsif ($pro =~ /^course_(.*)$/) {	} elsif ($pro =~ /^course_(.*)$/) {
# Check for permissions inside of a course	# Check for permissions inside of a course
if (($env{'request.course.id'}) &&	if (($env{'request.course.id'}) && ($crstype ne 'Community') &&
(&Apache::lonnet::allowed($1,$env{'request.course.id'}.	(&Apache::lonnet::allowed($1,$env{'request.course.id'}.
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))	($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
)) {	)) {
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);	$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
}	}
	} elsif ($pro =~ /^community_(.*)$/) {
	# Check for permissions inside of a community
	if (($env{'request.course.id'}) && ($crstype eq 'Community') &&
	(&Apache::lonnet::allowed($1,$env{'request.course.id'}.
	($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
	)) {
	$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat);
	}
} elsif ($pro eq 'author') {	} elsif ($pro eq 'author') {
if ($author) {	if ($author) {
if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) \|\|	if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) \|\|
Line 1297 sub rawconfig {	Line 1383 sub rawconfig {
$output.=&clear($row,$col);	$output.=&clear($row,$col);
next;	next;
}	}
} elsif ($prt eq 'reqcrs') {	} elsif (($prt eq 'reqcrsnsc') \|\| ($prt eq 'reqcrsshc')) {
my $showreqcrs = 0;	if (($prt eq 'reqcrsnsc') && ($show_course)) {
foreach my $type ('official','unofficial') {	next;
if (&Apache::lonnet::usertools_access($env{'user.name'},	}
$env{'user.domain'},	if (($prt eq 'reqcrsshc') && (!$show_course)) {
$type,undef,'requestcourses')) {	next;
$showreqcrs = 1;
last;
}
}	}
	my $showreqcrs = &check_for_rcrs();
if (!$showreqcrs) {	if (!$showreqcrs) {
$output.=&clear($row,$col);	$output.=&clear($row,$col);
next;	next;
Line 1329 sub rawconfig {	Line 1413 sub rawconfig {
return $output;	return $output;
}	}

	sub check_for_rcrs {
	my $showreqcrs = 0;
	my @reqtypes = ('official','unofficial','community');
	foreach my $type (@reqtypes) {
	if (&Apache::lonnet::usertools_access($env{'user.name'},
	$env{'user.domain'},
	$type,undef,'requestcourses')) {
	$showreqcrs = 1;
	last;
	}
	}
	if (!$showreqcrs) {
	foreach my $type (@reqtypes) {
	if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
	$showreqcrs = 1;
	last;
	}
	}
	}
	return $showreqcrs;
	}

# ======================================================================= Close	# ======================================================================= Close

sub close {	sub close {
Line 1337 sub close {	Line 1443 sub close {
my $menuname = &get_menu_name();	my $menuname = &get_menu_name();
return(<<ENDCLOSE);	return(<<ENDCLOSE);
<script type="text/javascript">	<script type="text/javascript">
	// <![CDATA[
window.status='Accessing Remote Control';	window.status='Accessing Remote Control';
menu=window.open("/adm/rat/empty.html","$menuname",	menu=window.open("/adm/rat/empty.html","$menuname",
"height=350,width=150,scrollbars=no,menubar=no");	"height=350,width=150,scrollbars=no,menubar=no");
Line 1346 menu.autologout=0;	Line 1453 menu.autologout=0;
window.status='Closing Remote Control';	window.status='Closing Remote Control';
menu.close();	menu.close();
window.status='Done.';	window.status='Done.';
	// ]]>
</script>	</script>
ENDCLOSE	ENDCLOSE
}	}
Line 1378 sub utilityfunctions {	Line 1486 sub utilityfunctions {
unless (($env{'browser.interface'} eq 'textual') \|\|	unless (($env{'browser.interface'} eq 'textual') \|\|
($env{'environment.remote'} eq 'off') \|\| ($caller eq '/adm/menu')) { return ''; }	($env{'environment.remote'} eq 'off') \|\| ($caller eq '/adm/menu')) { return ''; }
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));	my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
	if ($currenturl =~ m{^/adm/wrapper/ext/}) {
	if ($env{'request.external.querystring'}) {
	$currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'};
	}
	}
$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));	$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));

my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});	my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
Line 1589 sub get_nav_status {	Line 1702 sub get_nav_status {
return $navstatus;	return $navstatus;
}	}

#FIXME this needs to move into mydesktab and the other locations
# the text is generated
sub convert_menu_function {
my ($rolename,$type) = @_;
if ($type eq 'Group') {
$rolename =~ s/student/member/g;
$rolename =~ s/group/team/g;
$rolename =~ s/course/group/g;
$rolename =~ s/Course/Group/g;
}
return $rolename;
}

sub hidden_button_check {	sub hidden_button_check {
my $hidden;	my $hidden;
if ($env{'request.course.id'} eq '') {	if ($env{'request.course.id'} eq '') {
Line 1616 sub hidden_button_check {	Line 1716 sub hidden_button_check {

sub roles_selector {	sub roles_selector {
my ($cdom,$cnum) = @_;	my ($cdom,$cnum) = @_;
	my $crstype = &Apache::loncommon::course_type();
my $now = time;	my $now = time;
my (%courseroles,%seccount);	my (%courseroles,%seccount);
my $is_cc;	my $is_cc;
my $role_selector;	my $role_selector;
if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) {	if ($crstype eq 'Community') {
my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum});	$ccrole = 'co';
	} else {
	$ccrole = 'cc';
	}
	if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
	my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
if ((($start) && ($start<0)) \|\|	if ((($start) && ($start<0)) \|\|
(($end) && ($end<$now)) \|\|	(($end) && ($end<$now)) \|\|
(($start) && ($now<$start))) {	(($start) && ($now<$start))) {
Line 1665 sub roles_selector {	Line 1770 sub roles_selector {
}	}
}	}
}	}
my @roles_order = ('cc','in','ta','ep','ad','st');	my $switchtext;
	if ($crstype eq 'Community') {
	$switchtext = &mt('Switch community role to...')
	} else {
	$switchtext = &mt('Switch course role to...')
	}

	my @roles_order = ($ccrole,'in','ta','ep','ad','st');
if (keys(%courseroles) > 1) {	if (keys(%courseroles) > 1) {
$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles);	$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles);
$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">	$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
<select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';	<select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';
$role_selector .= '<option value="">'.&mt('Switch course role to...').'</option>';	$role_selector .= '<option value="">'.$switchtext.'</option>';
foreach my $role (@roles_order) {	foreach my $role (@roles_order) {
if (defined($courseroles{$role})) {	if (defined($courseroles{$role})) {
$role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>';	$role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>';
}	}
}	}
foreach my $role (sort(keys(%courseroles))) {	foreach my $role (sort(keys(%courseroles))) {
Line 1683 sub roles_selector {	Line 1795 sub roles_selector {
}	}
$role_selector .= '</select>'."\n".	$role_selector .= '</select>'."\n".
'<input type="hidden" name="destinationurl" value="'.	'<input type="hidden" name="destinationurl" value="'.
$ENV{'REQUEST_URI'}.'" />'."\n".	&HTML::Entities::encode($ENV{'REQUEST_URI'},'"<>&').'" />'."\n".
'<input type="hidden" name="gotorole" value="1" />'."\n".	'<input type="hidden" name="gotorole" value="1" />'."\n".
'<input type="hidden" name="selectrole" value="" />'."\n".	'<input type="hidden" name="selectrole" value="" />'."\n".
'<input type="hidden" name="switch" value="1" />'."\n".	'<input type="hidden" name="switch" value="1" />'."\n".

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

Removed from v.1.244.2.2
changed lines
	Added in v.1.244.2.13