--- loncom/interface/lonnavmaps.pm	2011/12/25 20:41:53	1.477
+++ loncom/interface/lonnavmaps.pm	2011/12/28 04:11:05	1.478
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.477 2011/12/25 20:41:53 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.478 2011/12/28 04:11:05 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1466,8 +1466,10 @@ sub render {
             $link .= '&register='.$env{'form.register'};
         }
 	if ($args->{'caller'} eq 'navmapsdisplay') {
-	    &add_linkitem($args->{'linkitems'},'changefolder',
-			  "location.href='$link'",$text);
+            unless ($args->{'notools'}) {
+                &add_linkitem($args->{'linkitems'},'changefolder',
+                              "location.href='$link'",$text);
+            }
 	} else {
 	    $result.= '<a href="'.$link.'">'.&mt($text).'</a>';
 	}
@@ -1475,7 +1477,7 @@ sub render {
     }
 
     # Check for any unread discussions in all resources.
-    if ($args->{'caller'} eq 'navmapsdisplay') {
+    if (($args->{'caller'} eq 'navmapsdisplay') && (!$args->{'notools'})) {
 	&add_linkitem($args->{'linkitems'},'clearbubbles',
 		      'document.clearbubbles.submit()',
 		      'Mark all posts read');
@@ -1507,15 +1509,16 @@ END
             }
 	}
 	$result.='</form>';
-        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            if ($env{'course.'.$env{'request.course.id'}.'.url'} eq 
-                "uploaded/$cdom/$cnum/default.sequence") {
-                &add_linkitem($args->{'linkitems'},'edittoplevel',
-                              "javascript:gocmd('/adm/coursedocs','editdocs');",
-                              'Content Editor');
-            }
+    }
+    if (($args->{'caller'} eq 'navmapsdisplay') &&
+        (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        if ($env{'course.'.$env{'request.course.id'}.'.url'} eq 
+            "uploaded/$cdom/$cnum/default.sequence") {
+            &add_linkitem($args->{'linkitems'},'edittoplevel',
+                          "javascript:gocmd('/adm/coursedocs','editdocs');",
+                          'Content Editor');
         }
     }
 
@@ -1859,25 +1862,29 @@ sub add_linkitem {
 
 sub show_linkitems_toolbar {
     my ($args,$condition) = @_;
-    my $result =
-        '<table><tr><td>'.
-        &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').
-        '</td>'.
-        '<td>&nbsp;</td>'.
-        '<td class="LC_middle">'.&mt('Tools:').'</td>';
+    my $result;
     if (ref($args) eq 'HASH') {
         if (ref($args->{'linkitems'}) eq 'HASH') {
+            my $numlinks = scalar(keys(%{$args->{'linkitems'}}));
+            if ($numlinks > 1) {
+                $result = '<td>'.
+                          &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',
+                                                             undef,'RAT').
+                          '</td>'.
+                          '<td>&nbsp;</td>'.
+                          '<td class="LC_middle">'.&mt('Tools:').'</td>';
+            }
+            $result .= '<td align="left">'."\n".
+                       '<span class="LC_nobreak">'."\n".
+                       '<ul id="LC_toolbar">';
             my @linkorder = ('firsthomework','everything','uncompleted',
                              'changefolder','clearbubbles','edittoplevel');
-            $result .='<td align="left">'."\n".
-                      '<span class="LC_nobreak">'."\n".
-                      '<ul id="LC_toolbar">';
             foreach my $link (@linkorder) {
-                my $link_id = 'LC_content_toolbar_'.$link;
                 if (ref($args->{'linkitems'}{$link}) eq 'HASH') {
                     if ($args->{'linkitems'}{$link}{'text'} ne '') {
                         $args->{'linkitems'}{$link}{'cmd'}=~s/"/'/g;
                         if ($args->{'linkitems'}{$link}{'cmd'}) {
+                            my $link_id = 'LC_content_toolbar_'.$link;
                             if ($link eq 'changefolder') {
                                 if ($condition) {
                                     $link_id='LC_content_toolbar_changefolder_toggled';
@@ -1896,14 +1903,20 @@ sub show_linkitems_toolbar {
                 }
             }
             $result .= '</ul>'.
-                       '</span></td>'."\n";
+                       '</span></td>';
+            if (($numlinks==1) && (exists($args->{'linkitems'}{'edittoplevel'}))) {
+                $result .= '<td><a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
+                           &mt('Content Editor').'</a></td>';
+            }
         }
         if ($args->{'sort_html'}) {
             $result .= '<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
                        '<td align="right">'.$args->{'sort_html'}.'</td>';
         }
     }
-    $result .= '</tr></table>';
+    if ($result) {
+        $result = "<table><tr>$result</tr></table>";
+    }
     return $result;
 }