--- loncom/interface/lonmenu.pm 2008/09/04 22:47:20 1.240 +++ loncom/interface/lonmenu.pm 2008/09/05 19:20:39 1.241 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.240 2008/09/04 22:47:20 riegler Exp $ +# $Id: lonmenu.pm,v 1.241 2008/09/05 19:20:39 riegler Exp $ # # Copyright Michigan State University Board of Trustees # @@ -995,40 +995,14 @@ sub inlinemenu { &rawconfig(1); my $output=''; for (my $col=1; $col<=2; $col++) { - $output.='"; - } - $output.="
'; + $output.=''; for (my $row=1; $row<=8; $row++) { foreach my $cat (keys(%category_members)) { if ($category_positions{$cat} ne "$col,$row") { next; } - $output.=''; - my %active=(); - foreach my $menu_item (split(/\:/,$category_members{$cat})) { - if ($inlineremote[$menu_item]) { - $active{$menu_item}=1; - } - } - foreach my $item (sort(keys(%active))) { - $output.=$inlineremote[$item]; - } - $output.='
'.&mt($category_names{$cat}).'
'; - } - } - $output.="
"; - return $output; -} - -sub inlinemenu_new { - undef(@inlineremote); - undef(%category_members); - &rawconfig(1); - my $output=''; - for (my $col=1; $col<=2; $col++) { - $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]) { @@ -1037,8 +1011,10 @@ sub inlinemenu_new { } foreach my $item (sort(keys(%active))) { $output.=$inlineremote[$item]; + &Apache::lonnet::logthis("item=$item output=$inlineremote[$item]"); } $output.='
'; + $output.=''; } } $output.="