--- loncom/interface/lonmenu.pm 2007/04/13 02:03:54 1.212 +++ loncom/interface/lonmenu.pm 2007/04/17 15:45:03 1.215 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.212 2007/04/13 02:03:54 www Exp $ +# $Id: lonmenu.pm,v 1.215 2007/04/17 15:45:03 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -842,6 +842,9 @@ sub switch { } } else { # Inline Remote + if ($env{'environment.icons'} ne 'classic') { + $img=~s/\.gif$/\.png/; + } if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; $text=~s/\s*\-\s*//gs; @@ -863,19 +866,19 @@ sub switch { $inlineremote[$idx]="\n<tr>". '<td class="LC_menubuttons_img" align="left">'. '<a href="javascript:'.$act.';">'.$pic.'</a></td> - <td class="LC_menubuttons_text" align="left">'.$text.'</td>'; + <td class="LC_menubuttons_text" align="left"><a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$text.'</span></a></td>'; } else { $inlineremote[$idx]="\n<tr>". '<td class="LC_menubuttons_img" align="left">'. '<a href="javascript:'.$act.';">'.$pic. '</a></td><td class="LC_menubuttons_text" colspan="3">'. - $desc.'</td></tr>'; + '<a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$desc.'</span></a></td></tr>'; } } else { # Inline Menu $inlineremote[$idx]= - '<a href="javascript:'.$act.';">'.$pic. - '</a><span class="LC_menubuttons_inline_text">'.$desc.'</span>'; + '<a class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic. + '<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>'; } } return ''; @@ -907,13 +910,13 @@ sub inlinemenu { undef(@inlineremote); undef(%category_members); &rawconfig(1); - my $output='<table><tr>'; + my $output='<table id="LC_mainmenu"><tr>'; for (my $col=1; $col<=2; $col++) { - $output.='<td>'; + $output.='<td class="LC_mainmenu_column">'; for (my $row=1; $row<=8; $row++) { foreach my $cat (keys(%category_members)) { if ($category_positions{$cat} ne "$col,$row") { next; } - $output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menu_category">'.&mt($category_names{$cat}).'</td></tr>'; + $output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>'; my %active=(); foreach my $menu_item (split(/\:/,$category_members{$cat})) { if ($inlineremote[$menu_item]) {