--- loncom/interface/londocs.pm 2007/07/12 23:56:29 1.289 +++ loncom/interface/londocs.pm 2007/07/13 23:08:07 1.291 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.289 2007/07/12 23:56:29 albertel Exp $ +# $Id: londocs.pm,v 1.291 2007/07/13 23:08:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1259,9 +1259,23 @@ sub do_paste_from_buffer { &Apache::lonnet::getfile($url)); $url = $newurl; } +# published maps can only exists once, so remove it from paste buffer when done if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) { &Apache::lonnet::delenv('docs\\.markedcopy'); } + if ($url=~ m{/smppg$}) { + my $db_name = &Apache::lonsimplepage::get_db_name($url); + if ($db_name =~ /^smppage_/) { + #simple pages, need to copy the db contents to a new one. + my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum); + my $now = time(); + $db_name =~ s{_\d*$ }{_$now}x; + my $result=&Apache::lonnet::put($db_name,\%contents, + $coursedom,$coursenum); + $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x; + $title=&mt('Copy of').' '.$title; + } + } $title = &LONCAPA::map::qtunescape($title); my $ext='false'; if ($url=~m{^http(|s)://}) { $ext='true'; } @@ -1798,6 +1812,18 @@ sub entryline { my $copylink=' '; my $cutlink=' '; + my $skip_confirm = 0; + if ( $folder =~ /^supplemental/ + || ($url =~ m{( /smppg$ + |/syllabus$ + |/aboutme$ + |/navmaps$ + |/bulletinboard$ + |\.html$ + |^/adm/wrapper/ext)}x)) { + $skip_confirm = 1; + } + if (!$nocopy) { $copylink=(<$lt{'cp'} @@ -1805,7 +1831,7 @@ ENDCOPY } if (!$nocut) { $cutlink=(<$lt{'ct'} +$lt{'ct'} ENDCUT } $form_start = (< - $lt{'rm'} + $lt{'rm'} $cutlink $lt{'rn'} $copylink @@ -3249,8 +3275,8 @@ function changename(folderpath,index,old } } -function removeres(folderpath,index,oldtitle,container,pagesymb) { - if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) { +function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) { + if (skip_confirm || confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) { this.document.forms.renameform.markcopy.value=-1; this.document.forms.renameform.cmd.value='del_'+index; if (container == 'sequence') { @@ -3264,8 +3290,8 @@ function removeres(folderpath,index,oldt } } -function cutres(folderpath,index,oldtitle,container,pagesymb,folder) { - if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) { +function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) { + if (skip_confirm || confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) { this.document.forms.renameform.cmd.value='cut_'+index; this.document.forms.renameform.markcopy.value=index; this.document.forms.renameform.copyfolder.value=folder+'.'+container;