$lt{'rn'}
+ENDREN
$form_start = '
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').'';
@@ -2536,6 +2566,30 @@ ENDPARMS
return $line;
}
+sub newmap_suffix {
+ my ($area,$container,$coursedom,$coursenum) = @_;
+ my ($prefix,$idtype,$errtext,$locknotfreed);
+ $prefix = 'docs';
+ if ($area eq 'supplemental') {
+ $prefix = 'supp';
+ }
+ $prefix .= $container;
+ $idtype = 'concat';
+ my ($suffix,$freedlock,$error) =
+ &Apache::lonnet::get_timebased_id($prefix,'num','uploadedmaps',
+ $coursedom,$coursenum);
+ if (!$suffix) {
+ $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.');
+ if ($error) {
+ $errtext .= '
'.$error;
+ }
+ }
+ if ($freedlock ne 'ok') {
+ $locknotfreed = ''.&mt('There was a problem removing a lockfile. This will prevent creation of additional folders or composite pages in this course. Please contact the domain coordinator for your LON-CAPA domain.').'
';
+ }
+ return ($suffix,$errtext,$locknotfreed);
+}
+
=pod
=item tiehash()
@@ -3733,9 +3787,9 @@ HIDDENFORM
} else {
#$postexec='self.close();';
}
- my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
+ my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence';
'.sequence';
- my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
+ my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page';
'.page';
my $container='sequence';
if ($env{'form.pagepath'}) {
@@ -3963,8 +4017,7 @@ unless ($env{'form.pagepath'}) {
$env{'form.pagepath'} = '';
if ($allowed) {
my $folderseq=
- '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
- '.sequence';
+ '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_new.sequence';
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
@@ -4782,6 +4835,7 @@ function showPage(current, pageId, nav,
currentData.style.display = 'block';
activeTab = pageId;
toggleUpload();
+ toggleMap();
if (nav == 'mainnav') {
var storedpath = "$docs_folderpath";
if (storedpath == '') {