--- loncom/interface/londocs.pm 2012/12/13 00:51:34 1.484.2.12
+++ loncom/interface/londocs.pm 2012/12/13 02:35:08 1.484.2.14
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.484.2.12 2012/12/13 00:51:34 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.14 2012/12/13 02:35:08 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2467,13 +2467,14 @@ $form_common.'
EXTLNK
} else {
- my ($cfile,$home,$switchserver,$uploaded) =
- &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom);
+ my ($cfile,$home,$switchserver,$forceedit,$forceview) =
+ &Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url);
if (($cfile ne '') && ($symb ne '')) {
my $jscall =
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home,
$switchserver,
- $uploaded,$symb);
+ $forceedit,
+ undef,$symb);
if ($jscall) {
$editlink = ' '.&mt('Edit').'';
@@ -3533,6 +3534,7 @@ sub handler {
'srch' => 'Search',
'impo' => 'Import',
'lnks' => 'Import from Stored Links',
+ 'impm' => 'Import from Assembled Map',
'selm' => 'Select Map',
'load' => 'Load Map',
'reco' => 'Recover Deleted Documents',
@@ -3632,26 +3634,31 @@ IMSFORM
FUFORM
- my $simpleeditdefaultform=(<
-
+ my $importpubform=(<