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.7

version 1.244.2.2, 2009/08/13 13:28:51	version 1.244.2.7, 2009/08/23 13:22:16
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 645 if(length($annotation) > 0){	Line 647 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'}) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
Line 750 ENDREGTEXT	Line 759 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 795 var swmenu=null;
}	}

// END LON-CAPA Internal	// END LON-CAPA Internal
	// ]]>
</script>	</script>
ENDREGTHIS	ENDREGTHIS
}	}
Line 800 ENDDONOTREGTEXT	Line 811 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 836 var swmenu=null;
}	}

// END LON-CAPA Internal	// END LON-CAPA Internal
	// ]]>
</script>	</script>
ENDDONOTREGTHIS	ENDDONOTREGTHIS
}	}
Line 895 sub startupremote {	Line 908 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 958 function main() {
timestart=date.getTime();	timestart=date.getTime();
wait();	wait();
}	}
	// ]]>
</script>	</script>
ENDREMOTESTARTUP	ENDREMOTESTARTUP
}	}
Line 952 ENDREMOTESTARTUP	Line 966 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 979 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 1026 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 1044 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 1193 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 1297 sub rawconfig {	Line 1321 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'},
$type,undef,'requestcourses')) {
$showreqcrs = 1;
last;
}
}	}
	if (($prt eq 'reqcrsshc') && (!$show_course)) {
	next;
	}
	my $showreqcrs = &check_for_rcrs();
if (!$showreqcrs) {	if (!$showreqcrs) {
$output.=&clear($row,$col);	$output.=&clear($row,$col);
next;	next;
Line 1329 sub rawconfig {	Line 1351 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 1381 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 1391 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
}	}

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

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