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.102 and 1.105

version 1.102, 2003/11/11 20:27:15	version 1.105, 2003/12/08 20:21:23
Line 43 use Apache::lonnet;	Line 43 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::File;
use Apache::lonlocal;	use Apache::lonlocal;

use vars qw(@desklines $readdesk);	use vars qw(@desklines $readdesk);
Line 378 ENDREALRES	Line 377 ENDREALRES
# Registered, textual output	# Registered, textual output
my $utility=&utilityfunctions();	my $utility=&utilityfunctions();
my $form=&serverform();	my $form=&serverform();
my $inlinebuttons=	my $inlinebuttons='';

	if ($ENV{'browser.interface'} eq 'textual') {
	$inlinebuttons=
join('',map { (defined($_)?$_:'') } @inlineremote);	join('',map { (defined($_)?$_:'') } @inlineremote);
	} else {
	$inlinebuttons=(<<ENDINLINE);
	<tr><td>$inlineremote[21]</td><td>&nbsp</td><td>$inlineremote[23]</td></tr>
	<tr><td>$inlineremote[61]</td><td>$inlineremote[62]</td><td>$inlineremote[63]</td></tr>
	<tr><td>$inlineremote[71]</td><td>$inlineremote[72]</td><td>$inlineremote[73]</td></tr>
	<tr><td>$inlineremote[81]</td><td>$inlineremote[82]</td><td>$inlineremote[83]</td></tr>
	<tr><td>$inlineremote[91]</td><td>$inlineremote[92]</td><td>$inlineremote[93]</td></tr>
	ENDINLINE
	}
$result =(<<ENDREGTEXT);	$result =(<<ENDREGTEXT);
<script>	<script>
// BEGIN LON-CAPA Internal	// BEGIN LON-CAPA Internal
Line 634 sub switch {	Line 645 sub switch {
$top=&mt($top);	$top=&mt($top);
$bot=&mt($bot);	$bot=&mt($bot);
$desc=&mt($desc);	$desc=&mt($desc);
	$img=&mt($img);
unless (($ENV{'browser.interface'} eq 'textual') \|\|	unless (($ENV{'browser.interface'} eq 'textual') \|\|
($ENV{'environment.remote'} eq 'off')) {	($ENV{'environment.remote'} eq 'off')) {
# Remote	# Remote
Line 656 sub switch {	Line 668 sub switch {
if ($nobreak==2) { return ''; }	if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;	my $text=$top.' '.$bot;
$text=~s/\s\-\s//gs;	$text=~s/\s\-\s//gs;

	my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
	if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
my $pic=	my $pic=
'<img border="0" alt="'.$text.'" src="/res/adm/pages/'.$img.'" />';	'<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
if ($nobreak==3) {	':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.
$inlineremote[10*$row+$col]="\n".	($nobreak==3?'right':'left').'" />';
'<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.	if (($ENV{'browser.interface'} eq 'textual') \|\| ($ENV{'browser.interface'} eq 'faketextual')) {
'</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.	# Accessibility
'<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';	if ($nobreak==3) {
} elsif ($nobreak) {	$inlineremote[10*$row+$col]="\n".
$inlineremote[10*$row+$col]="\n<tr>".	'<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.
'<td width="10%" align="left" bgcolor="'.$tabbg.'">'.	'</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.
'<a href="javascript:'.$act.';">'.$pic.	'<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
'</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>';	} elsif ($nobreak) {
	$inlineremote[10*$row+$col]="\n<tr>".
	'<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
	'<a href="javascript:'.$act.';">'.$pic.
	'</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>';
	} else {
	$inlineremote[10*$row+$col]="\n<tr>".
	'<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
	'<a href="javascript:'.$act.';">'.$pic.
	'</a></td><td colspan="3"><font color="'.$font.'">'.$desc.
	'</font></td></tr>';
	}
} else {	} else {
$inlineremote[10*$row+$col]="\n<tr>".	# Inline Menu
'<td width="10%" align="left" bgcolor="'.$tabbg.'">'.	$inlineremote[10*$row+$col]=
'<a href="javascript:'.$act.';">'.$pic.	'<a href="javascript:'.$act.';">'.$pic.
'</a></td><td colspan="3"><font color="'.$font.'">'.$desc.	'</a><font color="'.$font.'" size="2">'.$desc.
'</font></td></tr>';	'</font>';
}	}
}	}
return '';	return '';
Line 916 sub handler {	Line 942 sub handler {
$tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);	$tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
$font=&Apache::loncommon::designparm($function.'.font',$domain);	$font=&Apache::loncommon::designparm($function.'.font',$domain);
# ---- Print the screen, pretent to be in text mode to generate text-based menu	# ---- Print the screen, pretent to be in text mode to generate text-based menu
unless ($ENV{'brower.interface'} eq 'textual') {	unless ($ENV{'browser.interface'} eq 'textual') {
	$ENV{'browser.interface'}='faketextual';
$ENV{'environment.remote'}='off';	$ENV{'environment.remote'}='off';
}	}
my $utility=&utilityfunctions();	my $utility=&utilityfunctions();
Line 939 ENDHEADER	Line 966 ENDHEADER
BEGIN {	BEGIN {
if (! defined($readdesk)) {	if (! defined($readdesk)) {
{	{
my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.	my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
'/mydesk.tab');	if ( CORE::open( my $config,"<$tabfile") ) {
while (my $configline=<$config>) {	while (my $configline=<$config>) {
$configline=(split(/\#/,$configline))[0];	$configline=(split(/\#/,$configline))[0];
$configline=~s/^\s+//;	$configline=~s/^\s+//;
chomp($configline);	chomp($configline);
if ($configline) {	if ($configline) {
$desklines[$#desklines+1]=$configline;	$desklines[$#desklines+1]=$configline;
}	}
	}
	CORE::close($config);
}	}
}	}
$readdesk='done';	$readdesk='done';

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

Removed from v.1.102
changed lines
	Added in v.1.105