--- loncom/interface/lonmenu.pm	2008/09/20 17:01:48	1.239.2.1
+++ loncom/interface/lonmenu.pm	2008/09/04 22:47:20	1.240
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.239.2.1 2008/09/20 17:01:48 raeburn Exp $
+# $Id: lonmenu.pm,v 1.240 2008/09/04 22:47:20 riegler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -251,6 +251,10 @@ ENDCRELOAD
         }
         my $form=&serverform();
 	my $utility=&utilityfunctions();
+	my $remote;
+	if ($env{'user.adv'}) {
+	    $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
+	}
 
         my $helplink=&Apache::loncommon::top_nav_help('Help');
 	return (<<ENDINLINEMENU);
@@ -268,6 +272,7 @@ $reloadlink
 $navmaps
 $docs
 $groups
+$remote
 $roles
 <td class="LC_top_nav_help">$helplink</td>
 <td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
@@ -988,6 +993,35 @@ sub inlinemenu {
     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++) {
+            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">';