[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm

[raeburn]

raeburn		Mon Apr  5 14:16:36 2004 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  Changes required so documents within uploaded *.page files show as links in the navigation map.  
  This change could cause problems for other types of non-wrapped /uploaded files if there are any.
  If all /uploaded documents are wrapped within /adm/wrapper (except .page and .sequence) then there should not be a problem.  
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.256 loncom/interface/lonnavmaps.pm:1.257
--- loncom/interface/lonnavmaps.pm:1.256	Wed Mar 24 17:22:04 2004
+++ loncom/interface/lonnavmaps.pm	Mon Apr  5 14:16:36 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.256 2004/03/24 22:22:04 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.257 2004/04/05 18:16:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -864,10 +864,10 @@
     my $filter = $it->{FILTER};
 
     my $title = $resource->compTitle();
-    if ($src =~ /^\/uploaded\//) {
-        $nonLinkedText=$title;
-        $title = '';
-    }
+#    if ($src =~ /^\/uploaded\//) {
+#        $nonLinkedText=$title;
+#        $title = '';
+#    }
     my $partLabel = "";
     my $newBranchText = "";
     
@@ -973,8 +973,9 @@
         $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
     }
 
-    if (!$params->{'resource_nolink'} && $src !~ /^\/uploaded\// &&
-	!$resource->is_sequence()) {
+#    if (!$params->{'resource_nolink'} && $src !~ /^\/uploaded\// &&
+#	!$resource->is_sequence()) {
+     if (!$params->{'resource_nolink'} && !$resource->is_sequence()) {
         $result .= "  $curMarkerBegin<a href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
     } else {
         $result .= "  $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";