--- loncom/interface/londocs.pm 2013/01/09 17:17:27 1.484.2.22 +++ loncom/interface/londocs.pm 2013/01/09 04:01:16 1.528 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.484.2.22 2013/01/09 17:17:27 raeburn Exp $ +# $Id: londocs.pm,v 1.528 2013/01/09 04:01:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3072,6 +3072,7 @@ sub startContentScreen { if (($mode eq 'navmaps') || ($mode eq 'supplemental')) { $output .= '    '.&mt('Content Overview').'    '."\n"; $output .= '     '.&mt('Content Search').'     '."\n"; + $output .= '      '.&mt('Content Index').'      '."\n"; $output .= '
  • '.&mt('Supplemental Content').'
  • '; } else { $output .= '
  •       '.&mt('Content Editor').'      
  • '."\n"; @@ -3218,11 +3219,11 @@ sub handler { if ($env{'form.symb'} ne '') { $env{'form.folderpath'}= &Apache::loncommon::symb_to_docspath($env{'form.symb'}); - &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => + &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}.'_'.$env{'form.symb'}}); } elsif ($env{'form.supppath'} ne '') { $env{'form.folderpath'}=$env{'form.supppath'}; - &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => + &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}.'_'.$env{'form.supppath'}}); } } elsif ($env{'form.command'} eq 'editdocs') { @@ -3240,6 +3241,7 @@ sub handler { &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/menu'}); } + # Where do we store these for when we come back? my $stored_folderpath='docs_folderpath'; if ($supplementalflag) { @@ -4329,8 +4331,8 @@ sub editing_js { my $toplevelsupp = &supplemental_base(); my $backtourl; - if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { - my $caller = $1; + if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { + my $caller = $1; if ($caller =~ /^supplemental/) { $backtourl = '/adm/supplemental?folderpath='.&escape($caller); } else {