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.111 and 1.118

version 1.111, 2004/07/23 19:09:27	version 1.118, 2004/10/28 16:25:21
Line 39	Line 39
package Apache::lonmenu;	package Apache::lonmenu;

use strict;	use strict;
use Apache::lonnet;	use Apache::lonnet();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::lonhtmlcommon();	use Apache::lonhtmlcommon();
use Apache::loncommon;	use Apache::loncommon();
	use Apache::lonnavmaps();
use Apache::lonlocal;	use Apache::lonlocal;

use vars qw(@desklines $readdesk);	use vars qw(@desklines $readdesk);
Line 68 sub menubuttons {	Line 69 sub menubuttons {
my $forcereg=shift;	my $forcereg=shift;
my $target =shift;	my $target =shift;
my $registration=shift;	my $registration=shift;
	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
	['inhibitmenu']);
	if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }

my $navmaps='';	my $navmaps='';
my $reloadlink='';	my $reloadlink='';
my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'});	my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'});
Line 91 ENDNAV	Line 96 ENDNAV
ENDRELOAD	ENDRELOAD
}	}
}	}
	my $utility=&utilityfunctions();
my $output=(<<ENDMAINMENU);	my $output=(<<ENDMAINMENU);
<script>	<script>
// BEGIN LON-CAPA Internal	// BEGIN LON-CAPA Internal
	$utility
</script>	</script>
<a href="/adm/menu" target="_top">$lt{'main'}</a>	<a href="/adm/menu" target="_top">$lt{'main'}</a>
$reloadlink $navmaps<br />	$reloadlink $navmaps<br />
Line 128 ENDMAINMENU	Line 135 ENDMAINMENU
my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);	my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
# Do we have a NAV link?	# Do we have a NAV link?
if ($ENV{'request.course.id'}) {	if ($ENV{'request.course.id'}) {
$navmaps=(<<ENDNAVREM);	$navmaps=(<<ENDNAV);
<td bgcolor="$tabbg">	<td bgcolor="$tabbg">
<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">$lt{'nav'}</font></a></td>	<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
ENDNAVREM	ENDNAV
if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&	if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&	($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg\|bulletinboard\|aboutme)(\?\|$)/)) {	($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg\|bulletinboard\|aboutme)(\?\|$)/)) {
my $escreload=&Apache::lonnet::escape('return:');	my $escreload=&Apache::lonnet::escape('return:');
Line 146 ENDRELOAD	Line 153 ENDRELOAD
if ($registration) {	if ($registration) {
$reg=&innerregister($forcereg,$target);	$reg=&innerregister($forcereg,$target);
}	}
	my $utility=&utilityfunctions();
return (<<ENDINLINEMENU);	return (<<ENDINLINEMENU);
<script>	<script>
// BEGIN LON-CAPA Internal	// BEGIN LON-CAPA Internal
	$utility
</script>	</script>
<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">	<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
<tr>	<tr>
Line 379 ENDREALRES	Line 388 ENDREALRES
}	}
if ($textual) {	if ($textual) {
# Registered, textual output	# Registered, textual output
my $utility=&utilityfunctions();
my $form=&serverform();	my $form=&serverform();
my $inlinebuttons='';	my $inlinebuttons='';

Line 398 ENDINLINE	Line 406 ENDINLINE
$result =(<<ENDREGTEXT);	$result =(<<ENDREGTEXT);
<script>	<script>
// BEGIN LON-CAPA Internal	// BEGIN LON-CAPA Internal
$utility
</script>	</script>
$timesync	$timesync
$newmail	$newmail
Line 415 ENDREGTEXT	Line 422 ENDREGTEXT
} else {	} else {
my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];	my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];
$requri=&Apache::lonnet::unescape($requri);	$requri=&Apache::lonnet::unescape($requri);
	my $navstatus=&get_nav_status();
$result = (<<ENDREGTHIS);	$result = (<<ENDREGTHIS);

<script language="JavaScript">	<script language="JavaScript">
Line 432 var swmenu=null;	Line 440 var swmenu=null;
swmenu.currentSymb="$ENV{'request.symb'}";	swmenu.currentSymb="$ENV{'request.symb'}";
swmenu.reloadSymb="$ENV{'request.symb'}";	swmenu.reloadSymb="$ENV{'request.symb'}";
swmenu.currentStale=0;	swmenu.currentStale=0;
	$navstatus
$hwkadd	$hwkadd
$editbutton	$editbutton
}	}
Line 523 sub startupremote {	Line 532 sub startupremote {
#	#
my $configmenu=&rawconfig();	my $configmenu=&rawconfig();
my $esclowerurl=&Apache::lonnet::escape($lowerurl);	my $esclowerurl=&Apache::lonnet::escape($lowerurl);
	my $message=&mt('"Waiting for remote to load "+[_1]','waited');
return(<<ENDREMOTESTARTUP);	return(<<ENDREMOTESTARTUP);
<script>	<script>
	var timestart;
function wheelswitch() {	function wheelswitch() {
	if (typeof(document.wheel) != 'undefined') {
	if (typeof(document.wheel.spin) != 'undefined') {
	var date=new Date();
	var waited=Math.round(30-((date.getTime()-timestart)/1000));
	document.wheel.spin.value=$message;
	}
	}
if (window.status=='\|') {	if (window.status=='\|') {
window.status='/';	window.status='/';
} else {	} else {
Line 564 function wait() {	Line 580 function wait() {
function main() {	function main() {
canceltim=setTimeout('tim=1;',30000);	canceltim=setTimeout('tim=1;',30000);
window.status='-';	window.status='-';
	var date=new Date();
	timestart=date.getTime();
wait();	wait();
}	}

Line 589 sub maincall() {	Line 607 sub maincall() {
</script>	</script>
ENDMAINCALL	ENDMAINCALL
}	}

	sub load_remote_msg {
	my ($lowerurl)=@_;

	if (($ENV{'browser.interface'} eq 'textual') \|\|
	($ENV{'environment.remote'} eq 'off')) { return ''; }

	my $esclowerurl=&Apache::lonnet::escape($lowerurl);
	my $link=&mt('<a href="[_1]">Continue</a> on in inline remote mode',
	"/adm/remote?action=collapse?url=$esclowerurl");
	return(<<ENDREMOTEFORM);
	<p>
	<form name="wheel">
	<input name="spin" type="text" size="40"/>
	</form>
	</p>
	<p>$link</p>
	ENDREMOTEFORM
	}
# ================================================================= Reopen menu	# ================================================================= Reopen menu

sub reopenmenu {	sub reopenmenu {
Line 867 sub utilityfunctions {	Line 904 sub utilityfunctions {
($ENV{'environment.remote'} eq 'off')) { return ''; }	($ENV{'environment.remote'} eq 'off')) { return ''; }
my $currenturl=$ENV{'request.noversionuri'};	my $currenturl=$ENV{'request.noversionuri'};
my $currentsymb=$ENV{'request.symb'};	my $currentsymb=$ENV{'request.symb'};
	my $nav_control=&Apache::lonnavmaps::nav_control_js();
return (<<ENDUTILITY)	return (<<ENDUTILITY)

var currentURL="$currenturl";	var currentURL="$currenturl";
var reloadURL="$currenturl";	var reloadURL="$currenturl";
var currentSymb="$currentsymb";	var currentSymb="$currentsymb";

	$nav_control

function go(url) {	function go(url) {
if (url!='' && url!= null) {	if (url!='' && url!= null) {
currentURL = null;	currentURL = null;
Line 924 sub serverform {	Line 964 sub serverform {
</form>	</form>
ENDSERVERFORM	ENDSERVERFORM
}	}

	sub get_nav_status {
	my $navstatus="swmenu.w_loncapanav_flag=";
	if ($ENV{'environment.remotenavmap'} eq 'on') {
	$navstatus.="1";
	} else {
	$navstatus.="-1";
	}
	return $navstatus;
	}

# ================================================ Handler when called directly	# ================================================ Handler when called directly


Line 955 sub handler {	Line 1006 sub handler {
$ENV{'browser.interface'}='faketextual';	$ENV{'browser.interface'}='faketextual';
$ENV{'environment.remote'}='off';	$ENV{'environment.remote'}='off';
}	}
my $utility=&utilityfunctions();
$r->print(<<ENDHEADER);	$r->print(<<ENDHEADER);
<html><head>	<html><head>
<title>LON-CAPA Main Menu</title>	<title>LON-CAPA Main Menu</title>
<script>
$utility
</script>
</head>	</head>
$bodytag	$bodytag
ENDHEADER	ENDHEADER

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

Removed from v.1.111
changed lines
	Added in v.1.118