--- loncom/interface/lonmenu.pm 2008/12/13 15:55:40 1.239.4.2 +++ loncom/interface/lonmenu.pm 2008/09/11 13:30:59 1.242 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.239.4.2 2008/12/13 15:55:40 raeburn Exp $ +# $Id: lonmenu.pm,v 1.242 2008/09/11 13:30:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -990,11 +990,14 @@ sub inlinemenu { &rawconfig(1); my $output=''; for (my $col=1; $col<=2; $col++) { - $output.='"; @@ -1121,18 +1126,6 @@ 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') ||
'; + $output.=''; for (my $row=1; $row<=8; $row++) { foreach my $cat (keys(%category_members)) { if ($category_positions{$cat} ne "$col,$row") { next; } - $output.=''; + #$output.='
'.&mt($category_names{$cat}).'
'; + $output.='
'; + $output.=''.&mt($category_names{$cat}).''; + $output.='
'.&mt($category_names{$cat}).'
'; my %active=(); foreach my $menu_item (split(/\:/,$category_members{$cat})) { if ($inlineremote[$menu_item]) { @@ -1003,8 +1006,10 @@ sub inlinemenu { } foreach my $item (sort(keys(%active))) { $output.=$inlineremote[$item]; + &Apache::lonnet::logthis("item=$item output=$inlineremote[$item]"); } $output.='
'; + $output.=''; } } $output.="