--- loncom/interface/londocs.pm	2011/12/04 15:51:58	1.467
+++ loncom/interface/londocs.pm	2011/12/25 18:29:49	1.471
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.467 2011/12/04 15:51:58 raeburn Exp $
+# $Id: londocs.pm,v 1.471 2011/12/25 18:29:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1970,8 +1970,7 @@ sub entryline {
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
-	if (($folder!~/^supplemental/) &&
-	    ($#LONCAPA::map::order>0) &&
+	if (($#LONCAPA::map::order>0) &&
 	    ((split(/\:/,
 	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
 	     ne '') &&
@@ -2200,13 +2199,25 @@ END
     } else {
         $reinit = &mt('(re-initialize course to access)');
     }  
-    $line.='
-  <td>
-    '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
-  </td>
-  <td>
-    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.$reinit.'</span>').$external."
-  </td>";
+    $line.='<td>';
+    if ($url=~m{/adm/coursedocs}) {
+       $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
+    } elsif ($url) {
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
+                                             '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+    } else {
+       $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
+    }
+    $line.='</td><td>';
+    if ($url=~m{/adm/coursedocs}) {
+       $line.='<a href="'.$url.'">'.$title.'</a>';
+    } elsif ($url) {
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
+                                             $title,600,500);
+    } else {
+       $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
+    }
+    $line.=$external."</td>";
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
@@ -2876,9 +2887,16 @@ sub handler {
 # Do we directly jump somewhere?
 
    if ($env{'form.command'} eq 'direct') {
-       my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
-       if ($resurl=~/\.(sequence|page)$/) {
-           $mapurl=$resurl;
+       my ($mapurl,$id,$resurl);
+       if ($env{'form.symb'} eq '') {
+           $mapurl = $env{'course.'.$env{'request.course.id'}.'.url'};
+       } else {
+           ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
+           if ($resurl=~/\.(sequence|page)$/) {
+               $mapurl=$resurl;
+           } elsif ($resurl eq 'adm/navmaps') {
+               $mapurl=$env{'course.'.$env{'request.course.id'}.'.url'};
+           }
        }
        my $mapresobj;
        my $navmap = Apache::lonnavmaps::navmap->new();