--- loncom/interface/lonnavmaps.pm	2012/10/04 15:28:51	1.488
+++ loncom/interface/lonnavmaps.pm	2014/01/20 01:39:33	1.500
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.488 2012/10/04 15:28:51 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.500 2014/01/20 01:39:33 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -164,6 +164,12 @@ If true, the resource's folder will not
 it. Default is false. True implies printCloseAll is false, since you
 can't close or open folders when this is on anyhow.
 
+=item * B<map_no_edit_link>:
+
+If true, the title of the folder or page will not be followed by an
+icon/link to direct editing of a folder or composite page, originally
+added via the Course Editor.
+
 =back
 
 =item * B<Apache::lonnavmaps::communication_status>:
@@ -488,7 +494,7 @@ use HTML::Entities;
 
 # For debugging
 
-use Data::Dumper;
+#use Data::Dumper;
 
 
 # symbolic constants
@@ -613,7 +619,7 @@ sub getDescription {
         return &mt("Having technical difficulties; please check status later"); 
     }
     if ($status == $res->NOTHING_SET) {
-        return &Apache::lonhtmlcommon::direct_parm_link(&mt("Not currently assigned.",$res->symb(),'opendate'),$part);
+        return &Apache::lonhtmlcommon::direct_parm_link(&mt('Not currently assigned'),$res->symb(),'opendate',$part);
     }
     if ($status == $res->OPEN_LATER) {
         return &mt("Open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($open,'start'),$res->symb(),'opendate',$part));
@@ -981,11 +987,13 @@ sub render_resource {
         }
         if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
             ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
-            my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
-            $editmapLink='&nbsp;'.
-                         '<a href="/adm/coursedocs?command=direct&symb='.&escape($resource->symb()).'">'.
+            if (!$params->{'map_no_edit_link'}) {
+                my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
+                $editmapLink='&nbsp;'.
+                         '<a href="/adm/coursedocs?command=directnav&amp;symb='.&escape($resource->symb()).'">'.
                          '<img src="'.$icon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
                          '</a>';
+            }
         }
     }
 
@@ -1040,7 +1048,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>";
+        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     } else {
         $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     }
@@ -2011,6 +2019,8 @@ sub new {
 
     $self->{USERNAME} = shift || $env{'user.name'};
     $self->{DOMAIN}   = shift || $env{'user.domain'};
+    $self->{CODE}     = shift;
+    $self->{NOHIDE} = shift;
 
 
 
@@ -2027,7 +2037,7 @@ sub new {
     # assume there are course hashes for the specific requested user@domamin:
     #
 
-    if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'})) {
+    if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'}) && !$self->{CODE}) {
 	
 	# tie the nav hash
 	
@@ -2050,7 +2060,7 @@ sub new {
 	$self->{PARM_HASH} = \%parmhash;
 	$self->{PARM_CACHE} = {};
     } else {
-	$self->change_user($self->{USERNAME}, $self->{DOMAIN});
+	$self->change_user($self->{USERNAME}, $self->{DOMAIN},  $self->{CODE}, $self->{NOHIDE});
     }
 
     return $self;
@@ -2063,12 +2073,15 @@ sub new {
 # Parameters:
 #    user  - New user.
 #    domain- Domain the user belongs to.
+#    code  - Anonymous CODE in use.
 # Implicit inputs:
 #   
 sub change_user {
     my $self = shift;
     $self->{USERNAME} = shift;
     $self->{DOMAIN}   = shift;
+    $self->{CODE}     = shift;
+    $self->{NOHIDE}   = shift;
 
     # If the hashes are already tied make sure to break that bond:
 
@@ -2084,7 +2097,7 @@ sub change_user {
     my ($cdom, $cnum) = split(/\_/, $env{'request.course.id'});
 
     my %big_hash;
-    &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, \%big_hash);
+    &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, $self->{CODE}, $self->{NOHIDE}, \%big_hash);
     $self->{NAV_HASH} = \%big_hash;
 
 
@@ -2105,9 +2118,7 @@ sub change_user {
 
     $self->{PARM_HASH} = \%parm_hash;
 
-
-    
-} 
+}
 
 sub generate_course_user_opt {
     my $self = shift;
@@ -3316,15 +3327,11 @@ sub new {
     if ($resourceCount == 1 && $resource->is_sequence() && !$self->{FORCE_TOP}) { 
         my $firstResource = $resource->map_start();
         my $finishResource = $resource->map_finish();
-	my $result;
-	$result =  Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
-						     $finishResource, $self->{FILTER},
-						     $self->{ALREADY_SEEN}, 
-						     $self->{CONDITION},
-						     $self->{FORCE_TOP});
-	return $result;
-           
-        
+	return Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
+						 $finishResource, $self->{FILTER},
+						 $self->{ALREADY_SEEN}, 
+						 $self->{CONDITION},
+						 $self->{FORCE_TOP});
     }
 
     # Set up some bookkeeping information.
@@ -4222,7 +4229,7 @@ resource of the map.
 
 Returns a string with the type of the map in it.
 
-=item *B<map_hierarchy>:
+=item * B<map_hierarchy>:
 
 Returns a string with a comma-separated ordered list of map_pc IDs
 for the hierarchy of maps containing a map, with the top level
@@ -4365,9 +4372,6 @@ sub printable {
 
     my ($self, $part) = @_;
 
-    &Apache::lonnet::logthis($self->symb());
-
-
     #  The following cases apply:
     #  - If a start date is not set, it is replaced by the open date.
     #  - Ditto for start/open replaced by content open.
@@ -4413,7 +4417,7 @@ sub resprintable {
     my $partsref = $self->parts();
     my @parts    = @$partsref;
 
-    if ((!defined(@parts)) || (scalar(@parts) == 0)) {
+    if (!@parts) {
 	return $self->printable(0);
     } else {
 	foreach my $part  (@parts) {