--- loncom/interface/lonmenu.pm 2008/12/04 08:56:28 1.246
+++ loncom/interface/lonmenu.pm 2008/12/09 04:49:01 1.249
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.246 2008/12/04 08:56:28 tempelho Exp $
+# $Id: lonmenu.pm,v 1.249 2008/12/09 04:49:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -207,7 +207,7 @@ sub menubuttons {
my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
$logo = '
 | ';
+ $logo.'" alt="LON-CAPA Logo" class="noBorder" />';
if ($env{'request.state'} eq 'construct') {
if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
@@ -1027,22 +1027,22 @@ sub switch {
my $pic=
'
';
+ '" align="'.($nobreak==3?'right':'left').'" class="noBorder" />';
if ($env{'browser.interface'} eq 'faketextual') {
# Accessibility
if ($nobreak==3) {
$inlineremote[$idx]="\n".
''.
''.$pic.' | ';
} elsif ($nobreak) {
$inlineremote[$idx]="\n".
- ''.
''.$pic.' |
';
} else {
$inlineremote[$idx]="\n
".
- ''.
''.$pic.
' |
';
@@ -1093,10 +1093,10 @@ sub inlinemenu {
for (my $row=1; $row<=8; $row++) {
foreach my $cat (keys(%category_members)) {
if ($category_positions{$cat} ne "$col,$row") { next; }
- #$output.='
';
+ #$output.='
';
$output.='';
$output.='
'.&mt($category_names{$cat}).'
';
- $output.='
';
+ $output.='';
my %active=();
foreach my $menu_item (split(/\:/,$category_members{$cat})) {
if ($inlineremote[$menu_item]) {
@@ -1105,7 +1105,6 @@ sub inlinemenu {
}
foreach my $item (sort(keys(%active))) {
$output.=$inlineremote[$item];
- &Apache::lonnet::logthis("item=$item output=$inlineremote[$item]");
}
$output.='
';
$output.='';
@@ -1225,6 +1224,18 @@ sub rawconfig {
}
}
}
+ } elsif ($pro eq 'tools') {
+ my @tools = ('aboutme','blog','portfolio');
+ if (grep(/^\Q$prt\E$/,@tools)) {
+ if (!&Apache::lonnet::usertools_access($env{'user.name'},
+ $env{'user.domain'},$prt)) {
+ $output.=&clear($row,$col);
+ next;
+ }
+ }
+ $prt='any';
+ $output.=&secondlevel(
+ $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
}
}
unless (($env{'browser.interface'} eq 'textual') ||