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

[albertel]

albertel		Tue Apr 13 11:49:42 2004 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - seconding stuart's changes
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.257 loncom/interface/lonnavmaps.pm:1.258
--- loncom/interface/lonnavmaps.pm:1.257	Mon Apr  5 14:16:36 2004
+++ loncom/interface/lonnavmaps.pm	Tue Apr 13 11:49:42 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.257 2004/04/05 18:16:36 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.258 2004/04/13 15:49:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -864,10 +864,7 @@
     my $filter = $it->{FILTER};
 
     my $title = $resource->compTitle();
-#    if ($src =~ /^\/uploaded\//) {
-#        $nonLinkedText=$title;
-#        $title = '';
-#    }
+
     my $partLabel = "";
     my $newBranchText = "";
     
@@ -973,9 +970,7 @@
         $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
     }
 
-#    if (!$params->{'resource_nolink'} && $src !~ /^\/uploaded\// &&
-#	!$resource->is_sequence()) {
-     if (!$params->{'resource_nolink'} && !$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>";