--- loncom/interface/lonnavmaps.pm	2017/12/21 03:50:57	1.538
+++ loncom/interface/lonnavmaps.pm	2018/01/15 00:51:42	1.540
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.538 2017/12/21 03:50:57 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.540 2018/01/15 00:51:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -702,7 +702,17 @@ sub getDescription {
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
 	&& $res->handgrade($part) ne 'yes') {
-        return &Apache::lonhtmlcommon::direct_parm_link(&mt("Answer available"),$res->symb(),'answerdate,duedate',$part);
+        my $msg = &mt('Answer available');
+        my $parmlist = 'answerdate,duedate';
+        if (($res->is_tool) && ($res->is_gradable())) {
+            if (($status == $res->PARTIALLY_CORRECT) && ($res->parmval('retrypartial',$part))) {
+                $msg = &mt('Grade received');
+                $parmlist = 'retrypartial';
+            } else {
+                $msg = &mt('Grade available');
+            }
+        }
+        return &Apache::lonhtmlcommon::direct_parm_link($msg,$res->symb(),$parmlist,$part);
     }
     if ($status == $res->EXCUSED) {
         return &mt("Excused by instructor");
@@ -956,7 +966,28 @@ sub render_resource {
     # links to open and close the folder
 
     my $whitespace = $location.'/whitespace_21.gif';
-    my $linkopen = "<img src='$whitespace' alt='' />"."<a href=\"$link\">";
+    my $linkopen = "<img src='$whitespace' alt='' />";
+    my $nomodal;
+    if (($params->{'modalLink'}) && (!$resource->is_sequence())) {
+        if ($link =~m{^(?:|/adm/wrapper)/ext/([^#]+)}) {
+            my $exturl = $1;
+            if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
+                $nomodal = 1;
+            }
+        } elsif (($link eq "/public/$LONCAPA::match_domain/$LONCAPA::match_courseid/syllabus") &&
+                 ($env{'request.course.id'}) && ($ENV{'SERVER_PORT'} == 443) &&
+                 ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+             $nomodal = 1;
+        }
+        my $esclink = &js_escape($link);
+        if ($nomodal) {
+            $linkopen .= "<a href=\"#\" onclick=\"javascript:window.open('$esclink','resourcepreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1'); return false;\" />";
+        } else {
+            $linkopen .= "<a href=\"$link\" onclick=\"javascript:openMyModal('$esclink',600,500,'yes','true'); return false;\">";
+        }
+    } else {
+        $linkopen .= "<a href=\"$link\">";
+    }
     my $linkclose = "</a>";
 
     # Default icon: unknown page
@@ -1084,10 +1115,19 @@ sub render_resource {
     }
 
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
-    } else {
-        $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
+        $linkclose = '</a>';
+        if ($params->{'modalLink'}) {
+            my $esclink = &js_escape($link);
+            if ($nomodal) {
+                $linkopen = "<a href=\"#\" onclick=\"javascript:window.open('$esclink','resourcepreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1'); return false;\" />";
+            } else {
+                $linkopen = "<a href=\"$link\" onclick=\"javascript:openMyModal('$esclink',600,500,'yes','true'); return false;\">";
+            }
+        } else {
+            $linkopen = "<a href=\"$link\">";
+        }
     }
+    $result .= "$curMarkerBegin$linkopen$title$partLabel$linkclose$curMarkerEnd$editmapLink$nonLinkedText</td>";
 
     return $result;
 }
@@ -1725,6 +1765,11 @@ END
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     }
 
+    my $inhibitmenu;
+    if ($args->{'modalLink'}) {
+        $inhibitmenu = '&amp;inhibitmenu=yes';
+    }
+
     while (1) {
 	if ($args->{'sort'}) {
 	    $curRes = shift(@resources);
@@ -1878,7 +1923,7 @@ END
 	    } else {
 	        $args->{"resourceLink"} = $src.
 		    ($srcHasQuestion?'&amp;':'?') .
-		    'symb=' . &escape($symb).$anchor;
+		    'symb=' . &escape($symb).$inhibitmenu.$anchor;
 	    }
 	}
         # Now, we've decided what parts to show. Loop through them and