version 1.240, 2008/09/04 22:47:20
|
version 1.242, 2008/09/11 13:30:59
|
Line 251 ENDCRELOAD
|
Line 251 ENDCRELOAD
|
} |
} |
my $form=&serverform(); |
my $form=&serverform(); |
my $utility=&utilityfunctions(); |
my $utility=&utilityfunctions(); |
my $remote; |
|
if ($env{'user.adv'}) { |
|
$remote = '<td><a href="/adm/remote?action=launch&url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>' |
|
} |
|
|
|
my $helplink=&Apache::loncommon::top_nav_help('Help'); |
my $helplink=&Apache::loncommon::top_nav_help('Help'); |
return (<<ENDINLINEMENU); |
return (<<ENDINLINEMENU); |
Line 272 $reloadlink
|
Line 268 $reloadlink
|
$navmaps |
$navmaps |
$docs |
$docs |
$groups |
$groups |
$remote |
|
$roles |
$roles |
<td class="LC_top_nav_help">$helplink</td> |
<td class="LC_top_nav_help">$helplink</td> |
<td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td> |
<td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td> |
Line 995 sub inlinemenu {
|
Line 990 sub inlinemenu {
|
&rawconfig(1); |
&rawconfig(1); |
my $output='<table id="LC_mainmenu"><tr>'; |
my $output='<table id="LC_mainmenu"><tr>'; |
for (my $col=1; $col<=2; $col++) { |
for (my $col=1; $col<=2; $col++) { |
$output.='<td class="LC_mainmenu_column">'; |
$output.='<td class="LC_mainmenu_col_fieldset">'; |
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_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>'; |
|
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.='</table>'; |
|
} |
|
} |
|
$output.="</td>"; |
|
} |
|
$output.="</tr></table>"; |
|
return $output; |
|
} |
|
|
|
sub inlinemenu_new { |
|
undef(@inlineremote); |
|
undef(%category_members); |
|
&rawconfig(1); |
|
my $output='<table id="LC_mainmenu"><tr>'; |
|
for (my $col=1; $col<=2; $col++) { |
|
$output.='<td class="LC_mainmenu_column">'; |
|
for (my $row=1; $row<=8; $row++) { |
for (my $row=1; $row<=8; $row++) { |
foreach my $cat (keys(%category_members)) { |
foreach my $cat (keys(%category_members)) { |
if ($category_positions{$cat} ne "$col,$row") { next; } |
if ($category_positions{$cat} ne "$col,$row") { next; } |
$output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menubuttons_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>'; |
|
$output.='<fieldset id="LC_mainmenu_fieldset">'; |
|
$output.='<legend class="LC_mainmenu_fieldset_category">'.&mt($category_names{$cat}).'</legend>'; |
|
$output.='<table id="LC_menubuttons_mainmenu">'; |
my %active=(); |
my %active=(); |
foreach my $menu_item (split(/\:/,$category_members{$cat})) { |
foreach my $menu_item (split(/\:/,$category_members{$cat})) { |
if ($inlineremote[$menu_item]) { |
if ($inlineremote[$menu_item]) { |
Line 1037 sub inlinemenu_new {
|
Line 1006 sub inlinemenu_new {
|
} |
} |
foreach my $item (sort(keys(%active))) { |
foreach my $item (sort(keys(%active))) { |
$output.=$inlineremote[$item]; |
$output.=$inlineremote[$item]; |
|
&Apache::lonnet::logthis("item=$item output=$inlineremote[$item]"); |
} |
} |
$output.='</table>'; |
$output.='</table>'; |
|
$output.='</fieldset>'; |
} |
} |
} |
} |
$output.="</td>"; |
$output.="</td>"; |