--- loncom/interface/londocs.pm	2011/10/23 23:46:02	1.461
+++ loncom/interface/londocs.pm	2011/12/21 23:23:08	1.469
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.461 2011/10/23 23:46:02 www Exp $
+# $Id: londocs.pm,v 1.469 2011/12/21 23:23:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,7 +176,7 @@ sub dumpcourse {
 	    $newfilename=&clean($newfilename);
 	    $newfilename.='.'.$ext;
 	    my @dirs=split(/\//,$newfilename);
-	    my $path='/home/httpd/html/priv/'.$cd.'/'.$ca;
+	    my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
 	    my $makepath=$path;
 	    my $fail=0;
 	    for (my $i=0;$i<$#dirs;$i++) {
@@ -1577,7 +1577,7 @@ sub handle_edit_cmd {
 
     if ($cmd eq 'del') {
 	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
-	    ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+	    ($url!~/$LONCAPA::assess_page_seq_re/)) {
 	    &Apache::lonnet::removeuploadedurl($url);
 	} else {
 	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
@@ -2200,13 +2200,23 @@ 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.'&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.'&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',
@@ -2631,7 +2641,7 @@ ENDHEADERS
                     $r->print(' <a href="/adm/diff?filename='.
 			      &Apache::lonnet::clutter($root.'.'.$extension).
 			      '&versionone='.$prevvers.
-			      '">'.&mt('Diffs').'</a>');
+			      '" target="diffs">'.&mt('Diffs').'</a>');
 		}
 		$r->print('</span><br />');
                 if (++$entries_count % $entries_per_col == 0) {
@@ -2845,7 +2855,8 @@ sub handler {
 #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['folderpath','pagepath',
-                                             'pagesymb','forcesupplement','forcestandard']);
+                                             'pagesymb','forcesupplement','forcestandard',
+                                             'symb','command']);
 
 # standard=1: this is a "new-style" course with an uploaded map as top level
 # standard=2: this is a "old-style" course, and there is nothing we can do
@@ -2872,12 +2883,78 @@ sub handler {
     my $containertag;
     my $uploadtag;
 
+# Do we directly jump somewhere?
+
+   if ($env{'form.command'} eq 'direct') {
+       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();
+       if (ref($navmap)) {
+           $mapresobj = $navmap->getResourceByUrl($mapurl);
+       }
+       $mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1};
+       my $type=$2;
+       my $path;
+       if (ref($mapresobj)) {
+           my $pcslist = $mapresobj->map_hierarchy();
+           if ($pcslist ne '') {
+               foreach my $pc (split(/,/,$pcslist)) {
+                   next if ($pc <= 1);
+                   my $res = $navmap->getByMapPc($pc);
+                   if (ref($res)) {
+                       my $thisurl = $res->src();
+                       $thisurl=~s{^.*/([^/]+)\.\w+$}{$1}; 
+                       my $thistitle = $res->title();
+                       $path .= '&'.
+                                &Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
+                                &Apache::lonhtmlcommon::entity_encode($thistitle).
+                                ':'.$res->randompick().
+                                ':'.$res->randomout().
+                                ':'.$res->encrypted().
+                                ':'.$res->randomorder();
+                   }
+               }
+           }
+           $path .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                    &Apache::lonhtmlcommon::entity_encode($mapresobj->title()).
+                    ':'.$mapresobj->randompick().
+                    ':'.$mapresobj->randomout().
+                    ':'.$mapresobj->encrypted().
+                    ':'.$mapresobj->randomorder();
+       } else {
+           my $maptitle = &Apache::lonnet::gettitle($mapurl);
+           $path = '&default&...::::'.
+               '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+               &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
+       }
+       $path = 'default&'.
+               &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
+               $path;
+       if ($type eq 'sequence') {
+           $env{'form.folderpath'}=$path;
+           $env{'form.pagepath'}='';
+       } else {
+           $env{'form.pagepath'}=$path;
+           $env{'form.folderpath'}='';
+       }
+   }
+
 # Where do we store these for when we come back?
     my $stored_folderpath='docs_folderpath';
     if ($supplementalflag) {
        $stored_folderpath='docs_sup_folderpath';
     }
-       
+
 # No folderpath, no pagepath, see if we have something stored
     if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,