--- loncom/interface/lonhtmlcommon.pm 2008/11/21 15:22:04 1.184 +++ 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.184 2008/11/21 15:22:04 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 @@ -1708,6 +1708,7 @@ sub email_default_row { sub submit_row { my ($title,$cmd,$submit_text,$css_class) = @_; + $submit_text = &mt($submit_text); my $output = &row_title($title,$css_class,'LC_pick_box_submit'); $output .= qq| @@ -2020,6 +2021,7 @@ END # permission => 'Contains permissions as returned from lonnet::allowed(), # must evaluate to true in order to activate the link', # icon => 'icon filename', +# alttext => 'alt text for the icon', # help => 'Name of the corresponding helpfile', # linktitle => 'Description of the link (used for title tag)' # }, @@ -2037,32 +2039,38 @@ END # Don't rely on its current functionality as it might be # changed or removed. # TODO: -# add icon field -# add alt tag for icon # check for empty values # -------------------------- 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 .= qq|'; + } else { #use linktext as alt text for the icon + $menu_html .= qq|$item->{'linktext'}"/>|; + } } - $menu_html .= &mt($item->{'linktext'}).''; -# if (exists($item->{'help'})) { -# $menu_html .= &Apache::loncommon::help_open_topic($item->{'help'}); -# } + $menu_html .= qq|'; + $menu_html .= mt($item->{'linktext'}).''; + if (exists($item->{'help'})) { + $menu_html .= Apache::loncommon::help_open_topic($item->{'help'}); + } $menu_html .= ''; } $menu_html .= ''; } + $menu_html .= qq||; return $menu_html; }