--- loncom/interface/londocs.pm	2007/06/28 23:26:46	1.278.2.1
+++ loncom/interface/londocs.pm	2007/07/03 00:17:42	1.283
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.278.2.1 2007/06/28 23:26:46 albertel Exp $
+# $Id: londocs.pm,v 1.283 2007/07/03 00:17:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -122,16 +122,17 @@ 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>';
     }
 }
 
@@ -199,9 +200,9 @@ sub dumpcourse {
 		$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 {
@@ -257,10 +258,10 @@ sub dumpcourse {
 
 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 {
@@ -379,7 +380,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";
@@ -958,16 +959,9 @@ 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);
@@ -977,7 +971,7 @@ sub breadcrumbs {
 	    &escape($folderpath);
             my $name=&unescape($foldername);
 # randompick number, hidden, encrypted is appended with ":"s to the foldername	
-            $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
+            $name=~s/\:(\d*)\:(\w*)\:(\w*)$//;
             if ($1 ne '') { 
                $randompick=$1;
             } else {
@@ -985,7 +979,6 @@ sub breadcrumbs {
             }
             if ($2) { $ishidden=1; }
             if ($3) { $isencrypted=1; }
-            if ($4 ne '') { $is_random_order = 1; }
 	    &Apache::lonhtmlcommon::add_breadcrumb(
 		      {'href'=>$url.$cpinfo,
 		       'title'=>$name,
@@ -997,7 +990,7 @@ sub breadcrumbs {
     }
     $plain=~s/\&gt\;\s*$//;
     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
-					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain);
 }
 
 sub log_docs {
@@ -1088,7 +1081,6 @@ 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().
@@ -1158,7 +1150,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));
 	    }
 	}        
@@ -1171,7 +1163,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','randomorder') {
+	    foreach my $parameter ('randompick','hiddenresource','encrypturl') {
 		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
 		    $r->print('<li>'.
 			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
@@ -1188,35 +1180,83 @@ sub docs_change_log {
               || $shown<=$env{'form.show'})) { last; }
     }
     $r->print(&Apache::loncommon::end_data_table());
-    $r->print(&Apache::loncommon::end_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)) {
+	($title) = &parse_supplemental_title($title);
+    }
+    &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);
+<p><form name="pasteform" action="/adm/coursedocs" method="post">
+ENDPASTE
+    $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');
+
+    my $type;
+    if ($env{'docs.markedcopy_url'} =~ m{^/adm/wrapper/ext}) {
+	$type = &mt('External Resource');
+	$r->print($type.': '.&Apache::map::qtescape($env{'docs.markedcopy_title'}));
+    }  else {
+	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
+	my $type = &Apache::loncommon::filedescription($extension);
+	my $icon = '<img src="'.&Apache::loncommon::icon($extension).
+	    '" class="LC_icon" />';
+	$r->print($icon.$type.': '.  &parse_supplemental_title($env{'docs.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
+    }
+    $r->print('</form></p>');
 }
 
 sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;
     my $errtext='';
     my $fatal=0;
     my $container='sequence';
     if ($env{'form.pagepath'}) {
         $container='page';
     }
-    ($errtext,$fatal)=
-              &mapread($coursenum,$coursedom,$folder.'.'.$container);
+    ($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container);
     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,$is_random_order)=&breadcrumbs($folder);
+    
+    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder);
     $r->print($breadcrumbtrail);
     if ($fatal) {
-	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
+	   $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
     } else {
 # ------------------------------------------------------------ Process commands
 
@@ -1254,19 +1294,10 @@ sub editor {
 			&remember_parms($idx,'encrypturl','del');
 		    }
 		}
-		if ($env{'form.changeparms'} eq 'randomorder') {
-		    if ($env{'form.randorder_'.$idx}) {
-			&LONCAPA::map::storeparameter($idx,'parameter_randomorder','yes','string_yesno');
-			&remember_parms($idx,'randomorder','set',$env{'form.randorder_'.$idx});
-		    } else {
-			&LONCAPA::map::delparameter($idx,'parameter_randomorder');
-			&remember_parms($idx,'randomorder','del');
-		    }
-		}
 # store the changed version
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 		if ($fatal) {
-		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
 		    return;
 		}
 	    }
@@ -1306,15 +1337,15 @@ sub editor {
 # store the changed version
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 		if ($fatal) {
-		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
 		    return;
 		}
 	    }
-		
+	    
 	    if ($env{'form.pastemarked'}) {
 # paste resource to end of list
-                my $url=$env{'form.markedcopy_url'};
-		my $title=$env{'form.markedcopy_title'};
+                my $url=$env{'docs.markedcopy_url'};
+		my $title=$env{'docs.markedcopy_title'};
 # Maps need to be copied first
 		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
 		    $title=&mt('Copy of').' '.$title;
@@ -1340,7 +1371,7 @@ sub editor {
 # Store the result
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 		if ($fatal) {
-		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
 		    return;
 		}
 
@@ -1397,7 +1428,7 @@ sub editor {
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
 					    $folder.'.'.$container);
 		if ($fatal) {
-		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
 		    return;
 		}
             }
@@ -1417,7 +1448,7 @@ sub editor {
 		($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
 					       $container,'londocs',@imports);
 		if ($fatal) {
-		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
 		    return;
 		}
             }
@@ -1434,34 +1465,30 @@ sub editor {
   	          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
 					   $folder.'.'.$container);
 	          if ($fatal) {
-		      $r->print('<p><font color="red">'.$errtext.'</font></p>');
+		      $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
 		      return;
 	          }
                } else {
-                   $r->print('<p><font color="red">'.&mt('No map selected.').'</font></p>');
+		    $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
+
                }
            }
            &log_differences($plain);
-       }
+	}
 # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen
         my $idx=0;
 	my $shown=0;
-        if (($ishidden) || ($isencrypted) || ($randompick>=0) 
-	    || ($is_random_order)) {
+        if (($ishidden) || ($isencrypted) || ($randompick>=0)) {
            $r->print('<p>'.&mt('Parameters').':<ul>'.
                      ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
-                     ($is_random_order?'<li>'.&mt('contents randomly ordered').'</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. Do not modify the contents of this folder if it is in active student use.').'</p>');
-        }
         $r->print('<table>');
         foreach my $res (@LONCAPA::map::order) {
            my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
@@ -1478,37 +1505,9 @@ sub editor {
 	    $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').'" /> ');
 
-	    my $type;
-	    if ($env{'form.markedcopy_url'} =~ m{^/adm/wrapper/ext}) {
-		$type = &mt('External Resource');
-		$r->print($type.': '. $env{'form.markedcopy_title'});
-	    }  else {
-		my $extension = (split(/\./,$env{'form.markedcopy_url'}))[-1];
-		my $type = &Apache::loncommon::filedescription($extension);
-		my $icon = '<img src="'.&Apache::loncommon::icon($extension).
-		    '" class="LC_icon" />';
-		$r->print($icon.$type.': '. $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
-	    }
-	    $r->print('</form></p>');
-	}
+	&print_paste_buffer($r,$container);
+
     }
 }
 
@@ -1572,7 +1571,7 @@ 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') {
@@ -1580,7 +1579,7 @@ sub process_file_upload {
                 if ($total_embedded > 0) {
                     my $num = 0;
 		    my $state = '
-   <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" />
+   <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).'" />
@@ -1668,46 +1667,72 @@ 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=&HTML::Entities::encode($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;
     my $line='<tr>';
 # 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='';
@@ -1755,82 +1780,50 @@ sub entryline {
         }
         my $copylink='&nbsp;';
         my $cutlink='&nbsp;';
-        if ($env{'form.pagepath'}) {
-           if (!$nocopy) {
-               $copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+	
+	if (!$nocopy) {
+	    $copylink=(<<ENDCOPY);
+<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");'>
+<font size="-2" color="#000099">$lt{'cp'}</font></a>
 ENDCOPY
-           }
-           if (!$nocut) {
-               $cutlink=(<<ENDCUT);
-<a href='javascript:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#550044">$lt{'ct'}</font></a>
-ENDCUT
-            }
-            $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>
-$cutlink
-<a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
-<font size="-2" color="#009900">$lt{'rn'}</font></a>
-$copylink
-END
-        } else {
-           if (!$nocopy) {
-               $copylink=(<<ENDCOPY);
-<a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#000099">$lt{'cp'}</font></a></td>
-ENDCOPY
-            }
-            if (!$nocut) {
-               $cutlink=(<<ENDCUT);
-<a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'>
+        }
+	if (!$nocut) {
+	    $cutlink=(<<ENDCUT);
+<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");'>
 <font size="-2" color="#550044">$lt{'ct'}</font></a>
 ENDCUT
-            }
-            $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>
+        }
+	$line.=(<<END);
+   <form name="entry_$index" 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" />
+<td>
+   <table border='0' cellspacing='2' cellpadding='0'>
+      <tr>
+         <td bgcolor="#DDDDDD">
+            <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 bgcolor="#DDDDDD">
+           <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>
+   $selectbox
+</td>
+<td bgcolor="#DDDDDD">
+   <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb");'><font size="-2" color="#990000">$lt{'rm'}</font></a>
 $cutlink
-<a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
-<font size="-2" color="#009900">$lt{'rn'}</font></a>
+   <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");'><font size="-2" color="#009900">$lt{'rn'}</font></a>
 $copylink
+</td>
 END
-        }
+
     }
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
@@ -1906,9 +1899,7 @@ END
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_hiddenresource'))[0]=~/^yes$/i)
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_encrypturl'))[0]=~/^yes$/i)
-                                               .':'.((&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randomorder'))[0]=~/^yes$/i);
+                                              'parameter_encrypturl'))[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="'.
@@ -1934,30 +1925,25 @@ END
 					       $path.$pagearg.'.page');
 	}
 	$url.='pagepath='.&escape($pagepath).
-	    '&pagesymb='.&escape($symb).$cpinfo;
+	    '&amp;pagesymb='.&escape($symb).$cpinfo;
     }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
-	'" border="0"></a></td>'.
+	'" class="LC_icon" /></a></td>'.
         "<td bgcolor='#FFFFBB'>".($url?"<a href=\"$url\">":'').$title.
         ($url?'</a>':' <font size="-2">'.&mt('(re-initialize course to access)').'</font>')."</td>";
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
- 			      'ec' => 'URL hidden',
- 			      'ro' => 'Random Order',);
+ 			      'ec' => 'URL hidden');
 	my $enctext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
+	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
 	my $hidtext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
-	my $rotext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+	    ((&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'>
-<nobr><label><input type="checkbox" name="randorder_$orderidx" onClick="this.form.changeparms.value='randomorder';this.form.submit()" $rotext /> $lt{'ro'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
 ENDPARMS
     }
@@ -2027,17 +2013,17 @@ sub checkonthis {
                  if (($errorcount) ||
                      ($warningcount)) {
 		     if ($errorcount) {
-                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
 			  $errorcount.' '.
-				  &mt('error(s)').'</b></font> ');
+				  &mt('error(s)').'</span> ');
                      }
 		     if ($warningcount) {
-                        $r->print('<font color="blue">'.
+                        $r->print('<span class="LC_warning">'.
 			  $warningcount.' '.
-				  &mt('warning(s)').'</font>');
+				  &mt('warning(s)').'</span>');
                      }
                  } else {
-                     $r->print('<font color="green">'.&mt('ok').'</font>');
+                     $r->print('<span class="LC_success">'.&mt('ok').'</span>');
                  }
                  $r->rflush();
              }
@@ -2049,15 +2035,15 @@ sub checkonthis {
                  }
              }
           } 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></font>');
 	      } 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>');
           }
       }
    }
@@ -2099,9 +2085,9 @@ sub verifycontent {
    foreach (keys %hash) {
        if ($hash{$_}=~/\.(page|sequence)$/) {
 	   if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {
-	       $r->print('<hr /><font color="red">'.
+	       $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{$_}).'</span><br />'.
 			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
 	   }
        }
@@ -2181,7 +2167,7 @@ sub checkversions {
 			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {		
 	    $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 Save 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();
     }
@@ -2412,11 +2398,11 @@ sub changewarning {
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
 '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.
-'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+'" /><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
@@ -2498,8 +2484,7 @@ sub handler {
     my $uploadtag;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['folderpath','pagepath',
-					     'pagesymb','markedcopy_url',
-					     'markedcopy_title']);
+					     'pagesymb']);
     if ($env{'form.folderpath'}) {
 	my (@folderpath)=split('&',$env{'form.folderpath'});
 	$env{'form.foldername'}=&unescape(pop(@folderpath));
@@ -2511,8 +2496,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;
@@ -2674,6 +2659,7 @@ sub handler {
 					  );
 # -----------------------------------------------------------------------------
     if ($allowed) {
+	&update_paste_buffer($coursenum,$coursedom);
        my $dumpbut=&dumpbutton();
        my $exportbut=&exportbutton();
        my %lt=&Apache::lonlocal::texthash(
@@ -2693,35 +2679,42 @@ 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)));
@@ -2802,10 +2795,10 @@ $help{'Importing_LON-CAPA_Resource'}
 <p>
 <hr />
 $lt{'copm'}<br />
-<input type="text" size="40" name="importmap"><br />
+<input type="text" size="40" name="importmap" /><br />
 <nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
+value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
 $help{'Load_Map'}</nobr>
 </p>
 </form>
@@ -2828,15 +2821,15 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 <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">');
        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>
 <input name="newfolder" type="button"
@@ -2845,7 +2838,7 @@ value="$lt{'newf'}" />$help{'Adding_Fold
 </nobr>
 </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>
 <input name="newpage" type="button"
@@ -2982,11 +2975,12 @@ ENDBLOCK
        }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {
-       my $folderseq=
-                  '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
-                     '.sequence';
+	   my $folderseq=
+	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+	       '.sequence';
 
-          $r->print(<<ENDSUPFORM);
+	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+	   $r->print(<<ENDSUPFORM);
 <table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">$lt{'upls'}</th>
 <th bgcolor="#DDDDDD">$lt{'spec'}</th>
@@ -3006,7 +3000,7 @@ $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="folderpath" value="$path" />
 <input type="hidden" name="cmd" value="upload_supplemental">
 <nobr>
 <input type="submit" value="$lt{'upld'}">
@@ -3016,7 +3010,7 @@ $lt{'comment'}:<br />
 </td>
 <td bgcolor="#DDDDDD">
 <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>
 <input name="newfolder" type="button"
@@ -3025,7 +3019,7 @@ value="$lt{'newf'}" /> $help{'Adding_Fol
 </nobr>
 </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>
 <input name="newext" type="button" 
@@ -3034,7 +3028,7 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
 </nobr>
 </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>
@@ -3043,7 +3037,7 @@ $help{'Syllabus'}
 </nobr>
 </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>
@@ -3185,6 +3179,7 @@ function finishpick() {
 function changename(folderpath,index,oldtitle,container,pagesymb) {
     var title=prompt('New Title',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') {
@@ -3200,6 +3195,7 @@ 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+'"?')) {
+	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;
@@ -3212,10 +3208,11 @@ function removeres(folderpath,index,oldt
     }
 }
 
-function cutres(folderpath,index,oldtitle,container,pagesymb) {
+function cutres(folderpath,index,oldtitle,container,pagesymb,folder) {
     if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
 	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;
         }
@@ -3227,8 +3224,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;
     }