--- loncom/interface/londocs.pm 2012/10/31 12:54:13 1.501 +++ loncom/interface/londocs.pm 2012/11/14 00:18:53 1.506 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.501 2012/10/31 12:54:13 raeburn Exp $ +# $Id: londocs.pm,v 1.506 2012/11/14 00:18:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1828,6 +1828,18 @@ sub editor { if (defined($item)) { my ($name,$url,$residx)= map {&unescape($_)} split(/\=/,$item); + if ($url=~ m{^\Q/uploaded/$coursedom/$coursenum/\E(default|supplemental)_new\.(sequence|page)$}) { + my ($suffix,$errortxt,$locknotfreed) = + &newmap_suffix($1,$2,$coursedom,$coursenum); + if ($locknotfreed) { + $r->print($locknotfreed); + } + if ($suffix) { + $url =~ s/_new\./_$suffix./; + } else { + return $errortxt; + } + } push(@imports, [$name, $url, $residx]); } } @@ -1949,7 +1961,7 @@ sub editor { &Apache::lonhtmlcommon::add_item_funclist( ''. - ''.$funcname.''. + ''.$funcname.''. ''.$funcname.''). &Apache::lonhtmlcommon::end_funclist())); } @@ -2151,9 +2163,13 @@ sub entryline { $esc_path=&escape($env{'form.pagepath'}); $path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"'); } + my $isexternal; if (!$supplementalflag && $residx) { my $currurl = $url; $currurl =~ s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; + if ($currurl =~ m{^/adm/wrapper/ext/}) { + $isexternal = 1; + } my $path = 'uploaded/'. $env{'course.'.$env{'request.course.id'}.'.domain'}.'/'. $env{'course.'.$env{'request.course.id'}.'.num'}.'/'; @@ -2269,8 +2285,8 @@ sub entryline { |/aboutme$ |/navmaps$ |/bulletinboard$ - |\.html$ - |^/adm/wrapper/ext)}x)) { + |\.html$)}x) + || $isexternal) { $skip_confirm = 1; } @@ -2467,13 +2483,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').''; @@ -2536,6 +2553,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() @@ -3536,6 +3577,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', @@ -3635,26 +3677,30 @@ IMSFORM FUFORM - my $simpleeditdefaultform=(< + my $importpubform=(< + $lt{'impm'}$help{'Load_Map'} +
+ +
+ SEDFFORM - my @simpleeditdefaultforma = ( + my @importpubforma = ( { ''.$lt{srch}.'' => "$uploadtag$lt{'srch'}" }, { ''.$lt{impo}.'' => "$lt{'impo'}$help{'Importing_LON-CAPA_Resource'}" }, { ''.$lt{lnks}.'' => "$lt{'lnks'}" }, + { ''.$lt{impm}.'' => $importpubform } ); - $simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma)); - $simpleeditdefaultform .=(< - $lt{'copm'}
-
- - $help{'Load_Map'} - -SEDFFORM + $importpubform = &create_form_ul(&create_list_elements(@importpubforma)); my $extresourcesform=(<$lt{'extr'}$help{'Adding_External_Resource'} @@ -3730,10 +3776,8 @@ HIDDENFORM } else { #$postexec='self.close();'; } - my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. - '.sequence'; - my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. - '.page'; + my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.sequence'; + my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_new.page'; my $container='sequence'; if ($env{'form.pagepath'}) { $container='page'; @@ -3920,7 +3964,7 @@ NGFFORM my %orderhash = ( 'aa' => ['Import Content',$fileuploadform], - 'bb' => ['Published Content',$simpleeditdefaultform], + 'bb' => ['Published Content',$importpubform], 'cc' => ['Grading Resources',$gradingform], ); unless ($env{'form.pagepath'}) { @@ -3959,8 +4003,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'},'<>&"'); @@ -4562,10 +4605,22 @@ function toggleUpload(caller) { } document.getElementById('upload'+blocks[i]+'form').style.display=disp; } - resize_scrollbox('contentscroll','1','0'); + resize_scrollbox('contentscroll','1','1'); return; } +function toggleMap() { + var disp = 'none'; + var curr = document.getElementById('importmapform').style.display; + if (curr == 'none') { + disp='block'; + } + document.getElementById('importmapform').style.display=disp; + resize_scrollbox('contentscroll','1','1'); + return; +} + + function extUrlPreview(caller) { if (document.getElementById(caller)) { var url = document.getElementById(caller).value; @@ -4768,6 +4823,7 @@ function showPage(current, pageId, nav, currentData.style.display = 'block'; activeTab = pageId; toggleUpload(); + toggleMap(); if (nav == 'mainnav') { var storedpath = "$docs_folderpath"; if (storedpath == '') {