--- loncom/interface/londocs.pm 2013/01/10 17:12:22 1.484.2.24
+++ loncom/interface/londocs.pm 2013/01/09 04:31:57 1.529
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.484.2.24 2013/01/10 17:12:22 raeburn Exp $
+# $Id: londocs.pm,v 1.529 2013/01/09 04:31:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -152,7 +152,7 @@ sub dumpcourse {
$r->print(&endContentScreen());
return '';
}
- my ($ca,$cd)=split(/\:/,$env{'form.authorspace'});
+ my ($ca,$cd)=split(/\@/,$env{'form.authorspace'});
$r->print('
'.&mt('Copying Files').'
');
my $title=$env{'form.authorfolder'};
$title=&clean($title);
@@ -337,7 +337,7 @@ sub group_import {
);
&apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated);
if (keys(%import_errors) > 0) {
- $fixuperrors =
+ $fixuperrors =
''."\n".
&mt('The following files are either dependencies of a web page or references within a folder and/or composite page for which errors occurred during import:')."\n".
'
'."\n";
@@ -1066,7 +1066,7 @@ sub do_paste_from_buffer {
copies => \%copies,
docmoves => \%docmoves,
mapmoves => \%mapmoves,
- );
+ );
$result =
&apply_fixups($folder,$is_map,$coursedom,$coursenum,$errors,
\%updated,\%info,\%moves,$prefixchg,$oldurl,$url,'paste');
@@ -1872,7 +1872,7 @@ sub editor {
push(@imports, [$name, $url, $residx]);
}
}
- ($errtext,$fatal,my $fixuperrors) =
+ ($errtext,$fatal,my $fixuperrors) =
&group_import($coursenum, $coursedom, $folder,$container,
'londocs',@imports);
return $errtext if ($fatal);
@@ -3158,6 +3158,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";
@@ -3304,11 +3305,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') {
@@ -4416,8 +4417,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 {