--- loncom/interface/lonnavmaps.pm	2011/12/25 19:39:08	1.476
+++ loncom/interface/lonnavmaps.pm	2011/12/25 20:41:53	1.477
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.476 2011/12/25 19:39:08 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.477 2011/12/25 20:41:53 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -896,6 +896,7 @@ sub part_status_summary { return 4; }
 sub render_resource {
     my ($resource, $part, $params) = @_;
 
+    my $editmapLink;
     my $nonLinkedText = ''; # stuff after resource title not in link
 
     my $link = $params->{"resourceLink"};
@@ -977,6 +978,14 @@ sub render_resource {
             $linkopen = "";
             $linkclose = "";
         }
+        if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
+            ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
+            my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
+            $editmapLink=' '.
+                         '<a href="/adm/coursedocs?command=direct&symb='.&escape($resource->symb()).'">'.
+                         '<img src="'.$icon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
+                         '</a>';
+        }
     }
 
     if ($resource->randomout()) {
@@ -1010,8 +1019,10 @@ sub render_resource {
     # Is this the current resource?
     if (!$params->{'displayedHereMarker'} && 
         $resource->symb() eq $params->{'here'} ) {
-        $curMarkerBegin = '<span class="LC_current_nav_location">';
-        $curMarkerEnd = '</span>';
+        unless ($resource->is_map()) {
+            $curMarkerBegin = '<span class="LC_current_nav_location">';
+            $curMarkerEnd = '</span>';
+        }
 	$params->{'displayedHereMarker'} = 1;
     }
 
@@ -1030,7 +1041,7 @@ sub render_resource {
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
         $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
     } else {
-        $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
+        $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     }
 
     return $result;
@@ -1044,6 +1055,7 @@ sub render_communication_status {
     my $linkopen = "<a href=\"$link\">";
     my $linkclose = "</a>";
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
+
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
             '<img alt="'.&mt('New Discussion').'" src="'.$location.'/chat.gif" title="'.&mt('New Discussion').'"/>' .
@@ -1132,14 +1144,6 @@ sub render_long_status {
         $result .= getDescription($resource, $part);
         if ($color) {$result .= "</b></font>"; }
     }
-    if ($resource->is_map()) {
-        if (&Apache::lonnet::allowed('mdc')) {
-            if ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/) {
-               $result.="&nbsp;<a href='/adm/coursedocs?command=direct&symb=".&escape($resource->symb())."'>".
-                              "<span class='LC_setting'>".&mt("Edit Content").'</span></a>&nbsp;';
-            }
-        }
-    }
     if ($resource->is_map() && &advancedUser() && $resource->randompick()) {
         $result .= &mt('(randomly select [_1])', $resource->randompick());
     }
@@ -1509,7 +1513,7 @@ END
             if ($env{'course.'.$env{'request.course.id'}.'.url'} eq 
                 "uploaded/$cdom/$cnum/default.sequence") {
                 &add_linkitem($args->{'linkitems'},'edittoplevel',
-                              "javascript:gocmd('/adm/coursedocs','direct');",
+                              "javascript:gocmd('/adm/coursedocs','editdocs');",
                               'Content Editor');
             }
         }
@@ -1855,7 +1859,7 @@ sub add_linkitem {
 
 sub show_linkitems_toolbar {
     my ($args,$condition) = @_;
-    my $result = 
+    my $result =
         '<table><tr><td>'.
         &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').
         '</td>'.
@@ -1865,7 +1869,7 @@ sub show_linkitems_toolbar {
         if (ref($args->{'linkitems'}) eq 'HASH') {
             my @linkorder = ('firsthomework','everything','uncompleted',
                              'changefolder','clearbubbles','edittoplevel');
-            $result .='<td align="left">'."\n". 
+            $result .='<td align="left">'."\n".
                       '<span class="LC_nobreak">'."\n".
                       '<ul id="LC_toolbar">';
             foreach my $link (@linkorder) {
@@ -1903,7 +1907,6 @@ sub show_linkitems_toolbar {
     return $result;
 }
 
-
 1;