--- loncom/interface/lonhtmlcommon.pm 2008/11/26 23:20:56 1.186 +++ loncom/interface/lonhtmlcommon.pm 2008/12/05 10:23:56 1.192 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.186 2008/11/26 23:20:56 droeschl Exp $ +# $Id: lonhtmlcommon.pm,v 1.192 2008/12/05 10:23:56 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -467,7 +467,7 @@ document.$formname.$dname\_year.value, } ENDJS - $result .= ' '; + $result .= ' '; my $monthselector = qq{}; # Month my @Months = qw/January February March April May June @@ -2044,30 +2044,33 @@ END sub generate_menu { my @menu = @_; - my $menu_html = ''; + my $menu_html = qq||; foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished. - $menu_html .=''.$category->{'categorytitle'}.''; - foreach my $item (@{ $category->{items} }) { - next if (! $item->{'permission'}); - $menu_html .= ''. - qq{}; + $menu_html .=' + '.mt($category->{'categorytitle'}).' + '; + foreach my $item ( @{ $category->{items} } ) { + next unless $item->{'permission'}; + $menu_html .= qq|'; if($item->{'icon'}){ - $menu_html .= qq{}; + $menu_html .= $item->{'alttext'}.'"/>'; } else { #use linktext as alt text for the icon - $menu_html .= qq{$item->{'linktext'}"/>}; + $menu_html .= qq|$item->{'linktext'}"/>|; } } - $menu_html .= &mt($item->{'linktext'}).''; + $menu_html .= qq|'; + $menu_html .= mt($item->{'linktext'}).''; if (exists($item->{'help'})) { - $menu_html .= &Apache::loncommon::help_open_topic($item->{'help'}); + $menu_html .= Apache::loncommon::help_open_topic($item->{'help'}); } $menu_html .= ''; } $menu_html .= ''; } + $menu_html .= qq||; return $menu_html; }