loncom/interface/lonmenu.pm - diff

Return to lonmenu.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.369.2.42, 2013/05/26 22:42:06	version 1.369.2.43, 2013/06/26 04:27:38
Line 432 sub secondary_menu {	Line 432 sub secondary_menu {
} else {	} else {
$link = '#';	$link = '#';
}	}
my @scndsub;	my @scndsub;
if (ref($secondary_submenu{$title}) eq 'ARRAY') {	if (ref($secondary_submenu{$title}) eq 'ARRAY') {
foreach my $item (@{$secondary_submenu{$title}}) {	foreach my $item (@{$secondary_submenu{$title}}) {
if (ref($item) eq 'ARRAY') {	if (ref($item) eq 'ARRAY') {
Line 535 sub create_submenu {	Line 535 sub create_submenu {
foreach my $item (@{$submenu}) {	foreach my $item (@{$submenu}) {
$count ++;	$count ++;
if (ref($item) eq 'ARRAY') {	if (ref($item) eq 'ARRAY') {
	my $href = $item->[0];
	if ($href =~ /(aboutme\|rss\.html)$/) {
	next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
	$href =~ s/\[domain\]/$env{'user.domain'}/g;
	$href =~ s/\[user\]/$env{'user.name'}/g;
	}
my $borderbot;	my $borderbot;
if ($count == $numsub) {	if ($count == $numsub) {
$borderbot = 'border-bottom:1px solid black;';	$borderbot = 'border-bottom:1px solid black;';
}	}
if ($item->[0] =~ /(aboutme\|rss\.html)$/) {
$item->[0] =~ s/\[domain\]/$env{'user.domain'}/g;
$item->[0] =~ s/\[user\]/$env{'user.name'}/g;
}
$menu .= '<li style="margin:0;padding:0;'.	$menu .= '<li style="margin:0;padding:0;'.
$borderbot.'"><a href="'.$item->[0].'">'.	$borderbot.'"><a href="'.$href.'">'.
&mt($item->[1]).'</a></li>';	&mt($item->[1]).'</a></li>';
}	}
}	}