--- loncom/interface/londocs.pm	2007/07/13 23:08:07	1.291
+++ loncom/interface/londocs.pm	2008/12/10 21:46:58	1.318
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.291 2007/07/13 23:08:07 albertel Exp $
+# $Id: londocs.pm,v 1.318 2008/12/10 21:46:58 kaisler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,8 @@
 # http://www.lon-capa.org/
 #
 
+
+
 package Apache::londocs;
 
 use strict;
@@ -53,15 +55,10 @@ my %alreadyseen=();
 
 my $hadchanges;
 
-# Available help topics
 
 my %help=();
 
-# Mapread read maps into LONCAPA::map:: global arrays 
-# @order and @resources, determines status
-# sets @order - pointer to resources in right order
-# sets @resources - array with the resources with correct idx
-#
+
 
 sub mapread {
     my ($coursenum,$coursedom,$map)=@_;
@@ -81,7 +78,7 @@ sub storemap {
     return ($errtext,0);
 }
 
-# ----------------------------------------- Return hash with valid author names
+
 
 sub authorhosts {
     my %outhash=();
@@ -116,7 +113,7 @@ sub authorhosts {
     }
     return ($home,$other,%outhash);
 }
-# ------------------------------------------------------ Generate "dump" button
+
 
 sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();
@@ -141,7 +138,8 @@ sub clean {
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
     return $title;	
 }
-# -------------------------------------------------------- Actually dump course
+
+
 
 sub dumpcourse {
     my ($r) = @_;
@@ -228,11 +226,19 @@ sub dumpcourse {
 	my $title=$origcrsdata{'description'};
 	$title=~s/[\/\s]+/\_/gs;
 	$title=&clean($title);
-	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
+	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3>'
+                 .'<input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
 	&tiehash();
-	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');
+	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3>'
+                 .&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table_header_row()
+                 .'<th>'.&mt('Internal Filename').'</th>'
+                 .'<th>'.&mt('Title').'</th>'
+                 .'<th>'.&mt('Save as ...').'</th>'
+                 .&Apache::loncommon::end_data_table_header_row());
 	foreach (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
-	    $r->print('<tr><td>'.$_.'</td>');
+	    $r->print(&Apache::loncommon::start_data_table_row()
+                     .'<td>'.$_.'</td>');
 	    my ($ext)=($_=~/\.(\w+)$/);
 	    my $title=$hash{'title_'.$hash{
 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
@@ -245,16 +251,17 @@ sub dumpcourse {
 	    $title=~s/\.(\w+)$//;
 	    $title=&clean($title);
 	    $title.='.'.$ext;
-	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
+	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td>"
+                     .&Apache::loncommon::end_data_table_row());
 	}
-	$r->print("</table>\n");
+	$r->print(&Apache::loncommon::end_data_table());
 	&untiehash();
 	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump [_1] DOCS',$type).'" /></p></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $type DOCS").'" /></p></form>');
     }
 }
 
-# ------------------------------------------------------ Generate "export" button
+
 
 sub exportbutton {
     my $type = &Apache::loncommon::course_type();
@@ -264,6 +271,8 @@ sub exportbutton {
     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
 }
 
+
+
 sub exportcourse {
     my $r=shift;
     my $type = &Apache::loncommon::course_type();
@@ -309,10 +318,10 @@ sub exportcourse {
                 chdir $cwd;
                 $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
                 if ($copyresult) {
-                    $outcome .= 'The following errors occurred during export - '.$copyresult;
+                    $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult);
                 }
             } else {
-                $outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />';
+                $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
             }
         }
         $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
@@ -818,7 +827,7 @@ sub extract_media {
         $dirpath = $url;
         $container = '';
     }
-    &Apache::lonnet::extract_embedded_items(undef,undef,\%allfiles,\%codebase,$content);
+    &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,$content);
     foreach my $embed_file (keys(%allfiles)) {
         my $filename;
         if ($embed_file =~ m#([^/]+)$#) {
@@ -902,8 +911,7 @@ sub store_template {
     }
 }
 
-# Imports the given (name, url) resources into the course
-# coursenum, coursedom, and folder must precede the list
+
 sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
 
@@ -924,7 +932,7 @@ sub group_import {
             my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                 'output',$1.$2);
             if ($result != m|^/uploaded/|) {
-                $errtext.='Map not saved: A network error occured when trying to save the new map. ';
+                $errtext.='Map not saved: A network error occurred when trying to save the new map. ';
                 $fatal = 2;
             }
             if ($fatal) {
@@ -949,7 +957,7 @@ sub group_import {
 }
 
 sub breadcrumbs {
-    my ($where)=@_;
+    my ($where,$allowed,$type)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders);
     if ($env{'form.pagepath'}) {
@@ -963,23 +971,32 @@ sub breadcrumbs {
     my $randompick=-1;
     my $isencrypted=0;
     my $ishidden=0;
+    my $is_random_order=0;
     while (@folders) {
 	my $folder=shift(@folders);
-	my $foldername=shift(@folders);
+    	my $foldername=shift(@folders);
 	if ($folderpath) {$folderpath.='&';}
 	$folderpath.=$folder.'&'.$foldername;
 	my $url='/adm/coursedocs?folderpath='.
 	    &escape($folderpath);
-            my $name=&unescape($foldername);
-# randompick number, hidden, encrypted is appended with ":"s to the foldername	
-            $name=~s/\:(\d*)\:(\w*)\:(\w*)$//;
-            if ($1 ne '') { 
+	    my $name=&unescape($foldername);
+# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername	
+ 	    $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
+	    if ($1 ne '') { 
                $randompick=$1;
             } else {
                $randompick=-1;
             }
             if ($2) { $ishidden=1; }
             if ($3) { $isencrypted=1; }
+	    if ($4 ne '') { $is_random_order = 1; }
+            if ($folder eq 'supplemental') {
+                if ($allowed) {
+                    $name = &mt('Supplemental '.$type.' Documents');
+                } else {
+                    $name = &mt($type.' Documents');
+                }
+            }
 	    &Apache::lonhtmlcommon::add_breadcrumb(
 		      {'href'=>$url.$cpinfo,
 		       'title'=>$name,
@@ -991,7 +1008,7 @@ sub breadcrumbs {
     }
     $plain=~s/\&gt\;\s*$//;
     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
-					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain);
+					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
 }
 
 sub log_docs {
@@ -1056,9 +1073,9 @@ sub log_docs {
 }
 
 
-#
-# Docs Change Log
-#
+
+
+
 sub docs_change_log {
     my ($r)=@_;
     my $folder=$env{'form.folder'};
@@ -1082,6 +1099,7 @@ sub docs_change_log {
     my %lt=('hiddenresource' => 'Resources hidden',
 	    'encrypturl'     => 'URL hidden',
 	    'randompick'     => 'Randomly pick',
+	    'randomorder'    => 'Randomly ordered',
 	    'set'            => 'set to',
 	    'del'            => 'deleted');
     $r->print(&Apache::loncommon::display_filter().
@@ -1164,7 +1182,7 @@ sub docs_change_log {
 	$r->print('</ul>');
 	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
 	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
-	    foreach my $parameter ('randompick','hiddenresource','encrypturl') {
+	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
 		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
 		    $r->print('<li>'.
 			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
@@ -1198,12 +1216,15 @@ sub update_paste_buffer {
 # Mark for copying
     my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
     if (&is_supplemental_title($title)) {
+        &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
 	($title) = &parse_supplemental_title($title);
+    } elsif ($env{'docs.markedcopy_supplemental'}) {
+        &Apache::lonnet::delenv('docs\\.markedcopy_supplemental');
     }
     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
 
-    &Apache::lonnet::appenv('docs.markedcopy_title' => $title,
-			    'docs.markedcopy_url'   => $url);
+    &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
+			    'docs.markedcopy_url'   => $url});
     delete($env{'form.markcopy'});
 }
 
@@ -1224,9 +1245,13 @@ ENDPASTE
 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
     }  else {
 	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
-	my $type = &Apache::loncommon::filedescription($extension);
-	my $icon = '<img src="'.&Apache::loncommon::icon($extension).
-	    '" alt="" class="LC_icon" />';
+	my $icon = &Apache::loncommon::icon($extension);
+	if ($extension eq 'sequence' &&
+	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
+	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+	    $icon .= '/folder_closed.gif';
+	}
+	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
 	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
     }
     if ($container eq 'page') {
@@ -1243,7 +1268,10 @@ ENDPASTE
 }
 
 sub do_paste_from_buffer {
-    my ($coursenum,$coursedom,$folder,$container) = @_;
+    my ($coursenum,$coursedom,$folder) = @_;
+
+    return 0 if (!$env{'form.pastemarked'});
+
 # paste resource to end of list
     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
@@ -1282,21 +1310,107 @@ sub do_paste_from_buffer {
     $url       = &LONCAPA::map::qtunescape($url);
 # Now insert the URL at the bottom
     my $newidx = &LONCAPA::map::getresidx($url);
+    if ($env{'docs.markedcopy_supplemental'}) {
+        if ($folder =~ /^supplemental/) {
+            $title = $env{'docs.markedcopy_supplemental'};
+        } else {
+            (undef,undef,$title) = 
+                &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+        }
+    } else {
+        if ($folder=~/^supplemental/) {
+           $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                  $env{'user.domain'}.'___&&&___'.$title;
+        }
+    }
+
     $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
     push(@LONCAPA::map::order, $newidx);
 # Store the result
-    return &storemap($coursenum,$coursedom,$folder.'.'.$container);
 }
 
-sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;
-    my $errtext='';
-    my $fatal=0;
-    my $container='sequence';
-    if ($env{'form.pagepath'}) {
-        $container='page';
+my %parameter_type = ( 'randompick'     => 'int_pos',
+		       'hiddenresource' => 'string_yesno',
+		       'encrypturl'     => 'string_yesno',
+		       'randomorder'    => 'string_yesno',);
+my $valid_parameters_re = join('|',keys(%parameter_type));
+# set parameters
+sub update_parameter {
+
+    return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
+
+    my $which = $env{'form.changeparms'};
+    my $idx = $env{'form.setparms'};
+    if ($env{'form.'.$which.'_'.$idx}) {
+	my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx}
+	                                     : 'yes';
+	&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
+				      $parameter_type{$which});
+	&remember_parms($idx,$which,'set',$value);
+    } else {
+	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
+	
+	&remember_parms($idx,$which,'del');
+    }
+    return 1;
+}
+
+
+sub handle_edit_cmd {
+    my ($coursenum,$coursedom) =@_;
+
+    my ($cmd,$idx)=split('_',$env{'form.cmd'});
+
+    my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
+    my ($title, $url, @rrest) = split(':', $ratstr);
+
+    if ($cmd eq 'del') {
+	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+	    ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+	    &Apache::lonnet::removeuploadedurl($url);
+	} else {
+	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+	}
+	splice(@LONCAPA::map::order, $idx, 1);
+
+    } elsif ($cmd eq 'cut') {
+	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+	splice(@LONCAPA::map::order, $idx, 1);
+
+    } elsif ($cmd eq 'up' 
+	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
+	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
+
+    } elsif ($cmd eq 'down'
+	     && defined($LONCAPA::map::order[$idx+1])) {
+	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
+
+    } elsif ($cmd eq 'rename') {
+
+	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
+	if ($comment=~/\S/) {
+	    $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
+		$comment.':'.join(':', $url, @rrest);
+	}
+# Devalidate title cache
+	my $renamed_url=&LONCAPA::map::qtescape($url);
+	&Apache::lonnet::devalidate_title_cache($renamed_url);
+    } else {
+	return 0;
     }
-    ($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container);
+    return 1;
+}
+
+sub editor {
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
+
+    my $container= ($env{'form.pagepath'}) ? 'page'
+		                           : 'sequence';
+
+    my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+				    $folder.'.'.$container);
+    return $errtext if ($fatal);
+
     if ($#LONCAPA::map::order<1) {
 	my $idx=&LONCAPA::map::getresidx();
 	if ($idx<=0) { $idx=1; }
@@ -1304,235 +1418,113 @@ sub editor {
         $LONCAPA::map::resources[$idx]='';
     }
     
-    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder);
+    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
+	&breadcrumbs($folder,$allowed,$type);
     $r->print($breadcrumbtrail);
-    if ($fatal) {
-	   $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-    } else {
+    
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
-	if (($allowed) && ($env{'form.folder'} eq $folder)) {
+    if (($allowed) && ($env{'form.folder'} eq $folder)) {
 # set parameters and change order
-            &snapshotbefore();
-	    if ($env{'form.changeparms'}) {
-		my $idx=$env{'form.setparms'};
-# set parameters
-		if ($env{'form.changeparms'} eq 'randompick') {
-		    if ($env{'form.randpick_'.$idx}) {
-			&LONCAPA::map::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
-			&remember_parms($idx,'randompick','set',$env{'form.randpick_'.$idx});
-		    } else {
-			&LONCAPA::map::delparameter($idx,'parameter_randompick');
-			&remember_parms($idx,'randompick','del');
-		    }
-		}
-		if ($env{'form.changeparms'} eq 'hiddenresource') {
-		    if ($env{'form.hidprs_'.$idx}) {
-			&LONCAPA::map::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
-			&remember_parms($idx,'hiddenresource','set',$env{'form.hidprs_'.$idx});
-		    } else {
-			&LONCAPA::map::delparameter($idx,'parameter_hiddenresource');
-			&remember_parms($idx,'hiddenresource','del');
-		    }
-		}
-		if ($env{'form.changeparms'} eq 'encrypturl') {
-		    if ($env{'form.encprs_'.$idx}) {
-			&LONCAPA::map::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
-			&remember_parms($idx,'encrypturl','set',$env{'form.encprs_'.$idx});
-		    } else {
-			&LONCAPA::map::delparameter($idx,'parameter_encrypturl');
-			&remember_parms($idx,'encrypturl','del');
-		    }
-		}
-# store the changed version
-		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
-		if ($fatal) {
-		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-		    return;
-		}
-	    }
+	&snapshotbefore();
 
-	    if ($env{'form.newpos'}) {
+	if (&update_parameter()) {
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+	    return $errtext if ($fatal);
+	}
+
+	if ($env{'form.newpos'} && $env{'form.currentpos'}) {
 # change order
-		my $newpos=$env{'form.newpos'}-1;
-		my $currentpos=$env{'form.currentpos'}-1;
-		my $i;
-		my @neworder=();
-		if ($newpos>$currentpos) {
-# moving stuff up
-		    for ($i=0;$i<$currentpos;$i++) {
-			$neworder[$i]=$LONCAPA::map::order[$i];
-		    }
-		    for ($i=$currentpos;$i<$newpos;$i++) {
-			$neworder[$i]=$LONCAPA::map::order[$i+1];
-		    }
-		    $neworder[$newpos]=$LONCAPA::map::order[$currentpos];
-		    for ($i=$newpos+1;$i<=$#LONCAPA::map::order;$i++) {
-			$neworder[$i]=$LONCAPA::map::order[$i];
-		    }
-		} else {
-# moving stuff down
-		    for ($i=0;$i<$newpos;$i++) {
-			$neworder[$i]=$LONCAPA::map::order[$i];
-		    }
-		    $neworder[$newpos]=$LONCAPA::map::order[$currentpos];
-		    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
-			$neworder[$i]=$LONCAPA::map::order[$i-1];
-		    }
-		    for ($i=$currentpos+1;$i<=$#LONCAPA::map::order;$i++) {
-			$neworder[$i]=$LONCAPA::map::order[$i];
-		    }
-		}
-		@LONCAPA::map::order=@neworder;
-# store the changed version
-		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
-		if ($fatal) {
-		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-		    return;
-		}
-	    }
+	    my $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1);
+	    splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res);
+
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+	    return $errtext if ($fatal);
+	}
 	    
-	    if ($env{'form.pastemarked'}) {
-		my ($errtext,$fatal) =
-		    &do_paste_from_buffer($coursenum,$coursedom,$folder,
-					  $container);
-		if ($fatal) {
-		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-		    return;
+	if ($env{'form.pastemarked'}) {
+	    &do_paste_from_buffer($coursenum,$coursedom,$folder);
+	    ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
+	    return $errtext if ($fatal);
+	}
+
+	$r->print($upload_output);
+
+	if (&handle_edit_cmd()) {
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+	    return $errtext if ($fatal);
+	}
+# Group import/search
+	if ($env{'form.importdetail'}) {
+	    my @imports;
+	    foreach (split(/\&/,$env{'form.importdetail'})) {
+		if (defined($_)) {
+		    my ($name,$url,$residx)=
+			map {&unescape($_)} split(/\=/,$_);
+		    push(@imports, [$name, $url, $residx]);
 		}
 	    }
-            $r->print($upload_output);
-	    if ($env{'form.cmd'}) {
-                my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
-                if ($cmd eq 'del') {
-		    my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
-		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
-			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
-			&Apache::lonnet::removeuploadedurl($url);
-		    } else {
-			&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
-		    }
-		    for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {
-                        $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
-                    }
-                    $#LONCAPA::map::order--;
-                } elsif ($cmd eq 'cut') {
-		    my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
-		    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
-		    for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {
-                        $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
-                    }
-                    $#LONCAPA::map::order--;
-                } elsif ($cmd eq 'up') {
-		  if (($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
-                    my $i=$LONCAPA::map::order[$idx-1];
-                    $LONCAPA::map::order[$idx-1] = $LONCAPA::map::order[$idx];
-                    $LONCAPA::map::order[$idx] = $i;
-		   }
-                } elsif ($cmd eq 'down') {
-		   if (defined($LONCAPA::map::order[$idx+1])) {
-                    my $i=$LONCAPA::map::order[$idx+1];
-                    $LONCAPA::map::order[$idx+1] = $LONCAPA::map::order[$idx];
-                    $LONCAPA::map::order[$idx] = $i;
-		   }
-                } elsif ($cmd eq 'rename') {
-                    my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
-                    my ($rtitle,@rrest)=split(/\:/,
-                       $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
-                    my $comment=$env{'form.title'};
-                    $comment = &LONCAPA::map::qtunescape($comment);
-		    if ($comment=~/\S/) {
-			$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
-			    $comment.':'.join(':',@rrest);
-		    }
-# Devalidate title cache
-                    my $renamed_url=&LONCAPA::map::qtescape($rrest[0]);
-		    &Apache::lonnet::devalidate_title_cache($renamed_url);
-                }
-# Store the changed version
+	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
+					    $container,'londocs',@imports);
+	    return $errtext if ($fatal);
+	}
+# Loading a complete map
+	if ($env{'form.loadmap'}) {
+	    if ($env{'form.importmap'}=~/\w/) {
+		foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
+		    my ($title,$url,$ext,$type)=split(/\:/,$res);
+		    my $idx=&LONCAPA::map::getresidx($url);
+		    $LONCAPA::map::resources[$idx]=$res;
+		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
+		}
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
 					    $folder.'.'.$container);
-		if ($fatal) {
-		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-		    return;
-		}
-            }
-# Group import/search
-	    if ($env{'form.importdetail'}) {
-		my @imports;
-		foreach (split(/\&/,$env{'form.importdetail'})) {
-		    if (defined($_)) {
-			my ($name,$url,$residx)=
-			    map {&unescape($_)} split(/\=/,$_);
-			push(@imports, [$name, $url, $residx]);
-		    }
-		}
-# Store the changed version
-		($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
-					       $container,'londocs',@imports);
-		if ($fatal) {
-		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-		    return;
-		}
-            }
-# Loading a complete map
-	   if ($env{'form.loadmap'}) {
-               if ($env{'form.importmap'}=~/\w/) {
-	          foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
-		      my ($title,$url,$ext,$type)=split(/\:/,$_);
-                      my $idx=&LONCAPA::map::getresidx($url);
-                      $LONCAPA::map::resources[$idx]=$_;
-                      $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
-	          }
-# Store the changed version
-  	          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
-					   $folder.'.'.$container);
-	          if ($fatal) {
-		      $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-		      return;
-	          }
-               } else {
-		    $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
-
-               }
-           }
-           &log_differences($plain);
+		return $errtext if ($fatal);
+	    } else {
+		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
+		
+	    }
 	}
+	&log_differences($plain);
+    }
 # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen
-        my $idx=0;
-	my $shown=0;
-        if (($ishidden) || ($isencrypted) || ($randompick>=0)) {
-           $r->print('<p>'.&mt('Parameters').':<ul>'.
-                     ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
-                     ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
-                     ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
-                     '</ul></p>');
-        }                                                                                                     
-        if ($randompick>=0) {
-           $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
-        }
-        $r->print('<table class="LC_docs_editor">');
-        foreach my $res (@LONCAPA::map::order) {
-           my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
-	   $name=&LONCAPA::map::qtescape($name);
-	   $url=&LONCAPA::map::qtescape($url);
-           unless ($name) {  $name=(split(/\//,$url))[-1]; }
-           unless ($name) { $idx++; next; }
-           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
-				$coursenum));
-           $idx++;
-	   $shown++;
-        }
-	unless ($shown) {
-	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
-	}
-        $r->print("\n</table>\n");
-
-	&print_paste_buffer($r,$container);
-
+    my $idx=0;
+    my $shown=0;
+    if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
+	$r->print('<p>'.&mt('Parameters').':<ul>'.
+		  ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
+		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
+		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
+		  '</ul></p>');
+    }                                                                                                     
+    if ($randompick>=0) {
+	$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
+    }
+    if ($is_random_order) {
+	$r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>');
+    }
+    $r->print('<table class="LC_docs_editor">');
+    foreach my $res (@LONCAPA::map::order) {
+	my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+	$name=&LONCAPA::map::qtescape($name);
+	$url=&LONCAPA::map::qtescape($url);
+	unless ($name) {  $name=(split(/\//,$url))[-1]; }
+	unless ($name) { $idx++; next; }
+	$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
+			     $coursenum));
+	$idx++;
+	$shown++;
+    }
+    unless ($shown) {
+	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
     }
+    $r->print("\n</table>\n");
+    if ($allowed) {
+        &print_paste_buffer($r,$container);
+    }
+    return;
 }
 
 sub process_file_upload {
@@ -1612,8 +1604,8 @@ sub process_file_upload {
 
                     $$upload_output .= 
 			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
-			&ask_for_embedded_content('/adm/coursedocs',
-						  $state,$allfiles,$codebase);
+			&Apache::loncommon::ask_for_embedded_content(
+                            '/adm/coursedocs',$state,$allfiles,$codebase);
                 } else {
                     $$upload_output .= 'No embedded items identified<br />';
                 }
@@ -1623,55 +1615,6 @@ sub process_file_upload {
     return $phase_status;
 }
 
-sub ask_for_embedded_content {
-    my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
-    my $upload_output = '
-   <form name="upload_embedded" action="'.$actionurl.'"
-                  method="post" enctype="multipart/form-data">';
-    $upload_output .= $state;
-    $upload_output .= '<b>Upload embedded files</b>:<br />'.
-	&Apache::loncommon::start_data_table();
-
-    my $num = 0;
-    foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
-	$upload_output .= &Apache::loncommon::start_data_table_row().
-	    '<td>'.$embed_file.'</td><td>';
-	if ($args->{'ignore_remote_references'}
-	    && $embed_file =~ m{^\w+://}) {
-	    $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
-	} elsif ($args->{'error_on_invalid_names'}
-	    && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
-	    
-	    $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
-	    
-	} else {
-
-	    $upload_output .='
-           <input name="embedded_item_'.$num.'" type="file" value="bob" />
-           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
-	    my $attrib = join(':',@{$$allfiles{$embed_file}});
-	    $upload_output .=
-		"\n\t\t".
-		'<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
-		$attrib.'" />';
-	    if (exists($$codebase{$embed_file})) {
-		$upload_output .= 
-		    "\n\t\t".
-		    '<input name="codebase_'.$num.'" type="hidden" value="'.
-		    &escape($$codebase{$embed_file}).'" />';
-	    }
-	}
-	$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
-	$num++;
-    }
-    $upload_output .= &Apache::loncommon::end_data_table().'<br />
-   <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
-   <input type ="submit" value="'.&mt('Upload Listed Files').'" />
-   '.&mt('(only files for which a location has been provided will be uploaded)').'
-   </form>';
-    return $upload_output;
-}
-
 sub process_secondary_uploads {
     my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;
     my $folder=$env{'form.folder'};
@@ -1743,7 +1686,6 @@ sub entryline {
     my $line='<tr>';
     my ($form_start,$form_end);
 # Edit commands
-    my $container;
     my ($container, $type, $esc_path, $path, $symb);
     if ($env{'form.folderpath'}) {
 	$type = 'folder';
@@ -1796,7 +1738,7 @@ sub entryline {
 		# no copy for published maps
 		$nocopy = 1;
 	    } else {
-		foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
+		foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
 		    my ($title,$url,$ext,$type)=split(/\:/,$_);
 		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
 			$nocopy=1;
@@ -1936,7 +1878,7 @@ END
 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
 	}
     }
-    my $parameterset='&nbsp;';
+    my ($parameterset,$rand_order_text) = ('&nbsp;', '&nbsp;');
     if ($isfolder || $extension eq 'sequence') {
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
@@ -1948,15 +1890,20 @@ END
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_hiddenresource'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_encrypturl'))[0]=~/^yes$/i);
+                                              'parameter_encrypturl'))[0]=~/^yes$/i)
+                                               .':'.((&LONCAPA::map::getparameter($orderidx,
+                                              'parameter_randomorder'))[0]=~/^yes$/i);
 	$url.='folderpath='.&escape($folderpath).$cpinfo;
 	$parameterset='<label>'.&mt('Randomly Pick: ').
-	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randpick_'.$orderidx.'" value="'.
+	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
 	    (&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0].
                                               '" />'.
 '<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
-       
+    	my $ro_set=
+	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+	$rand_order_text ='
+<nobr><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></nobr>';   
     }
     if ($ispage) {
         my $pagename=&escape($pagetitle);
@@ -2000,14 +1947,15 @@ END
 	$line.=(<<ENDPARMS);
   <td class="LC_docs_entry_parameter">
     $form_start
-    <label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+    <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
     $form_end
   </td>
   <td class="LC_docs_entry_parameter">
     $form_start
-    <label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+    <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
     $form_end
   </td>
+  <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
 ENDPARMS
     }
@@ -2015,7 +1963,13 @@ ENDPARMS
     return $line;
 }
 
-# ---------------------------------------------------------------- tie the hash
+=pod
+
+=item tiehash()
+
+tie the hash
+
+=cut
 
 sub tiehash {
     my ($mode)=@_;
@@ -2041,7 +1995,8 @@ sub untiehash {
     return OK;
 }
 
-# --------------------------------------------------------------- check on this
+
+
 
 sub checkonthis {
     my ($r,$url,$level,$title)=@_;
@@ -2050,6 +2005,9 @@ sub checkonthis {
     $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
        $r->print("\n<br />");
+       if ($level==0) {
+           $r->print("<br />");
+       }
        for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');
        }
@@ -2059,7 +2017,7 @@ sub checkonthis {
 	  my $result=&Apache::lonnet::repcopy(
                               &Apache::lonnet::filelocation('',$url));
           if ($result eq 'ok') {
-             $r->print('<font color="green">'.&mt('ok').'</font>');
+             $r->print('<span class="LC_success">'.&mt('ok').'</span>');
              $r->rflush();
              &Apache::lonnet::countacc($url);
              $url=~/\.(\w+)$/;
@@ -2069,7 +2027,7 @@ sub checkonthis {
                  for (my $i=0;$i<=$level*5;$i++) {
                      $r->print('&nbsp;');
                  }
-                 $r->print('- '.&mt('Rendering').': ');
+                 $r->print('- '.&mt('Rendering:').' ');
 		 my ($errorcount,$warningcount)=split(/:/,
 	       &Apache::lonnet::ssi_body($url,
 			       ('grade_target'=>'web',
@@ -2078,13 +2036,11 @@ sub checkonthis {
                      ($warningcount)) {
 		     if ($errorcount) {
                         $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
-			  $errorcount.' '.
-				  &mt('error(s)').'</span> ');
+                          &mt('[quant,_1,error]',$errorcount).'</span>');
                      }
 		     if ($warningcount) {
                         $r->print('<span class="LC_warning">'.
-			  $warningcount.' '.
-				  &mt('warning(s)').'</span>');
+                          &mt('[quant,_1,warning]',$warningcount).'</span>');
                      }
                  } else {
                      $r->print('<span class="LC_success">'.&mt('ok').'</span>');
@@ -2102,21 +2058,27 @@ sub checkonthis {
              $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
           } elsif ($result eq 'not_found') {
 	      unless ($url=~/\$/) {
-		  $r->print('<span class="LC_error">'.&mt('not found').'</b></font>');
+		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
 	      } else {
 		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
 	      }
           } else {
              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
           }
-      }
-   }
+       }
+    }
 }
 
 
-#
-# ----------------------------------------------------------------- List Symbs
-# 
+
+=pod
+
+=item list_symbs()
+
+List Symbs
+
+=cut
+
 sub list_symbs {
     my ($r) = @_;
 
@@ -2132,9 +2094,7 @@ sub list_symbs {
 }
 
 
-#
-# -------------------------------------------------------------- Verify Content
-# 
+
 sub verifycontent {
     my ($r) = @_;
     my $type = &Apache::loncommon::course_type();
@@ -2165,8 +2125,6 @@ sub verifycontent {
 }
 
 
-# -------------------------------------------------------------- Check Versions
-
 sub devalidateversioncache {
     my $src=shift;
     &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
@@ -2469,13 +2427,12 @@ sub changewarning {
 $help{'Caching'}.'</span></h3></form>'."\n\n");
 }
 
-# =========================================== Breadcrumbs for special functions
 
 sub init_breadcrumbs {
     my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
-					    text=>&Apache::loncommon::course_type()." Documents",
+					    text=>"Edit ".&Apache::loncommon::course_type(),
 					    faq=>273,
 					    bug=>'Instructor Interface',
                                             help => 'Docs_Adding_Course_Doc'});
@@ -2485,7 +2442,9 @@ sub init_breadcrumbs {
 					    bug=>'Instructor Interface'});
 }
 
-# ================================================================ Main Handler
+
+
+
 sub handler {
     my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');
@@ -2549,6 +2508,26 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['folderpath','pagepath',
 					     'pagesymb']);
+# No folderpath, no pagepath, see if we have something stored
+    if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
+        &Apache::loncommon::restore_course_settings('docs_folderpath',
+                                              {'folderpath' => 'scalar'});
+    }
+    if (!$env{'form.folderpath'}) {
+        &Apache::loncommon::restore_course_settings('docs_folderpath',
+                                              {'pagepath' => 'scalar'});
+    }
+    if ($env{'form.pagepath'}) {
+       $env{'form.folderpath'}='';
+    }
+    if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
+        $env{'form.folderpath'} = 'supplemental&'.
+                                  &escape(&mt('Supplemental '.$type.' Documents')).'&'.
+                                  $env{'form.folderpath'};
+    }
+    &Apache::loncommon::store_course_settings('docs_folderpath',
+                                                {'pagepath' => 'scalar',
+                                                 'folderpath' => 'scalar'});
     if ($env{'form.folderpath'}) {
 	my (@folderpath)=split('&',$env{'form.folderpath'});
 	$env{'form.foldername'}=&unescape(pop(@folderpath));
@@ -2599,8 +2578,9 @@ sub handler {
     }
 # -------------------------------------------------------------------- Body tag
     $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';
+	my @brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}];
     $r->print(&Apache::loncommon::start_page("$type Documents", $script,
-					     {'force_register' => $showdoc,}).
+					     {'force_register' => $showdoc, bread_crumbs => @brcrum}).
 	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
   
   my %allfiles = ();
@@ -2610,9 +2590,13 @@ sub handler {
       if (($env{'form.uploaddoc.filename'}) &&
 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
 # Process file upload - phase one - upload and parse primary file.  
+	  undef($hadchanges);
           $upload_result = &process_file_upload(\$upload_output,$coursenum,
 						$coursedom,\%allfiles,
 						\%codebase,$1);
+	  if ($hadchanges) {
+	      &mark_hash_old();
+	  }
           if ($upload_result eq 'phasetwo') {
               $r->print($upload_output);
           }
@@ -2714,6 +2698,7 @@ sub handler {
                 'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info',
                 'grpo' => 'Group Files',
+                'rost' => 'Course Roster',
 		'abou' => 'About User',
                 'imsf' => 'Import IMS package',
                 'file' =>  'File',
@@ -2784,7 +2769,8 @@ ENDCOURSEVERIFY
 		     &mt('Editing the Table of Contents for your '.$type)));
     }
 # --------------------------------------------------------- Standard documents
-    $r->print('<table class="LC_docs_documents">');#border=2 cellspacing=4 cellpadding=4>');
+    $r->print('<table class="LC_docs_documents">');
+
     if (($standard) && ($allowed) && (!$forcesupplement)) {
 	$r->print('<tr><td class="LC_docs_document">');
 #  '<h2>'.&mt('Main Course Documents').
@@ -2793,6 +2779,8 @@ ENDCOURSEVERIFY
        if ($folder eq '' || $folder eq 'supplemental') {
            $folder='default';
 	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
+           $uploadtag = '<input type="hidden" name="folderpath" value="'.
+	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
        my $postexec='';
        if ($folder eq 'default') {
@@ -2801,7 +2789,11 @@ ENDCOURSEVERIFY
            #$postexec='self.close();';
        }
        $hadchanges=0;
-       &editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output);
+       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
+			   $upload_output,$type);
+       if ($error) {
+	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+       }
        if ($hadchanges) {
 	   &mark_hash_old()
        }
@@ -2835,7 +2827,7 @@ $uploadtag
 <br />
 <span class="LC_nobreak">
 <label>$lt{'parse'}?
-<input type="checkbox" name="parserflag" />
+<input type="checkbox" name="parserflag" checked="checked" />
 </label>
 </span>
 <br />
@@ -2915,7 +2907,7 @@ value="$lt{'newp'}" />$help{'Adding_Page
 <br /><form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag
 <input type="hidden" name="importdetail" 
-value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
 <span class="LC_nobreak">
 <input name="newsyl" type="submit" value="$lt{'syll'}" /> 
  $help{'Syllabus'}
@@ -2924,7 +2916,7 @@ value="Syllabus=/public/$coursedom/$cour
 <br /><form action="/adm/coursedocs" method="post" name="newnav">
 $uploadtag
 <input type="hidden" name="importdetail" 
-value="Navigate Content=/adm/navmaps" />
+value="$lt{'navc'}=/adm/navmaps" />
 <span class="LC_nobreak">
 <input name="newnav" type="submit" value="$lt{'navc'}" />
 $help{'Navigate_Content'}
@@ -2992,12 +2984,21 @@ onClick="javascript:makeabout();" />
 <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
 $uploadtag
 <input type="hidden" name="importdetail"
-value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
+value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
 <span class="LC_nobreak">
 <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
 $help{'Group Files'}
 </span>
 </form>
+<br /><form action="/adm/coursedocs" method="post" name="newroster">
+$uploadtag
+<input type="hidden" name="importdetail" 
+value="$lt{'rost'}=/adm/viewclasslist" />
+<span class="LC_nobreak">
+<input name="newroster" type="submit" value="$lt{'rost'}" />
+$help{'Course Roster'}
+</span>
+</form>
 ENDFORM
        }
        if ($env{'form.pagepath'}) {
@@ -3035,11 +3036,14 @@ ENDBLOCK
 	   $folder='supplemental';
        }
        if ($folder =~ /^supplemental$/ &&
-	   $env{'form.folderpath'} =~ /^default\&/) {
-	   $env{'form.folderpath'}='supplemental&'.
-	       &escape(&mt('Supplemental '.$type.' Documents'));
+	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
+          $env{'form.folderpath'} = 'supplemental&'.
+                                    &escape(&mt('Supplemental '.$type.' Documents'));
+       }
+       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+       if ($error) {
+	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
-       &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {
 	   my $folderseq=
 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
@@ -3144,10 +3148,33 @@ ENDSUPFORM
 sub editing_js {
     my ($udom,$uname) = @_;
     my $now = time();
+    my %lt = &Apache::lonlocal::texthash(
+                                          p_mnf => 'Name of New Folder',
+                                          t_mnf => 'New Folder',
+                                          p_mnp => 'Name of New Page',
+                                          t_mnp => 'New Page',
+                                          p_mxu => 'Title for the Uploaded Score',
+                                          p_msp => 'Title for the Page',
+                                          p_msb => 'Title for the Problem',
+                                          p_mdb => 'Title for the Drop Box',
+                                          p_mbb => 'Title for the Bulletin Board',
+                                          p_mab => "Enter user:domain for User's 'About Me' Page",
+                                          p_mab2 => "About [_99]",
+                                          p_mab_alrt1 => 'Not a valid user:domain',
+                                          p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
+                                          p_chn => 'New Title',
+                                          p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
+                                          p_rmr2a => 'Remove[_99]',
+                                          p_rmr2b => '?[_99]',
+                                          p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
+                                          p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
+                                          p_ctr2a => 'Cut[_98]',
+                                          p_ctr2b => '?[_98]'
+                                        );
 
     return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
-    var foldername=prompt('Name of New Folder','New Folder');
+    var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
     if (foldername) {
        targetform.importdetail.value=escape(foldername)+"="+folderseq;
         targetform.submit();
@@ -3155,7 +3182,7 @@ function makenewfolder(targetform,folder
 }
 
 function makenewpage(targetform,folderseq) {
-    var pagename=prompt('Name of New Page','New Page');
+    var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
     if (pagename) {
         targetform.importdetail.value=escape(pagename)+"="+folderseq;
         targetform.submit();
@@ -3179,7 +3206,7 @@ function edittext(targetname,residx,titl
 }
 
 function makeexamupload() {
-   var title=prompt('Listed Title for the Uploaded Score');
+   var title=prompt('$lt{"p_mxu"}');
    if (title) { 
     this.document.forms.newexamupload.importdetail.value=
 	escape(title)+'=/res/lib/templates/examupload.problem';
@@ -3188,7 +3215,7 @@ function makeexamupload() {
 }
 
 function makesmppage() {
-   var title=prompt('Listed Title for the Page');
+   var title=prompt('$lt{"p_msp"}');
    if (title) { 
     this.document.forms.newsmppg.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/$now/smppg';
@@ -3197,7 +3224,7 @@ function makesmppage() {
 }
 
 function makesmpproblem() {
-   var title=prompt('Listed Title for the Problem');
+   var title=prompt('$lt{"p_msb"}');
    if (title) { 
     this.document.forms.newsmpproblem.importdetail.value=
 	escape(title)+'=/res/lib/templates/simpleproblem.problem';
@@ -3206,7 +3233,7 @@ function makesmpproblem() {
 }
 
 function makedropbox() {
-   var title=prompt('Listed Title for the Drop Box');
+   var title=prompt('$lt{"p_mdb"}');
    if (title) { 
     this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';
@@ -3215,7 +3242,7 @@ function makedropbox() {
 }
 
 function makebulboard() {
-   var title=prompt('Listed Title for the Bulletin Board');
+   var title=prompt('$lt{"p_mbb"}');
    if (title) {
     this.document.forms.newbul.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/$now/bulletinboard';
@@ -3224,20 +3251,20 @@ function makebulboard() {
 }
 
 function makeabout() {
-   var user=prompt("Enter user:domain for User's 'About Me' Page");
+   var user=prompt("$lt{'p_mab'}");
    if (user) {
        var comp=new Array();
        comp=user.split(':');
        if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
 	   if ((comp[0]) && (comp[1])) {
 	       this.document.forms.newaboutsomeone.importdetail.value=
-		   'About '+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
 	       this.document.forms.newaboutsomeone.submit();
 	   } else {
-               alert("Not a valid user:domain");
+               alert("$lt{'p_mab_alrt1'}");
            }
        } else {
-           alert("Please enter both user and domain in the format user:domain"); 
+           alert("$lt{'p_mab_alrt2'}");
        }
    }
 }
@@ -3259,7 +3286,7 @@ function finishpick() {
 }
 
 function changename(folderpath,index,oldtitle,container,pagesymb) {
-    var title=prompt('New Title',oldtitle);
+    var title=prompt('$lt{"p_chn"}',oldtitle);
     if (title) {
 	this.document.forms.renameform.markcopy.value=-1;
 	this.document.forms.renameform.title.value=title;
@@ -3276,7 +3303,7 @@ function changename(folderpath,index,old
 }
 
 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+'"?')) {
+    if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
 	this.document.forms.renameform.markcopy.value=-1;
 	this.document.forms.renameform.cmd.value='del_'+index;
         if (container == 'sequence') {
@@ -3291,7 +3318,7 @@ function removeres(folderpath,index,oldt
 }
 
 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+'"?')) {
+    if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
 	this.document.forms.renameform.cmd.value='cut_'+index;
 	this.document.forms.renameform.markcopy.value=index;
 	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
@@ -3323,3 +3350,126 @@ ENDNEWSCRIPT
 }
 1;
 __END__
+
+
+=head1 NAME
+
+Apache::londocs.pm
+
+=head1 SYNOPSIS
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item %help=()
+
+Available help topics
+
+=item mapread()
+
+Mapread read maps into LONCAPA::map:: global arrays 
+@order and @resources, determines status
+sets @order - pointer to resources in right order
+sets @resources - array with the resources with correct idx
+
+=item authorhosts()
+
+Return hash with valid author names
+
+=item dumpbutton()
+
+Generate "dump" button
+
+=item clean()
+
+=item dumpcourse()
+
+    Actually dump course
+
+
+=item exportbutton()
+
+    Generate "export" button
+
+=item exportcourse()
+
+=item create_ims_store()
+
+=item build_package()
+
+=item get_dependencies()
+
+=item process_content()
+
+=item replicate_content()
+
+=item extract_media()
+
+=item store_template()
+
+=item group_import()
+
+    Imports the given (name, url) resources into the course
+    coursenum, coursedom, and folder must precede the list
+
+=item breadcrumbs()
+
+=item log_docs()
+
+=item docs_change_log()
+
+=item update_paste_buffer()
+
+=item print_paste_buffer()
+
+=item do_paste_from_buffer()
+
+=item update_parameter()
+
+=item handle_edit_cmd()
+
+=item editor()
+
+=item process_file_upload()
+
+=item process_secondary_uploads()
+
+=item is_supplemental_title()
+
+=item parse_supplemental_title()
+
+=item entryline()
+
+=item tiehash()
+
+=item untiehash()
+
+=item checkonthis()
+
+check on this
+
+=item verifycontent()
+
+Verify Content
+
+=item devalidateversioncache() & checkversions()
+
+Check Versions
+
+=item mark_hash_old()
+
+=item is_hash_old()
+
+=item changewarning()
+
+=item init_breadcrumbs()
+
+Breadcrumbs for special functions
+
+=back
+
+=cut