--- loncom/interface/londocs.pm	2007/01/05 16:40:27	1.265
+++ loncom/interface/londocs.pm	2008/12/15 06:09:37	1.322
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.265 2007/01/05 16:40:27 albertel Exp $
+# $Id: londocs.pm,v 1.322 2008/12/15 06:09:37 raeburn 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,20 +78,20 @@ sub storemap {
     return ($errtext,0);
 }
 
-# ----------------------------------------- Return hash with valid author names
+
 
 sub authorhosts {
     my %outhash=();
     my $home=0;
     my $other=0;
-    foreach (keys %env) {
-	if ($_=~/^user\.role\.(au|ca)\.(.+)$/) {
+    foreach my $key (keys(%env)) {
+	if ($key=~/^user\.role\.(au|ca)\.(.+)$/) {
 	    my $role=$1;
 	    my $realm=$2;
-	    my ($start,$end)=split(/\./,$env{$_});
+	    my ($start,$end)=split(/\./,$env{$key});
 	    if (($start) && ($start>time)) { next; }
 	    if (($end) && (time>$end)) { next; }
-	    my $ca; my $cd;
+	    my ($ca,$cd);
 	    if ($1 eq 'au') {
 		$ca=$env{'user.name'};
 		$cd=$env{'user.domain'};
@@ -116,22 +113,23 @@ sub authorhosts {
     }
     return ($home,$other,%outhash);
 }
-# ------------------------------------------------------ Generate "dump" button
+
 
 sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();
     my $type = &Apache::loncommon::course_type();
     if ($home+$other==0) { return ''; }
-    my $output='</td><td bgcolor="#DDDDCC">';
     if ($home) {
-	return '</td><td bgcolor="#DDDDCC">'.
+	return '<div>'.
 	    '<input type="submit" name="dumpcourse" value="'.
 	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
-	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
+	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').
+	    '</div>';
     } else {
-	return'</td><td bgcolor="#DDDDCC">'.
+	return '<div>'.
      &mt('Dump '.$type.
-	 ' DOCS to Construction Space: available on other servers');
+	 ' DOCS to Construction Space: available on other servers').
+	 '</div>';
     }
 }
 
@@ -140,7 +138,8 @@ sub clean {
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
     return $title;	
 }
-# -------------------------------------------------------- Actually dump course
+
+
 
 sub dumpcourse {
     my ($r) = @_;
@@ -160,15 +159,15 @@ sub dumpcourse {
 	my $title=$env{'form.authorfolder'};
 	$title=&clean($title);
 	my %replacehash=();
-	foreach (keys %env) {
-	    if ($_=~/^form\.namefor\_(.+)/) {
-		$replacehash{$1}=$env{$_};
+	foreach my $key (keys(%env)) {
+	    if ($key=~/^form\.namefor\_(.+)/) {
+		$replacehash{$1}=$env{$key};
 	    }
 	}
 	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
 	$crs=~s/\_/\//g;
-	foreach (keys %replacehash) {
-	    my $newfilename=$title.'/'.$replacehash{$_};
+	foreach my $item (keys(%replacehash)) {
+	    my $newfilename=$title.'/'.$replacehash{$item};
 	    $newfilename=~s/\.(\w+)$//;
 	    my $ext=$1;
 	    $newfilename=&clean($newfilename);
@@ -183,25 +182,25 @@ sub dumpcourse {
 		    unless(mkdir($makepath,0777)) { $fail=1; } 
 		}
 	    }
-	    $r->print('<br /><tt>'.$_.'</tt> => <tt>'.$newfilename.'</tt>: ');
+	    $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
 	    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
-		if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+		if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
 		    print $fh &Apache::lonclonecourse::rewritefile(
-         &Apache::lonclonecourse::readfile($env{'request.course.id'},$_),
+         &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
 				     (%replacehash,$crs => '')
 								    );
 		} else {
 		    print $fh
-         &Apache::lonclonecourse::readfile($env{'request.course.id'},$_);
+         &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
 		       }
 		$fh->close();
 	    } else {
 		$fail=1;
 	    }
 	    if ($fail) {
-		$r->print('<font color="red">fail</font>');
+		$r->print('<span class="LC_error">'.&mt('fail').'</span>');
 	    } else {
-		$r->print('<font color="green">ok</font>');
+		$r->print('<span class="LC_success">'.&mt('ok').'</span>');
 	    }
 	}
     } else {
@@ -210,8 +209,8 @@ sub dumpcourse {
 	    $r->print(
 		      '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
 	}
-	foreach (sort keys %outhash) {
-	    if ($_=~/^home_(.+)$/) {
+	foreach my $key (sort(keys(%outhash))) {
+	    if ($key=~/^home_(.+)$/) {
 		if ($home==1) {
 		    $r->print(
 		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
@@ -227,49 +226,59 @@ 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>');
-	foreach (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
-	    $r->print('<tr><td>'.$_.'</td>');
-	    my ($ext)=($_=~/\.(\w+)$/);
+	$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 my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+	    $r->print(&Apache::loncommon::start_data_table_row()
+                     .'<td>'.$file.'</td>');
+	    my ($ext)=($file=~/\.(\w+)$/);
 	    my $title=$hash{'title_'.$hash{
-		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
-	    $title=~s/&colon;/:/g;
+		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
 	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
 	    if (!$title) {
-		$title=$_;
+		$title=$file;
 	    } else {
 		$title=~s|/|_|g;
 	    }
 	    $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_".$file."' 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();
-    return '</td><td bgcolor="#DDDDCC">'.
+    return '<div>'.
             '<input type="submit" name="exportcourse" value="'.
             &mt('Export '.$type.' to IMS').'" />'.
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
 }
 
+
+
 sub exportcourse {
     my $r=shift;
     my $type = &Apache::loncommon::course_type();
     my %discussiontime = &Apache::lonnet::dump('discussiontimes',
                                                $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
-    my $numdisc = keys %discussiontime;
+    my $numdisc = keys(%discussiontime);
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
     my $curRes;
@@ -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'));
@@ -380,7 +389,7 @@ sub exportcourse {
                 }
                 $display .= ' />'."\n";
                 for (my $i=0; $i<$depth; $i++) {
-                    $display .= '<img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" /><img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" />'."\n";
+                    $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";
                 }
                 if ($curRes->is_sequence()) {
                     $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";
@@ -439,8 +448,8 @@ function containerCheck(item) {
     }
         |;
 
-        foreach my $container (sort { $a <=> $b } keys %children) {
-            my @contents = split/:/,$children{$container};
+        foreach my $container (sort { $a <=> $b } (keys(%children))) {
+            my @contents = split(/:/,$children{$container});
             for (my $i=0; $i<@contents; $i ++) {
                 $scripttag .= '    parents['.$container.']['.$i.'] = '.$contents[$i]."\n";
             }
@@ -548,7 +557,7 @@ sub build_package {
             if ($curRes->is_sequence() || $curRes->is_page()) {
                 $lastcontainer = $count;
             }
-            if (grep/^$count$/,@$exportitems) {
+            if (grep(/^$count$/,@$exportitems)) {
                 &get_dependencies($exportitems,\%parent,$depth,\@dependencies);
             }
         }
@@ -572,7 +581,7 @@ sub build_package {
 
         if (ref($curRes)) {
             $count ++;
-            if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) {
+            if ((grep(/^$count$/,@$exportitems)) || (grep(/^$count$/,@dependencies))) {
                 my $symb = $curRes->symb();
                 my $isvisible = 'true';
                 my $resourceref;
@@ -606,11 +615,11 @@ sub build_package {
                      '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
                      '" type="webcontent" href="'.$content_file.'">'."\n".
                      '       <file href="'.$content_file.'" />'."\n";
-                        foreach (@hrefs) {
+                        foreach my $item (@hrefs) {
                             $imsresources .=
-                     '        <file href="'.$_.'" />'."\n";
+                     '        <file href="'.$item.'" />'."\n";
                         }
-                        if (grep/^$count$/,@$discussions) {
+                        if (grep(/^$count$/,@$discussions)) {
                             my $ressymb = $symb;
                             my $mode;
                             if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
@@ -651,8 +660,8 @@ sub build_package {
 sub get_dependencies {
     my ($exportitems,$parent,$depth,$dependencies) = @_;
     if ($depth > 1) {
-        if ((!grep/^$$parent{$depth}$/,@$exportitems) && (!grep/^$$parent{$depth}$/,@$dependencies)) {
-            push @$dependencies, $$parent{$depth};
+        if ((!grep(/^$$parent{$depth}$/,@$exportitems)) && (!grep(/^$$parent{$depth}$/,@$dependencies))) {
+            push(@{$dependencies},$$parent{$depth});
             if ($depth > 2) {
                 &get_dependencies($exportitems,$parent,$depth-1,$dependencies);
             }
@@ -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#([^/]+)$#) {
@@ -858,7 +867,7 @@ sub extract_media {
             my $copiedfile;
             if ($copiedfile = Apache::File->new('>'.$destination)) {
                 print $copiedfile $embed_content;
-                push @{$href}, 'resources/'.$count.'/res/'.$filename;
+                push(@{$href},'resources/'.$count.'/res/'.$filename);
                 my $attrib_regexp = '';
                 if (@{$allfiles{$embed_file}} > 1) {
                     $attrib_regexp = join('|',@{$allfiles{$embed_file}});
@@ -902,18 +911,16 @@ 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 = shift;
-    my $coursedom = shift;
-    my $folder = shift;
-    my $container = shift;
-    my $caller = shift;
-    while (@_) {
-	my $name = shift;
-	my $url = shift;
-        if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) && ($caller eq 'londocs')) {
+    my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
+
+    while (@files) {
+	my ($name, $url, $residx) = @{ shift(@files) };
+        if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) 
+	     && ($caller eq 'londocs')
+	     && (!&Apache::lonnet::stat_file($url))) {
+	    
             my $errtext = '';
             my $fatal = 0;
             my $newmapstr = '<map>'."\n".
@@ -925,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) {
@@ -933,21 +940,24 @@ sub group_import {
             }
         }
 	if ($url) {
-	    my $idx = &LONCAPA::map::getresidx($url);
-	    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
+	    if (!$residx 
+		|| defined($LONCAPA::map::zombies[$residx])) {
+		$residx = &LONCAPA::map::getresidx($url,$residx);
+		push(@LONCAPA::map::order, $residx);
+	    }
 	    my $ext = 'false';
 	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
-	    $url =~ s/:/\&colon;/g;
-	    $name =~ s/:/\&colon;/g;
-	    $LONCAPA::map::resources[$idx] = 
-		join ':', ($name, $url, $ext, 'normal', 'res');
+	    $url  = &LONCAPA::map::qtunescape($url);
+	    $name = &LONCAPA::map::qtunescape($name);
+	    $LONCAPA::map::resources[$residx] = 
+		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
     return &storemap($coursenum, $coursedom, $folder.'.'.$container);
 }
 
 sub breadcrumbs {
-    my ($where)=@_;
+    my ($where,$allowed,$type)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders);
     if ($env{'form.pagepath'}) {
@@ -958,43 +968,47 @@ sub breadcrumbs {
     my $folderpath;
     my $cpinfo='';
     my $plain='';
-    if ($env{'form.markedcopy_url'}) {
-       $cpinfo='&markedcopy_url='.
-               &escape($env{'form.markedcopy_url'}).
-               '&markedcopy_title='.
-               &escape($env{'form.markedcopy_title'});
-    }
     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,
 		       'text'=>'<font size="+1">'.
-			   $name.'</font>'
+			   $name.'</font>',
+		       'no_mt'=>1,
 		       });
 	$plain.=$name.' &gt; ';
     }
     $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 {
@@ -1032,7 +1046,7 @@ sub log_docs {
                        'currentfolder' => $env{'form.folder'});
         if ($parmidx) {
            $storehash{'parameter_res'}=$oldresources[$parmidx];
-           foreach my $parm (keys %parmaction) {
+           foreach my $parm (keys(%parmaction)) {
               $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
               $storehash{'parameter_value_'.$parm}=$parmvalue{$parm};
            }
@@ -1059,9 +1073,9 @@ sub log_docs {
 }
 
 
-#
-# Docs Change Log
-#
+
+
+
 sub docs_change_log {
     my ($r)=@_;
     my $folder=$env{'form.folder'};
@@ -1085,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().
@@ -1154,7 +1169,7 @@ sub docs_change_log {
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
-	    if ($oldname ne $newname) {
+	    if ($oldname ne '' && $oldname ne $newname) {
 		$r->print(&LONCAPA::map::qtescape($newname));
 	    }
 	}        
@@ -1167,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]',
@@ -1184,312 +1199,386 @@ sub docs_change_log {
               || $shown<=$env{'form.show'})) { last; }
     }
     $r->print(&Apache::loncommon::end_data_table());
-    $r->print(&Apache::loncommon::end_page());
 }
 
-sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
-    my $errtext='';
-    my $fatal=0;
-    my $container='sequence';
-    if ($env{'form.pagepath'}) {
-        $container='page';
+sub update_paste_buffer {
+    my ($coursenum,$coursedom) = @_;
+
+    return if (!defined($env{'form.markcopy'}));
+    return if (!defined($env{'form.copyfolder'}));
+    return if ($env{'form.markcopy'} < 0);
+
+    my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+				    $env{'form.copyfolder'});
+    
+    return if ($fatal);
+
+# 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});
+    delete($env{'form.markcopy'});
+}
+
+sub print_paste_buffer {
+    my ($r,$container) = @_;
+    return if (!defined($env{'docs.markedcopy_url'}));
+
+    $r->print(<<ENDPASTE);
+<form name="pasteform" action="/adm/coursedocs" method="post"><p>
+ENDPASTE
+    $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');
+
+    my $type;
+    if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+	$type = &mt('External Resource');
+	$r->print($type.': '.
+		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
+		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
+    }  else {
+	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
+	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') {
+	$r->print('
+	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
+	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
+');
+    } else {
+	$r->print('
+        <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
+');
     }
-    ($errtext,$fatal)=
-              &mapread($coursenum,$coursedom,$folder.'.'.$container);
+    $r->print('</p></form>');
+}
+
+sub do_paste_from_buffer {
+    my ($coursenum,$coursedom,$folder) = @_;
+
+    if (!$env{'form.pastemarked'}) {
+        return;
+    }
+
+# paste resource to end of list
+    my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
+    my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
+# Maps need to be copied first
+    if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
+	$title=&mt('Copy of').' '.$title;
+	my $newid=$$.time;
+	my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
+        if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
+            my $path = $1;
+            my $prefix = $2;
+            my $ancestor = $3;
+            if (length($ancestor) > 10) {
+                $ancestor = substr($ancestor,-10,10);
+            }
+            $oldid = $path.$prefix.$ancestor;
+        }
+        my $counter = 0;
+        my $newurl=$oldid.$newid.'.'.$ext;
+        my $is_unique = &uniqueness_check($newurl);
+        while (!$is_unique && $counter < 100) {
+            $counter ++;
+            $newid ++;
+            $newurl = $oldid.$newid;
+            $is_unique = &uniqueness_check($newurl);
+        }
+        if (!$is_unique) {
+            if ($url=~/\.page$/) {
+                return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
+            } else {
+                return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+            }
+        }
+	my $storefn=$newurl;
+	$storefn=~s{^/\w+/$match_domain/$match_username/}{};
+	my $paste_map_result =
+            &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+					       &Apache::lonnet::getfile($url));
+        if ($paste_map_result eq '/adm/notfound.html') {
+            if ($url=~/\.page$/) {
+                return &mt('Paste failed: an error occurred saving the composite page');
+            } else {
+                return &mt('Paste failed: an error occurred saving the folder');
+            }
+        }
+	$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'; }
+    $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);
+    return 'ok';
+# Store the result
+}
+
+sub uniqueness_check {
+    my ($newurl) = @_;
+    my $unique = 1;
+    foreach my $res (@LONCAPA::map::order) {
+        my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+        $url=&LONCAPA::map::qtescape($url);
+        if ($newurl eq $url) {
+            $unique = 0;
+            last;    
+        }
+    }
+    return $unique;
+}
+
+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;
+    }
+    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; }
        	$LONCAPA::map::order[0]=$idx;
         $LONCAPA::map::resources[$idx]='';
     }
-    if (defined($env{'form.markcopy'})) {
-# Mark for copying
-	my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
-	$env{'form.markedcopy_title'}=$title;
-	$env{'form.markedcopy_url'}=$url;
-    }
-    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><font color="red">'.$errtext.'</font></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><font color="red">'.$errtext.'</font></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><font color="red">'.$errtext.'</font></p>');
-		    return;
-		}
-	    }
-		
-	    if ($env{'form.pastemarked'}) {
-# paste resource to end of list
-                my $url=$env{'form.markedcopy_url'};
-		my $title=$env{'form.markedcopy_title'};
-# Maps need to be copied first
-		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
-		    $title=&mt('Copy of').' '.$title;
-                    my $newid=$$.time;
-		    $url=~/^(.+)\.(\w+)$/;
-		    my $newurl=$1.$newid.'.'.$2;
-		    my $storefn=$newurl;
-                    $storefn=~s{^/\w+/$match_domain/$match_username/}{};
-		    &Apache::lonclonecourse::writefile
-			($env{'request.course.id'},$storefn,
-			 &Apache::lonnet::getfile($url));
-		    $url=$newurl;
-		}
-		$title=~s/\</\&lt\;/g;
-		$title=~s/\>/\&gt\;/g;
-		$title=~s/\:/\&colon;/g;
-		my $ext='false';
-		if ($url=~/^http\:\/\//) { $ext='true'; }
-		$url=~s/\:/\&colon;/g;
-# Now insert the URL at the bottom
-                my $newidx=&LONCAPA::map::getresidx($url);
-		$LONCAPA::map::resources[$newidx]=
-		    $title.':'.$url.':'.$ext.':normal:res';
-		$LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx;
-# Store the result
-		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
-		if ($fatal) {
-		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
-		    return;
-		}
+	    my $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1);
+	    splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res);
 
-	    }
-            $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=
-                     &HTML::Entities::decode($env{'form.title'});
-                    $comment=~s/\</\&lt\;/g;
-                    $comment=~s/\>/\&gt\;/g;
-                    $comment=~s/\:/\&colon;/g;
-		    if ($comment=~/\S/) {
-			$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
-			    $comment.':'.join(':',@rrest);
-		    }
-# Devalidate title cache
-                    my $renamed_url=$rrest[0];
-# Has the &colon;-escaping
-                    $renamed_url=~s/\&colon\;/\:/g;
-		    &Apache::lonnet::devalidate_title_cache($renamed_url);
-                }
-# Store the changed version
-		($errtext,$fatal)=&storemap($coursenum,$coursedom,
-					    $folder.'.'.$container);
-		if ($fatal) {
-		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
-		    return;
-		}
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+	    return $errtext if ($fatal);
+	}
+	    
+	if ($env{'form.pastemarked'}) {
+            my $paste_res = 
+                &do_paste_from_buffer($coursenum,$coursedom,$folder);
+            if ($paste_res eq 'ok') {
+                ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
+                return $errtext if ($fatal);
+            } elsif ($paste_res ne '') {
+                $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
             }
+	}
+
+	$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;
-#		&Apache::lonnet::logthis("imp detail ".$env{'form.importdetail'});
-		foreach (split(/\&/,$env{'form.importdetail'})) {
-		    if (defined($_)) {
-			my ($name,$url)=split(/\=/,$_);
-			$name=&unescape($name);
-			$url=&unescape($url);
-			push @imports, $name, $url;
-		    }
+	if ($env{'form.importdetail'}) {
+	    my @imports;
+	    foreach my $item (split(/\&/,$env{'form.importdetail'})) {
+		if (defined($item)) {
+		    my ($name,$url,$residx)=
+			map {&unescape($_)} split(/\=/,$item);
+		    push(@imports, [$name, $url, $residx]);
 		}
-# Store the changed version
-		($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
-					       $container,'londocs',@imports);
-		if ($fatal) {
-		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
-		    return;
-		}
-            }
+	    }
+	    ($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 (&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><font color="red">'.$errtext.'</font></p>');
-		      return;
-	          }
-               } else {
-                   $r->print('<p><font color="red">'.&mt('No map selected.').'</font></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>');
-        foreach (@LONCAPA::map::order) {
-           my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$_]);
-	   $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,$_,$coursenum));
-           $idx++;
-	   $shown++;
-        }
-	unless ($shown) {
-	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
-	}
-        $r->print("\n</table>\n");
-	if ($env{'form.markedcopy_url'}) {
-	    $r->print(<<ENDPASTE);
-<p><form name="pasteform" action="/adm/coursedocs" method="post">
-<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
-<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
-ENDPASTE
-            $r->print(
-	   '<input type="submit" name="pastemarked" value="'.&mt('Paste').
-		      '" /> '.&Apache::loncommon::filedescription(
-		(split(/\./,$env{'form.markedcopy_url'}))[-1]).': '.
-		      $env{'form.markedcopy_title'});
-            if ($container eq 'page') {
-		$r->print(<<PAGEINFO);
-<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
-<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
-PAGEINFO
-            } else {
-		$r->print(<<FOLDERINFO);
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-FOLDERINFO
+	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);
+		return $errtext if ($fatal);
+	    } else {
+		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
+		
 	    }
-	    $r->print('</form></p>');
 	}
+	&log_differences($plain);
     }
+# ---------------------------------------------------------------- End commands
+# ---------------------------------------------------------------- Print screen
+    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 {
@@ -1537,12 +1626,10 @@ sub process_file_upload {
 						$parseaction,$allfiles,
 						$codebase);
         my $ext='false';
-        if ($url=~/^http\:\/\//) { $ext='true'; }
-        $url=~s/\:/\&colon;/g;
+        if ($url=~m{^http://}) { $ext='true'; }
+	$url     = &LONCAPA::map::qtunescape($url);
         my $comment=$env{'form.comment'};
-        $comment=~s/\</\&lt\;/g;
-        $comment=~s/\>/\&gt\;/g;
-        $comment=~s/\:/\&colon;/g;
+	$comment = &LONCAPA::map::qtunescape($comment);
         if ($folder=~/^supplemental/) {
               $comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
                   $env{'user.domain'}.'___&&&___'.$comment;
@@ -1554,45 +1641,25 @@ sub process_file_upload {
         ($errtext,$fatal)=&storemap($coursenum,$coursedom,
 				    $folder.'.'.$container);
         if ($fatal) {
-            $$upload_output .= '<p><font color="red">'.$errtext.'</font></p>';
+            $$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';
             return 'failed';
         } else {
             if ($parseaction eq 'parse') {
                 my $total_embedded = keys(%{$allfiles});
                 if ($total_embedded > 0) {
                     my $num = 0;
-                    $$upload_output .= 'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />
-   <form name="upload_embedded" action="/adm/coursedocs"
-                  method="post" enctype="multipart/form-data">
-   <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" />   <input type="hidden" name="cmd" value="upload_embedded" />
+		    my $state = '
+   <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
+   <input type="hidden" name="cmd" value="upload_embedded" />
    <input type="hidden" name="newidx" value="'.$newidx.'" />
    <input type="hidden" name="primaryurl" value="'.&escape($url).'" />
    <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
-                    $$upload_output .= '<b>Upload embedded files</b>:<br />
-   <table>';
-                    foreach my $embed_file (keys(%{$allfiles})) {
-                        $$upload_output .= '<tr><td>'.$embed_file.
-          '<input name="embedded_item_'.$num.'" type="file" />
-           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
-                        my $attrib;
-                        if (@{$$allfiles{$embed_file}} > 1) {
-                            $attrib = join(':',@{$$allfiles{$embed_file}});
-                        } else {
-                            $attrib = $$allfiles{$embed_file}[0];
-                        }
-                        $$upload_output .=
-           '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />';
-                        if (exists($$codebase{$embed_file})) {
-                            $$upload_output .= 
-          '<input name="codebase_'.$num.'" type="hidden" value="'.&escape($$codebase{$embed_file}).'" />';
-                        }
-                        $$upload_output .= '</td></tr>';
-                        $num ++;
-                    }
-                    $phase_status = 'phasetwo';
-                    $$upload_output .= '</table><br />
-   <input type ="submit" value="Complete upload" />
-   </form>';
+		    $phase_status = 'phasetwo';
+
+                    $$upload_output .= 
+			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
+			&Apache::loncommon::ask_for_embedded_content(
+                            '/adm/coursedocs',$state,$allfiles,$codebase);
                 } else {
                     $$upload_output .= 'No embedded items identified<br />';
                 }
@@ -1621,48 +1688,73 @@ sub process_secondary_uploads {
     return $filename;
 }
 
+sub is_supplemental_title {
+    my ($title) = @_;
+    return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
+}
+
+sub parse_supplemental_title {
+    my ($title) = @_;
+
+    my ($foldertitle,$renametitle);
+    if ($title =~ /&amp;&amp;&amp;/) {
+	$title = &HTML::Entites::decode($title);
+    }
+ if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
+	$renametitle=$4;
+	my ($time,$uname,$udom) = ($1,$2,$3);
+	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+	my $name =  &Apache::loncommon::plainname($uname,$udom);
+	$name = &HTML::Entities::encode($name,'"<>&\'');
+	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
+	    $name.': <br />'.$foldertitle;
+    }
+    if (wantarray) {
+	return ($title,$foldertitle,$renametitle);
+    } 
+    return $title;
+}
+
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
-    $title=~s/\&colon\;/\:/g;
-    $title=&HTML::Entities::encode(&HTML::Entities::decode(
-     &unescape($title)),'"<>&\'');
-    my $renametitle=$title;
-    my $foldertitle=$title;
-    my $pagetitle=$title;
-    my $orderidx=$LONCAPA::map::order[$index];
-    if ($title=~ /^(\d+)___&amp;&amp;&amp;___($match_username)___&amp;&amp;&amp;___($match_domain)___&amp;&amp;&amp;___(.*)$/	) { 
-	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-	$renametitle=$4;
-	$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
-	    &Apache::loncommon::plainname($2,$3).': <br />'.
-	    $foldertitle;
+
+    my ($foldertitle,$pagetitle,$renametitle);
+    if (&is_supplemental_title($title)) {
+	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
+	$pagetitle = $foldertitle;
+    } else {
+	$title=&HTML::Entities::encode($title,'"<>&\'');
+	$renametitle=$title;
+	$foldertitle=$title;
+	$pagetitle=$title;
     }
+
+    my $orderidx=$LONCAPA::map::order[$index];
+    
+
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
+    $renametitle=~s/ /%20/g;
     my $line='<tr>';
+    my ($form_start,$form_end);
 # Edit commands
-    my $container;
-    my $folderpath;
+    my ($container, $type, $esc_path, $path, $symb);
     if ($env{'form.folderpath'}) {
+	$type = 'folder';
         $container = 'sequence';
-	$folderpath=&escape($env{'form.folderpath'});
+	$esc_path=&escape($env{'form.folderpath'});
+	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
     }
-    my ($pagepath,$pagesymb);
     if ($env{'form.pagepath'}) {
-        $container = 'page';
-        $pagepath=&escape($env{'form.pagepath'});
-        $pagesymb=&escape($env{'form.pagesymb'});
+        $type = $container = 'page';
+        $esc_path=&escape($path = $env{'form.pagepath'});
+	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
+        $symb=&escape($env{'form.pagesymb'});
     }
     my $cpinfo='';
-    if ($env{'form.markedcopy_url'}) {
-       $cpinfo='&markedcopy_url='.
-               &escape($env{'form.markedcopy_url'}).
-               '&markedcopy_title='.
-               &escape($env{'form.markedcopy_title'});
-    }
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -1694,82 +1786,86 @@ sub entryline {
 		'rn' => 'Rename',
 		'cp' => 'Copy');
 	my $nocopy=0;
+        my $nocut=0;
         if ($url=~/\.(page|sequence)$/) {
-	    foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
-		my ($title,$url,$ext,$type)=split(/\:/,$_);
-		if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
-		    $nocopy=1;
-		    last;
+	    if ($url =~ m{/res/}) {
+		# no copy for published maps
+		$nocopy = 1;
+	    } else {
+		foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
+		    my ($title,$url,$ext,$type)=split(/\:/,$item);
+		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
+			$nocopy=1;
+			last;
+		    }
 		}
 	    }
 	}
+        if ($url=~/^\/res\/lib\/templates\//) { 
+           $nocopy=1; 
+           $nocut=1;
+        }
         my $copylink='&nbsp;';
-        if ($env{'form.pagepath'}) {
-           unless ($nocopy) {
-               $copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+        my $cutlink='&nbsp;';
+	
+	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=(<<ENDCOPY);
+<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a>
 ENDCOPY
-            }
-            $line.=(<<END);
-<form name="entry_$index" action="/adm/coursedocs" method="post">
-<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
-<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
-<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
-<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
-<input type="hidden" name="setparms" value="$orderidx" />
-<input type="hidden" name="changeparms" value="0" />
-<td><table border='0' cellspacing='2' cellpadding='0'>
-<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
-<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
-<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
-<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
-</table></td>
-<td>$selectbox
-</td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#990000">$lt{'rm'}</font></a>
-<a href='javascript:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#550044">$lt{'ct'}</font></a>
-<a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#009900">$lt{'rn'}</font></a>
-$copylink
+        }
+	if (!$nocut) {
+	    $cutlink=(<<ENDCUT);
+<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
+ENDCUT
+        }
+	$form_start = (<<END);
+   <form  action="/adm/coursedocs" method="post">
+   <input type="hidden" name="${type}path" value="$path" />
+   <input type="hidden" name="${type}symb" value="$symb" />
+   <input type="hidden" name="setparms" value="$orderidx" />
+   <input type="hidden" name="changeparms" value="0" />
 END
-        } else {
-           unless ($nocopy) {
-               $copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
-ENDCOPY
-            }
-            $line.=(<<END); 
-<form name="entry_$index" action="/adm/coursedocs" method="post">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
-<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
-<input type="hidden" name="setparms" value="$orderidx" />
-<input type="hidden" name="changeparms" value="0" />
-<td><table border='0' cellspacing='2' cellpadding='0'>
-<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'>
-<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
-<tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'>
-<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
-</table></td>
-<td>$selectbox
-</td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#990000">$lt{'rm'}</font></a>
-<a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#550044">$lt{'ct'}</font></a>
-<a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#009900">$lt{'rn'}</font></a>
+        $form_end = '</form>';
+	$line.=(<<END);
+<td>
+   <table class="LC_docs_entry_move">
+      <tr>
+         <td>
+            <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
+         </td>
+      </tr>
+      <tr>
+        <td>
+           <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
+        </td>
+      </tr>
+    </table>
+</td>
+<td>
+   $form_start
+   $selectbox
+   $form_end
+</td>
+<td class="LC_docs_entry_commands">
+   <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
+$cutlink
+   <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 $copylink
+</td>
 END
-        }
+
     }
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
@@ -1797,7 +1893,9 @@ END
 	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
 	}
     }
-    $url=~s-^http(\&colon\;|:)//-/adm/wrapper/ext/-;
+    
+    my $orig_url = $url;
+    my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.
@@ -1820,6 +1918,7 @@ END
 	    }
 	} elsif ($url=~m|^/ext/|) { 
 	    $url='/adm/wrapper'.$url;
+	    $external = 1;
 	}
         if (&Apache::lonnet::symbverify($symb,$url)) {
 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
@@ -1833,7 +1932,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'};
@@ -1845,15 +1944,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].
                                               '" />'.
-'<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></label>';
-       
+'<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 ='
+<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';   
     }
     if ($ispage) {
         my $pagename=&escape($pagetitle);
@@ -1871,12 +1975,21 @@ END
 					       $path.$pagearg.'.page');
 	}
 	$url.='pagepath='.&escape($pagepath).
-	    '&pagesymb='.&escape($symb).$cpinfo;
+	    '&amp;pagesymb='.&escape($symb).$cpinfo;
+    }
+    if ($external) {
+	my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
+	$external = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>';
+    } else {
+	undef($external);
     }
-    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
-	'" border="0"></a></td>'.
-        "<td bgcolor='#FFFFBB'>".($url?"<a href=\"$url\">":'').$title.
-        ($url?'</a>':' <font size="-2">'.&mt('(re-initialize course to access)').'</font>')."</td>";
+    $line.='
+  <td class="LC_docs_entry_icon">
+    '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
+  </td>
+  <td class="LC_docs_entry_title">
+    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external."
+  </td>";
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
@@ -1886,18 +1999,31 @@ END
 	my $hidtext=
 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
 	$line.=(<<ENDPARMS);
-<td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
-<td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
-<td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+  <td class="LC_docs_entry_parameter">
+    $form_start
+    <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="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
     }
-    $line.="</form></tr>";
+    $line.="</tr>";
     return $line;
 }
 
-# ---------------------------------------------------------------- tie the hash
+=pod
+
+=item tiehash()
+
+tie the hash
+
+=cut
 
 sub tiehash {
     my ($mode)=@_;
@@ -1923,7 +2049,8 @@ sub untiehash {
     return OK;
 }
 
-# --------------------------------------------------------------- check on this
+
+
 
 sub checkonthis {
     my ($r,$url,$level,$title)=@_;
@@ -1932,6 +2059,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;');
        }
@@ -1941,7 +2071,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+)$/;
@@ -1951,7 +2081,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',
@@ -1959,46 +2089,50 @@ sub checkonthis {
                  if (($errorcount) ||
                      ($warningcount)) {
 		     if ($errorcount) {
-                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
-			  $errorcount.' '.
-				  &mt('error(s)').'</b></font> ');
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
+                          &mt('[quant,_1,error]',$errorcount).'</span>');
                      }
 		     if ($warningcount) {
-                        $r->print('<font color="blue">'.
-			  $warningcount.' '.
-				  &mt('warning(s)').'</font>');
+                        $r->print('<span class="LC_warning">'.
+                          &mt('[quant,_1,warning]',$warningcount).'</span>');
                      }
                  } else {
-                     $r->print('<font color="green">'.&mt('ok').'</font>');
+                     $r->print('<span class="LC_success">'.&mt('ok').'</span>');
                  }
                  $r->rflush();
              }
 	     my $dependencies=
                 &Apache::lonnet::metadata($url,'dependencies');
-             foreach (split(/\,/,$dependencies)) {
-		 if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {
-                    &checkonthis($r,$_,$level+1);
+             foreach my $dep (split(/\,/,$dependencies)) {
+		 if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) {
+                    &checkonthis($r,$dep,$level+1);
                  }
              }
           } elsif ($result eq 'unavailable') {
-             $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
+             $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
           } elsif ($result eq 'not_found') {
 	      unless ($url=~/\$/) {
-		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
 	      } else {
-		  $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
+		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
 	      }
           } else {
-             $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
+             $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
           }
-      }
-   }
+       }
+    }
 }
 
 
-#
-# ----------------------------------------------------------------- List Symbs
-# 
+
+=pod
+
+=item list_symbs()
+
+List Symbs
+
+=cut
+
 sub list_symbs {
     my ($r) = @_;
 
@@ -2014,9 +2148,7 @@ sub list_symbs {
 }
 
 
-#
-# -------------------------------------------------------------- Verify Content
-# 
+
 sub verifycontent {
     my ($r) = @_;
     my $type = &Apache::loncommon::course_type();
@@ -2028,17 +2160,17 @@ sub verifycontent {
    undef %alreadyseen;
    %alreadyseen=();
    &tiehash();
-   foreach (keys %hash) {
-       if ($hash{$_}=~/\.(page|sequence)$/) {
-	   if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {
-	       $r->print('<hr /><font color="red">'.
+   foreach my $key (keys(%hash)) {
+       if ($hash{$key}=~/\.(page|sequence)$/) {
+	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
+	       $r->print('<hr /><span class="LC_error">'.
 			 &mt('The following sequence or page is included more than once in your '.$type.': ').
-			 &unescape($hash{$_}).'</font><br />'.
+			 &unescape($hash{$key}).'</span><br />'.
 			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
 	   }
        }
-       if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$_})})) {
-           &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});
+       if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) {
+           &checkonthis($r,$hash{$key},0,$hash{'title_'.$1});
        }
    }
    &untiehash();
@@ -2047,8 +2179,6 @@ sub verifycontent {
 }
 
 
-# -------------------------------------------------------------- Check Versions
-
 sub devalidateversioncache {
     my $src=shift;
     &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
@@ -2078,16 +2208,16 @@ sub checkversions {
     my %newsetversions=();
     if ($env{'form.setmostrecent'}) {
 	$haschanged=1;
-	foreach (keys %hash) {
-	    if ($_=~/^ids\_(\/res\/.+)$/) {
+	foreach my $key (keys(%hash)) {
+	    if ($key=~/^ids\_(\/res\/.+)$/) {
 		$newsetversions{$1}='mostrecent';
                 &devalidateversioncache($1);
 	    }
 	}
     } elsif ($env{'form.setcurrent'}) {
 	$haschanged=1;
-	foreach (keys %hash) {
-	    if ($_=~/^ids\_(\/res\/.+)$/) {
+	foreach my $key (keys(%hash)) {
+	    if ($key=~/^ids\_(\/res\/.+)$/) {
 		my $getvers=&Apache::lonnet::getversion($1);
 		if ($getvers>0) {
 		    $newsetversions{$1}=$getvers;
@@ -2097,11 +2227,11 @@ sub checkversions {
 	}
     } elsif ($env{'form.setversions'}) {
 	$haschanged=1;
-	foreach (keys %env) {
-	    if ($_=~/^form\.set_version_(.+)$/) {
+	foreach my $key (keys(%env)) {
+	    if ($key=~/^form\.set_version_(.+)$/) {
 		my $src=$1;
-		if (($env{$_}) && ($env{$_} ne $setversions{$src})) {
-		    $newsetversions{$src}=$env{$_};
+		if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
+		    $newsetversions{$src}=$env{$key};
 		    &devalidateversioncache($src);
 		}
 	    }
@@ -2111,9 +2241,9 @@ sub checkversions {
         if (&Apache::lonnet::put('resourceversions',\%newsetversions,
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {		
-	    $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
+	    $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
 	} else {
-	    $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
+	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
 	}
 	&mark_hash_old();
     }
@@ -2122,8 +2252,8 @@ sub checkversions {
 # show all documents
 	$header=&mt('All Documents in '.$type);
 	$allsel=1;
-	foreach (keys %hash) {
-	    if ($_=~/^ids\_(\/res\/.+)$/) {
+	foreach my $key (keys(%hash)) {
+	    if ($key=~/^ids\_(\/res\/.+)$/) {
 		my $src=$1;
 		$changes{$src}=1;
 	    }
@@ -2133,7 +2263,7 @@ sub checkversions {
 	%changes=&Apache::lonnet::dump
 	 ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'},
                      $env{'course.'.$env{'request.course.id'}.'.num'});
-	my $firstkey=(keys %changes)[0];
+	my $firstkey=(keys(%changes))[0];
 	unless ($firstkey=~/^error\:/) {
 	    unless ($env{'form.timerange'}) {
 		$env{'form.timerange'}=604800;
@@ -2197,14 +2327,14 @@ sub checkversions {
 <input type="submit" name="setversions" value="$lt{'sv'}" />
 <table border="0">
 ENDHEADERS
-    foreach (sort keys %changes) {
-	if ($changes{$_}>$starttime) {
-	    my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
-	    my $currentversion=&Apache::lonnet::getversion($_);
+    foreach my $key (sort(keys(%changes))) {
+	if ($changes{$key}>$starttime) {
+	    my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
+	    my $currentversion=&Apache::lonnet::getversion($key);
 	    if ($currentversion<0) {
 		$currentversion=&mt('Could not be determined.');
 	    }
-	    my $linkurl=&Apache::lonnet::clutter($_);
+	    my $linkurl=&Apache::lonnet::clutter($key);
 	    $r->print(
 		      '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
 		      &Apache::lonnet::gettitle($linkurl).
@@ -2220,10 +2350,10 @@ ENDHEADERS
                                                      'lastrevisiondate')
                                                         ).
                       '</td>'.
-                      '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
+                      '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
                       '<font size="+1">'.$currentversion.'</font>'.
-                      '</nobr></td>'.
-                      '<td title="'.$lt{'ve'}.'"><nobr>In '.$type.': '.
+                      '</span></td>'.
+                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
                       '<font size="+1">');
 # Used in course
 	    my $usedversion=$hash{'version_'.$linkurl};
@@ -2232,8 +2362,8 @@ ENDHEADERS
 	    } else {
 		$r->print($currentversion);
 	    }
-	    $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
-                      '<nobr>Use: ');
+	    $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'.
+                      '<span class="LC_nobreak">Use: ');
 # Set version
 	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
 						      'set_version_'.$linkurl,
@@ -2242,7 +2372,7 @@ ENDHEADERS
 						       '' => '',
 						       'mostrecent' => 'most recent',
 						       map {$_,$_} (1..$currentversion))));
-	    $r->print('</nobr></td></tr><tr><td></td>');
+	    $r->print('</span></td></tr><tr><td></td>');
 	    my $lastold=1;
 	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
 		my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -2266,7 +2396,7 @@ ENDHEADERS
             my $cols_output = 1;
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
 		my $url=$root.'.'.$prevvers.'.'.$extension;
-		$r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
+		$r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url).
 			  '">'.&mt('Version').' '.$prevvers.'</a> ('.
 			  &Apache::lonlocal::locallocaltime(
                                 &Apache::lonnet::metadata($url,
@@ -2279,7 +2409,7 @@ ENDHEADERS
 			      '&versionone='.$prevvers.
 			      '">'.&mt('Diffs').'</a>');
 		}
-		$r->print('</nobr><br />');
+		$r->print('</span><br />');
                 if (++$entries_count % $entries_per_col == 0) {
                     $r->print('</font></td>');
                     if ($cols_output != 4) {
@@ -2341,23 +2471,22 @@ sub changewarning {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
     $r->print("\n\n".
-'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
+'<script type="text/javascript">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">'.
+'" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
 &mt($message,' <input type="hidden" name="'.
     $env{'request.role'}.'" value="1" /><input type="button" value="'.
     &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
-$help{'Caching'}.'</font></h3></form>'."\n\n");
+$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'});
@@ -2367,7 +2496,9 @@ sub init_breadcrumbs {
 					    bug=>'Instructor Interface'});
 }
 
-# ================================================================ Main Handler
+
+
+
 sub handler {
     my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');
@@ -2376,13 +2507,13 @@ sub handler {
     my $type = &Apache::loncommon::course_type();
 
 # --------------------------------------------- Initialize help topics for this
-    foreach ('Adding_Course_Doc','Main_Course_Documents',
-	     'Adding_External_Resource','Navigate_Content',
-	     'Adding_Folders','Docs_Overview', 'Load_Map',
-	     'Supplemental','Score_Upload_Form','Adding_Pages',
-	     'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
-	     'Check_Resource_Versions','Verify_Content') {
-	$help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
+    foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
+	               'Adding_External_Resource','Navigate_Content',
+	               'Adding_Folders','Docs_Overview', 'Load_Map',
+	               'Supplemental','Score_Upload_Form','Adding_Pages',
+	               'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
+	               'Check_Resource_Versions','Verify_Content') {
+	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }
     # Composite help files
     $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
@@ -2430,8 +2561,27 @@ sub handler {
     my $uploadtag;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['folderpath','pagepath',
-					     'pagesymb','markedcopy_url',
-					     'markedcopy_title']);
+					     '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));
@@ -2443,8 +2593,8 @@ sub handler {
         $env{'form.folder'}=pop(@pagepath);
         $containertag = '<input type="hidden" name="pagepath" value="" />'.
 	    '<input type="hidden" name="pagesymb" value="" />';
-        $uploadtag = '<input type="hidden" name="pagepath" value="'.$env{'form.pagepath'}.'" />'.
-	    '<input type="hidden" name="pagesymb" value="'.$env{'form.pagesymb'}.'" />';
+        $uploadtag = '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
+	    '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />';
     }
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc='/'.$1;
@@ -2482,8 +2632,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 = ();
@@ -2493,9 +2644,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);
           }
@@ -2518,12 +2673,12 @@ sub handler {
                   }
                   my @attributes = ();
                   if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
-                      @attributes = split/:/,$env{'form.embedded_attrib_'.$i};
+                      @attributes = split(/:/,$env{'form.embedded_attrib_'.$i});
                   } else {
                       @attributes = ($env{'form.embedded_attrib_'.$i});
                   }
-                  foreach (@attributes) {
-                      push(@{$attribs{$i}},&unescape($_));
+                  foreach my $attr (@attributes) {
+                      push(@{$attribs{$i}},&unescape($attr));
                   }
                   if ($javacodebase) {
                       $codebase{$i} = $javacodebase;
@@ -2541,7 +2696,7 @@ sub handler {
               my $updateflag = 0;
               my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);
               if ($getstatus eq 'ok') {
-                  foreach my $item (keys %newname) {
+                  foreach my $item (keys(%newname)) {
                       if ($newname{$item} ne $origname{$item}) {
                           my $attrib_regexp = '';
                           if (@{$attribs{$item}} > 1) {
@@ -2597,6 +2752,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',
@@ -2606,6 +2762,7 @@ sub handler {
 					  );
 # -----------------------------------------------------------------------------
     if ($allowed) {
+	&update_paste_buffer($coursenum,$coursedom);
        my $dumpbut=&dumpbutton();
        my $exportbut=&exportbutton();
        my %lt=&Apache::lonlocal::texthash(
@@ -2625,60 +2782,74 @@ sub handler {
        }
        unless ($env{'form.pagepath'}) {
            $containertag = '<input type="hidden" name="folderpath" value="" />';
-           $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
+           $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
        }
 
        $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">
-<input type="hidden" name="title" />
-<input type="hidden" name="cmd" />
-<input type="hidden" name="markcopy" />
-$containertag
+  <input type="hidden" name="title" />
+  <input type="hidden" name="cmd" />
+  <input type="hidden" name="markcopy" />
+  <input type="hidden" name="copyfolder" />
+  $containertag
 </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">
-<input type="hidden" name="importdetail" value="" />
-$uploadtag
+  <input type="hidden" name="importdetail" value="" />
+  $uploadtag
 </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">
-<table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
-<tr><td bgcolor="#DDDDCC">
-<input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
-</td><td bgcolor="#DDDDCC">
-    <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
-$dumpbut
-$exportbut
-</td><td bgcolor="#DDDDCC">
-    <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-</td><td bgcolor="#DDDDCC">
-    <input type="hidden" name="folder" value="$env{'form.folder'}" />
-    <input type="submit" name="docslog" value="$lt{'sl'}" />
-</td></tr></table>
+  <div class="LC_docs_course_commands">
+
+      <div>
+        <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
+      </div>
+      <div>
+        <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
+      </div>
+        $dumpbut
+        $exportbut
+      <div>
+        <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+      </div>
+      <div>
+        <input type="hidden" name="folder" value="$env{'form.folder'}" />
+        <input type="submit" name="docslog" value="$lt{'sl'}" />
+      </div>
+  </div>
 </form>
+<div style="clear: both; height: 0px;">&nbsp;</div>
 ENDCOURSEVERIFY
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
 		     &mt('Editing the Table of Contents for your '.$type)));
     }
 # --------------------------------------------------------- Standard documents
-    $r->print('<table border=2 cellspacing=4 cellpadding=4>');
+    $r->print('<table class="LC_docs_documents">');
+
     if (($standard) && ($allowed) && (!$forcesupplement)) {
-	$r->print('<tr><td bgcolor="#BBBBBB">');
+	$r->print('<tr><td class="LC_docs_document">');
 #  '<h2>'.&mt('Main Course Documents').
 #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$env{'form.folder'};
        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') {
-	   $r->print('<script>this.window.name="loncapaclient";</script>');
+	   $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>');
        } else {
            #$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()
+	   &mark_hash_old();
        }
        &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
@@ -2691,54 +2862,56 @@ ENDCOURSEVERIFY
 	}
 	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
        $r->print(<<ENDFORM);
-<table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">$lt{'uplm'}</th>
-<th bgcolor="#DDDDDD">$lt{'impp'}</th>
-<th bgcolor="#DDDDDD">$lt{'spec'}</th>
+<table class="LC_docs_adddocs">
+<tr>
+<th>$lt{'uplm'}</th>
+<th>$lt{'impp'}</th>
+<th>$lt{'spec'}</th>
 </tr>
-<tr><td bgcolor="#DDDDDD">
+<tr>
+<td>
 $lt{'file'}:<br />
 <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="40">
+<input type="file" name="uploaddoc" size="40" />
 <br />
 $lt{'title'}:<br />
-<input type="text" size="50" name="comment">
+<input type="text" size="50" name="comment" />
 $uploadtag
-<input type="hidden" name="cmd" value="upload_default">
+<input type="hidden" name="cmd" value="upload_default" />
 <br />
-<nobr>
+<span class="LC_nobreak">
 <label>$lt{'parse'}?
-<input type="checkbox" name="parserflag" />
+<input type="checkbox" name="parserflag" checked="checked" />
 </label>
-</nobr>
+</span>
 <br />
 <br />
-<nobr>
-<input type="submit" value="$lt{'upld'}">
+<span class="LC_nobreak">
+<input type="submit" value="$lt{'upld'}" />
  $help{'Uploading_From_Harddrive'}
-</nobr>
+</span>
 </form>
 </td>
-<td bgcolor="#DDDDDD">
+<td>
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 $lt{'pubd'}<br />
 $uploadtag
-<input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
 <br />
-<nobr>
-<input type=button onClick="javascript:groupimport();" value="$lt{'impo'}" />
+<span class="LC_nobreak">
+<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
 $help{'Importing_LON-CAPA_Resource'}
-</nobr>
+</span>
 <br />
-<input type=button onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
-<p>
+<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
 <hr />
+<p>
 $lt{'copm'}<br />
-<input type="text" size="40" name="importmap"><br />
-<nobr><input type=button 
+<input type="text" size="40" name="importmap" /><br />
+<span class="LC_nobreak"><input type="button" 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
-$help{'Load_Map'}</nobr>
+value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
+$help{'Load_Map'}</span>
 </p>
 </form>
 <hr />
@@ -2752,124 +2925,133 @@ ENDFORM
 <form action="/adm/coursedocs" method="post" name="newext">
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/imsimportdocs" method="post" name="ims">
 <input type="hidden" name="folder" value="$folder" />
 <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
-</nobr>
 </form>
 ENDFORM
        }
-       $r->print('</td><td bgcolor="#DDDDDD">');
+       $r->print('</td><td>');
        unless ($env{'form.pagepath'}) {
+	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
            $r->print(<<ENDFORM);
 <br /><form action="/adm/coursedocs" method="post" name="newfolder">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
 value="$lt{'newf'}" />$help{'Adding_Folders'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newpage">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newpage" type="button"
 onClick="javascript:makenewpage(this.form,'$pageseq');"
 value="$lt{'newp'}" />$help{'Adding_Pages'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag
 <input type="hidden" name="importdetail" 
-value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-<nobr>
+value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
+<span class="LC_nobreak">
 <input name="newsyl" type="submit" value="$lt{'syll'}" /> 
  $help{'Syllabus'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newnav">
 $uploadtag
 <input type="hidden" name="importdetail" 
-value="Navigate Content=/adm/navmaps" />
-<nobr>
+value="$lt{'navc'}=/adm/navmaps" />
+<span class="LC_nobreak">
 <input name="newnav" type="submit" value="$lt{'navc'}" />
 $help{'Navigate_Content'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newsmppg">
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newsmppg" type="button" value="$lt{'sipa'}"
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newdropbox">
 $uploadtag      
 <input type="hidden" name="importdetail" value="" />
-<nobr>          
+<span class="LC_nobreak">          
 <input name="newdropbox" type="button" value="$lt{'drbx'}"
 onClick="javascript:makedropbox();" />
-</nobr>         
+</span>         
 </form> 
 <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
 onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newbul">
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newbulletin" type="button" value="$lt{'bull'}"
 onClick="javascript:makebulboard();" />
 $help{'Bulletin Board'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newaboutme">
 $uploadtag
 <input type="hidden" name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 $help{'My Personal Info'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
 onClick="javascript:makeabout();" />
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
 $uploadtag
 <input type="hidden" name="importdetail"
-value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
-<nobr>
+value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
+<span class="LC_nobreak">
 <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
 $help{'Group Files'}
-</nobr>
+</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
        }
@@ -2878,19 +3060,19 @@ ENDFORM
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
 $uploadtag
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
 onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}
-</nobr>
+</span>
 </form>
 ENDBLOCK
        }
@@ -2900,7 +3082,7 @@ ENDBLOCK
     }
 # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {
-       $r->print('<tr><td bgcolor="#BBBBBB">');
+       $r->print('<tr><td class="LC_docs_document">');
 # '<h2>'.&mt('Supplemental Course Documents').
 #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$env{'form.folder'};
@@ -2908,97 +3090,107 @@ 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.
-                     '.sequence';
-
-          $r->print(<<ENDSUPFORM);
-<table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">$lt{'upls'}</th>
-<th bgcolor="#DDDDDD">$lt{'spec'}</th>
+	   my $folderseq=
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+	       '.sequence';
+
+	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+	   $r->print(<<ENDSUPFORM);
+<table class="LC_docs_adddocs"><tr>
+<th>$lt{'upls'}</th>
+<th>$lt{'spec'}</th>
 </tr>
-<tr><td bgcolor="#DDDDDD">
+<tr><td>
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
-<input type="file" name="uploaddoc" size="40">
+<input type="file" name="uploaddoc" size="40" />
 <br />
 <br />
-<nobr>
+<span class="LC_nobreak">
 <label>$lt{'parse'}?
 <input type="checkbox" name="parserflag" />
 </label>
-</nobr>
+</span>
 <br /><br />
 $lt{'comment'}:<br />
 <textarea cols=50 rows=4 name='comment'>
 </textarea>
 <br />
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
-<input type="hidden" name="cmd" value="upload_supplemental">
-<nobr>
-<input type="submit" value="$lt{'upld'}">
+<input type="hidden" name="folderpath" value="$path" />
+<input type="hidden" name="cmd" value="upload_supplemental" />
+<span class="LC_nobreak">
+<input type="submit" value="$lt{'upld'}" />
  $help{'Uploading_From_Harddrive'}
-</nobr>
+</span>
 </form>
 </td>
-<td bgcolor="#DDDDDD">
+<td>
 <form action="/adm/coursedocs" method="post" name="supnewfolder">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
 value="$lt{'newf'}" /> $help{'Adding_Folders'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="supnewext">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
 <input type="hidden" name="importdetail" value="" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newext" type="button" 
 onClick="javascript:makenewext('supnewext');"
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
 <input type="hidden" name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newsyl" type="submit" value="$lt{'syll'}" />
 $help{'Syllabus'}
-</nobr>
+</span>
 </form>
 <br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
-<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+<input type="hidden" name="folderpath" value="$path" />
 <input type="hidden" name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme" />
-<nobr>
+<span class="LC_nobreak">
 <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 $help{'My Personal Info'}
-</nobr>
+</span>
 </form>
 </td></tr>
 </table></td></tr>
 ENDSUPFORM
        }
     }
+    $r->print('</table>');
     if ($allowed) {
-	$r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>');
+	$r->print('
+<form method="post" name="extimport" action="/adm/coursedocs">
+  <input type="hidden" name="title" />
+  <input type="hidden" name="url" />
+  <input type="hidden" name="useform" />
+  <input type="hidden" name="residx" />
+</form>');
     }
-    $r->print('</table>');
   } else {
       unless ($upload_result eq 'phasetwo') {
 # -------------------------------------------------------- This is showdoc mode
           $r->print("<h1>".&mt('Uploaded Document').' - '.
 		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
-&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
-          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
+&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
+          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
       }
   }
  }
@@ -3010,10 +3202,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();
@@ -3021,7 +3236,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();
@@ -3030,11 +3245,22 @@ function makenewpage(targetform,folderse
 
 function makenewext(targetname) {
     this.document.forms.extimport.useform.value=targetname;
+    this.document.forms.extimport.title.value='';
+    this.document.forms.extimport.url.value='';
+    this.document.forms.extimport.residx.value='';
+    window.open('/adm/rat/extpickframe.html');
+}
+
+function edittext(targetname,residx,title,url) {
+    this.document.forms.extimport.useform.value=targetname;
+    this.document.forms.extimport.residx.value=residx;
+    this.document.forms.extimport.url.value=url;
+    this.document.forms.extimport.title.value=title;
     window.open('/adm/rat/extpickframe.html');
 }
 
 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';
@@ -3043,7 +3269,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';
@@ -3052,7 +3278,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';
@@ -3061,7 +3287,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';
@@ -3070,7 +3296,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';
@@ -3079,20 +3305,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'}");
        }
    }
 }
@@ -3109,14 +3335,14 @@ function finishpick() {
     var title=this.document.forms.extimport.title.value;
     var url=this.document.forms.extimport.url.value;
     var form=this.document.forms.extimport.useform.value;
-    eval
-     ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
-    '";this.document.forms.'+form+'.submit();');
+    var residx=this.document.forms.extimport.residx.value;
+    eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
 }
 
 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;
 	this.document.forms.renameform.cmd.value='rename_'+index;
         if (container == 'sequence') {
@@ -3130,8 +3356,9 @@ 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('$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') {
             this.document.forms.renameform.folderpath.value=folderpath;
@@ -3144,10 +3371,11 @@ function removeres(folderpath,index,oldt
     }
 }
 
-function cutres(folderpath,index,oldtitle,container,pagesymb) {
-    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('$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;
         if (container == 'sequence') {
             this.document.forms.renameform.folderpath.value=folderpath;
         }
@@ -3159,8 +3387,9 @@ function cutres(folderpath,index,oldtitl
     }
 }
 
-function markcopy(folderpath,index,oldtitle,container,pagesymb) {
+function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
     this.document.forms.renameform.markcopy.value=index;
+    this.document.forms.renameform.copyfolder.value=folder+'.'+container;
     if (container == 'sequence') {
 	this.document.forms.renameform.folderpath.value=folderpath;
     }
@@ -3175,3 +3404,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