--- loncom/interface/londocs.pm	2005/06/09 18:01:29	1.183
+++ loncom/interface/londocs.pm	2005/06/10 16:56:08	1.186
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.183 2005/06/09 18:01:29 www Exp $
+# $Id: londocs.pm,v 1.186 2005/06/10 16:56:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1077,7 +1077,7 @@ sub editor {
                 if ($cmd eq 'del') {
 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
 		    if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
-			unless ($url=~/\.(page|sequence)$/) {
+			unless ($url=~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/) {
 			    &Apache::lonnet::removeuploadedurl($url);
 			}
 		    }
@@ -1867,15 +1867,15 @@ sub changewarning {
     if (!defined($message)) {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
-    $r->print(
-'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
-'<form name="reinit" method="post" action="/adm/roles" target="loncapaclient">'.
+    $r->print("\n\n".
+'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
+'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.
 '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
 &mt($message,' <input type="hidden" name="'.
     $env{'request.role'}.'" value="1" /><input type="button" value="'.
     &mt('re-initializing course').'" onClick="reinit(this.form)" />').
-$help{'Caching'}.'</font></h3></form>');
+$help{'Caching'}.'</font></h3></form>'."\n\n");
 }
 
 # ================================================================ Main Handler
@@ -2120,7 +2120,7 @@ function removeres(folderpath,index,oldt
 }
 
 function cutres(folderpath,index,oldtitle,container,pagesymb) {
-    if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible,\\neven if it is pasted in again elsewhere!\\nCut "'+oldtitle+'"?')) {
+    if (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;
         if (container == 'sequence') {
@@ -2169,6 +2169,7 @@ ENDNEWSCRIPT
                 'impo' => 'Import',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
+                'reco' => 'Recover Deleted Resources',
                 'newf' => 'New Folder',
                 'newp' => 'New Composite Page',
                 'extr' => 'External Resource',
@@ -2259,7 +2260,11 @@ ENDCOURSEVERIFY
                      '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.page';
-
+	my $container='sequence';
+	if ($env{'form.pagepath'}) {
+	    $container='page';
+	}
+	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
        $r->print(<<ENDFORM);
 <table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">$lt{'uplm'}</th>
@@ -2300,6 +2305,10 @@ value="$lt{'selm'}"> <input type="submit
 $help{'Load_Map'}</nobr>
 </p>
 </form>
+<hr />
+<form action="/adm/groupsort" method="post" name="recover">
+<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1)" value="$lt{'reco'}" />
+</form>
 ENDFORM
        unless ($env{'form.pagepath'}) {
 	   $r->print(<<ENDFORM);