--- loncom/interface/lonnavmaps.pm	2004/07/03 20:45:23	1.265
+++ loncom/interface/lonnavmaps.pm	2004/10/07 19:55:52	1.267.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.265 2004/07/03 20:45:23 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.267.2.8 2004/10/07 19:55:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -513,7 +513,7 @@ sub timeToHumanString {
         }
 
         # Not this year, so show the year
-        my $timeStr = strftime("on %A, %b %e %G at %I:%M %P", localtime($time));
+        my $timeStr = strftime("on %A, %b %e %Y at %I:%M %P", localtime($time));
         $timeStr =~ s/12:00 am/00:00/;
         $timeStr =~ s/12:00 pm/noon/;
         return $timeStr;
@@ -971,7 +971,7 @@ sub render_resource {
         $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
     }
 
-    if (!$params->{'resource_nolink'} && !$resource->is_sequence()) {
+    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$title$partLabel$curMarkerEnd $nonLinkedText</td>";
@@ -1260,7 +1260,7 @@ sub render {
         # We only need to do this if we need to open the maps to show the
         # current position. This will change the counter so we can't count
         # for the jump marker with this loop.
-        while (($curRes = $mapIterator->next()) && !$found) {
+        while ($here && ($curRes = $mapIterator->next()) && !$found) {
             if (ref($curRes) && $curRes->symb() eq $here) {
                 my $mapStack = $mapIterator->getStack();
                 
@@ -1369,9 +1369,22 @@ sub render {
                 "&here=" . Apache::lonnet::escape($here) . 
                 "\">".&mt('Open All Folders')."</a>";
         }
-        $result .= "<br /><br />\n";
-    }    
+        $result .= "\n";
+    }
 
+    # Check for any unread discussions in all resources.
+    if (!$args->{'resource_no_folder_link'}) {
+	my $time=time;
+	my $mapr = &mt('Mark all posts read');
+	$result .= (<<END);
+	        &nbsp;&nbsp;&nbsp;<a href="javascript:document.clearbubbles.submit()">$mapr</a>&nbsp;<a href="javascript:void(open('/adm/help/NavMaps_MarkPosts_Read.hlp', 'Help_for_NavMaps_MarkPosts', 'menubar=0,toolbar=1,scrollbars=1,width=350,height=400,resizable=yes'))" title="Online Help"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: NavMaps_MarkPostsLink)" /></a>
+		<form name="clearbubbles" method="post" action="/adm/feedback">
+		<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+		<input type="hidden" name="navtime" value="$time" />
+		</form>
+END
+    }
+    $result .= "<br />\n";
     if ($r) {
         $r->print($result);
         $r->rflush();
@@ -1845,17 +1858,11 @@ sub generate_email_discuss_status {
     
     foreach my $msgid (split(/\&/, $keys)) {
 	$msgid=&Apache::lonnet::unescape($msgid);
-	my $plain=&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-	if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-	    my ($what,$url)=($1,$2);
-	    my %status=
-		&Apache::lonnet::get('email_status',[$msgid]);
-	    if ($status{$msgid}=~/^error\:/) { 
-		$status{$msgid}=''; 
-	    }
-	    
-	    if (($status{$msgid} eq 'new') || 
-		(!$status{$msgid})) { 
+	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+	    my $plain=
+		&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
+	    if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
+		my ($what,$url)=($1,$2);
 		if ($what eq 'Error') {
 		    $error{$url}.=','.$msgid; 
 		} else {
@@ -1865,8 +1872,10 @@ sub generate_email_discuss_status {
 	}
     }
     
+    #url's of resources that have feedbacks
     $self->{FEEDBACK} = \%feedback;
-    $self->{ERROR_MSG} = \%error; # what is this? JB
+    #or errors
+    $self->{ERROR_MSG} = \%error;
     $self->{DISCUSSION_TIME} = \%discussiontime;
     $self->{EMAIL_STATUS} = \%emailstatus;
     $self->{LAST_READ} = \%lastreadtime;
@@ -1942,7 +1951,7 @@ sub hasDiscussion {
 # backward compatibility (bulletin boards used to be 'wrapped')
     my $ressymb = $symb;
     if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
-        unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+        unless ($ressymb =~ m|adm/wrapper/adm|) {
             $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
         }
     }
@@ -1950,7 +1959,8 @@ sub hasDiscussion {
     if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
         return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
     } else {
-        return $self->{DISCUSSION_TIME}->{$ressymb} >  $self->{LAST_CHECK};
+#        return $self->{DISCUSSION_TIME}->{$ressymb} >  $self->{LAST_CHECK}; # v.1.1 behavior 
+        return $self->{DISCUSSION_TIME}->{$ressymb} >  0; # in 1.2 will display speech bubble icons for all items with posts until marked as read (even if read in v 1.1).
     }
 }
 
@@ -3254,6 +3264,12 @@ sub is_survey {
     return 0;
 }
 
+sub is_empty_sequence {
+    my $self=shift;
+    my $src = $self->src();
+    return !$self->is_page() && $self->navHash("is_map_", 1) && !$self->navHash("map_type_" . $self->map_pc());
+}
+
 # Private method: Shells out to the parmval in the nav map, handler parts.
 sub parmval {
     my $self = shift;
@@ -3941,6 +3957,7 @@ sub getCompletionStatus {
 
     # Left as separate if statements in case we ever do more with this
     if ($status eq 'correct_by_student') {return $self->CORRECT;}
+    if ($status eq 'correct_by_scantron') {return $self->CORRECT;}
     if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }
     if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
@@ -4091,7 +4108,7 @@ sub status {
 
     if ($dateStatus == PAST_DUE_ANSWER_LATER ||
         $dateStatus == PAST_DUE_NO_ANSWER ) {
-        return $dateStatus; 
+        return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus; 
     }
 
     if ($dateStatus == ANSWER_OPEN) {