--- loncom/interface/lonnavmaps.pm	2012/06/19 10:11:35	1.487
+++ loncom/interface/lonnavmaps.pm	2013/03/18 23:04:06	1.494
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.487 2012/06/19 10:11:35 foxr Exp $
+# $Id: lonnavmaps.pm,v 1.494 2013/03/18 23:04:06 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>:
@@ -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));
@@ -692,7 +698,7 @@ sub getDescription {
         my $maxtries = $res->maxtries($part);
         my $triesString = "";
         if ($tries && $maxtries) {
-            $triesString = '<font size="-1"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></font>';
+            $triesString = '<span class="LC_fontsize_medium"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></span>';
             if ($maxtries > 1 && $maxtries - $tries == 1) {
                 $triesString = "<b>$triesString</b>";
             }
@@ -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&symb='.&escape($resource->symb()).'">'.
                          '<img src="'.$icon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
                          '</a>';
+            }
         }
     }
 
@@ -996,7 +1004,7 @@ sub render_resource {
         $nonLinkedText .= ' <span class="LC_info">('.&mt('conditionally hidden').')</span> ';
     }
     if (($resource->is_practice()) && ($resource->is_raw_problem())) {
-        $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
+        $nonLinkedText .=' <span class="LC_info"><b>'.&mt('not graded').'</b></span>';
     }
 
     # We're done preparing and finally ready to start the rendering
@@ -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>";
     }
@@ -1129,21 +1137,23 @@ sub render_long_status {
         $params->{'multipart'} && $part eq "0";
                 
     my $color;
+    my $info = '';
     if ($resource->is_problem() || $resource->is_practice()) {
         $color = $colormap{$resource->status};
         
         if (dueInLessThan24Hours($resource, $part) ||
             lastTry($resource, $part)) {
             $color = $hurryUpColor;
+            $info = ' title="'.&mt('Due in less than 24 hours!').'"';
         }
     }
     
     if ($resource->kind() eq "res" &&
         $resource->is_raw_problem() &&
         !$firstDisplayed) {
-        if ($color) {$result .= "<font color=\"$color\"><b>"; }
+        if ($color) {$result .= '<span style="color:'.$color.'"'.$info.'><b>'; }
         $result .= getDescription($resource, $part);
-        if ($color) {$result .= "</b></font>"; }
+        if ($color) {$result .= "</b></span>"; }
     }
     if ($resource->is_map() && &advancedUser() && $resource->randompick()) {
         $result .= &mt('(randomly select [_1])', $resource->randompick());
@@ -1225,11 +1235,11 @@ sub render_parts_summary_status {
     }
     $return.= $td . $totalParts . ' parts: ';
     foreach my $status (@statuses) {
-	if ($overallstatus{$status}) {
-	    $return.="<font color='" . $statusColors{$status} .
-		"'>" . $overallstatus{$status} . ' '
-		. $statusStrings{$status} . "</font>";
-	}
+        if ($overallstatus{$status}) {
+            $return.='<span style="color:' . $statusColors{$status}
+                   . '">' . $overallstatus{$status} . ' '
+                   . $statusStrings{$status} . '</span>';
+        }
     }
     $return.= $endtd;
     return $return;
@@ -2009,6 +2019,7 @@ sub new {
 
     $self->{USERNAME} = shift || $env{'user.name'};
     $self->{DOMAIN}   = shift || $env{'user.domain'};
+    $self->{CODE}     = shift;
 
 
 
@@ -2025,7 +2036,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
 	
@@ -2048,7 +2059,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});
     }
 
     return $self;
@@ -2061,12 +2072,14 @@ 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;
 
     # If the hashes are already tied make sure to break that bond:
 
@@ -2082,7 +2095,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}, \%big_hash);
     $self->{NAV_HASH} = \%big_hash;
 
 
@@ -4411,7 +4424,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) {