loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.244 and 1.312

-version 1.244, 2006/08/11 22:00:07
+version 1.312, 2008/09/11 14:47:21
  Line 33  use Apache::Constants qw(:common :http);
  use Apache::imsexport;
  use Apache::lonnet;
  use Apache::loncommon;
- use Apache::lonratedt;
+ use LONCAPA::map();
- use Apache::lonratsrv;
+ use Apache::lonratedt();
  use Apache::lonxml;
  use Apache::lonclonecourse;
  use Apache::lonnavmaps;
  Line 42  use HTML::Entities;
  use GDBM_File;
  use Apache::lonlocal;
  use Cwd;
- use LONCAPA;
+ use LONCAPA qw(:DEFAULT :match);
  my $iconpath;
  Line 57  my $hadchanges;
  my %help=();
- # Mapread read maps into lonratedt::global arrays
+ # 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
  Line 66  my %help=();
  sub mapread {
      my ($coursenum,$coursedom,$map)=@_;
      return
-       &Apache::lonratedt::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
+       &LONCAPA::map::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-                                 $map);
+ 			     $map);
  }
  sub storemap {
      my ($coursenum,$coursedom,$map)=@_;
      my ($outtext,$errtext)=
-       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
+       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-                                 $map,1);
+ 			      $map,1);
      if ($errtext) { return ($errtext,2); }
      $hadchanges=1;
  Line 99  sub authorhosts {
  		$ca=$env{'user.name'};
  		$cd=$env{'user.domain'};
  	    } else {
- 		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
+ 		($cd,$ca)=($realm=~/^\/($match_domain)\/($match_username)$/);
  	    }
  	    my $allowed=0;
  	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
  Line 122  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>';
      }
  }
- Line 147  sub dumpcourse {
+ Line 148  sub dumpcourse {
      my $type = &Apache::loncommon::course_type();
      $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
  	      '<form name="dumpdoc" method="post">');
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));
      my ($home,$other,%outhash)=&authorhosts();
      unless ($home) { return ''; }
      my $origcrsid=$env{'request.course.id'};
- Line 198  sub dumpcourse {
+ Line 200  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 {
- Line 234  sub dumpcourse {
+ Line 236  sub dumpcourse {
  	    my ($ext)=($_=~/\.(\w+)$/);
  	    my $title=$hash{'title_'.$hash{
  		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
- 	    $title=~s/&colon;/:/g;
  	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
  	    if (!$title) {
  		$title=$_;
- Line 257  sub dumpcourse {
+ Line 258  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 {
- Line 308  sub exportcourse {
+ Line 309  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'));
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
          $r->print($outcome);
          $r->print(&Apache::loncommon::end_page());
      } else {
- Line 364  sub exportcourse {
+ Line 366  sub exportcourse {
              if (ref($curRes)) {
                  my $symb = $curRes->symb();
                  my $ressymb = $symb;
-                 if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                 if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
                      unless ($ressymb =~ m|adm/wrapper/adm|) {
                          $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                      }
- Line 378  sub exportcourse {
+ Line 380  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";
- Line 456  function containerCheck(item) {
+ Line 458  function containerCheck(item) {
          |;
  	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
  						 $scripttag));
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
  	$r->print($display.'</table>'.
                    '<p><input type="hidden" name="finishexport" value="1">'.
                    '<input type="submit" name="exportcourse" value="'.
- Line 610  sub build_package {
+ Line 613  sub build_package {
                          if (grep/^$count$/,@$discussions) {
                              my $ressymb = $symb;
                              my $mode;
-                             if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                             if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
                                  unless ($ressymb =~ m|adm/wrapper/adm|) {
                                      $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                                  }
- Line 695  sub process_content {
+ Line 698  sub process_content {
          }
      } elsif ($symb =~ m-lib/templates/examupload\.problem$-) {
          $content_type = 'examupload';
-     } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) {
+     } elsif ($symb =~ m-adm/($match_domain)/($match_username)/(\d+)/bulletinboard$-) {
          $content_type = 'bulletinboard';
          my $contents =  &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2);
          if ($contents) {
- Line 815  sub extract_media {
+ Line 818  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#([^/]+)$#) {
- Line 902  sub store_template {
+ Line 905  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 ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
-     my $coursedom = shift;
-     my $folder = shift;
+     while (@files) {
-     my $container = shift;
+ 	my ($name, $url, $residx) = @{ shift(@files) };
-     my $caller = shift;
+         if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
-     while (@_) {
+ 	     && ($caller eq 'londocs')
- 	my $name = shift;
+ 	     && (!&Apache::lonnet::stat_file($url))) {
- 	my $url = shift;
-         if (($url =~ m#^/uploaded/$coursedom/$coursenum/(default_\d+\.)(page|sequence)$#) && ($caller eq 'londocs')) {
              my $errtext = '';
              my $fatal = 0;
              my $newmapstr = '<map>'."\n".
- Line 922  sub group_import {
+ Line 924  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) {
- Line 930  sub group_import {
+ Line 932  sub group_import {
              }
          }
  	if ($url) {
- 	    my $idx = &Apache::lonratedt::getresidx($url);
+ 	    if (!$residx
- 	    $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
+ 		|| defined($LONCAPA::map::zombies[$residx])) {
+ 		$residx = &LONCAPA::map::getresidx($url,$residx);
+ 		push(@LONCAPA::map::order, $residx);
+ 	    }
  	    my $ext = 'false';
- 	    if ($url=~/^http:\/\//) { $ext = 'true'; }
+ 	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
- 	    $url =~ s/:/\&colon;/g;
+ 	    $url  = &LONCAPA::map::qtunescape($url);
- 	    $name =~ s/:/\&colon;/g;
+ 	    $name = &LONCAPA::map::qtunescape($name);
- 	    $Apache::lonratedt::resources[$idx] =
+ 	    $LONCAPA::map::resources[$residx] =
- 		join ':', ($name, $url, $ext, 'normal', 'res');
+ 		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'}) {
- Line 954  sub breadcrumbs {
+ Line 959  sub breadcrumbs {
      }
      my $folderpath;
      my $cpinfo='';
-     if ($env{'form.markedcopy_url'}) {
+     my $plain='';
-        $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);
+ 	    my $name=&unescape($foldername);
- # randompick number, hidden, encrypted is appended with ":"s to the foldername
+ # randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
-             $name=~s/\:(\d*)\:(\w*)\:(\w*)$//;
+  	    $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
-             if ($1 ne '') {
+ 	    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);
+ 					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
  }
- sub editor {
+ sub log_docs {
-     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
+     return &Apache::lonnet::instructor_log('docslog',@_);
-     my $errtext='';
+ }
-     my $fatal=0;
-     my $container='sequence';
+ {
-     if ($env{'form.pagepath'}) {
+     my @oldresources=();
-         $container='page';
+     my @oldorder=();
+     my $parmidx;
+     my %parmaction=();
+     my %parmvalue=();
+     my $changedflag;
+     sub snapshotbefore {
+         @oldresources=@LONCAPA::map::resources;
+         @oldorder=@LONCAPA::map::order;
+         $parmidx=undef;
+         %parmaction=();
+         %parmvalue=();
+         $changedflag=0;
+     }
+     sub remember_parms {
+         my ($idx,$parameter,$action,$value)=@_;
+         $parmidx=$idx;
+         $parmaction{$parameter}=$action;
+         $parmvalue{$parameter}=$value;
+         $changedflag=1;
+     }
+     sub log_differences {
+         my ($plain)=@_;
+         my %storehash=('folder' => $plain,
+                        'currentfolder' => $env{'form.folder'});
+         if ($parmidx) {
+            $storehash{'parameter_res'}=$oldresources[$parmidx];
+            foreach my $parm (keys %parmaction) {
+               $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
+               $storehash{'parameter_value_'.$parm}=$parmvalue{$parm};
+            }
+         }
+         my $maxidx=$#oldresources;
+         if ($#LONCAPA::map::resources>$#oldresources) {
+            $maxidx=$#LONCAPA::map::resources;
+         }
+         for (my $idx=0; $idx<=$maxidx; $idx++) {
+            if ($LONCAPA::map::resources[$idx] ne $oldresources[$idx]) {
+               $storehash{'before_resources_'.$idx}=$oldresources[$idx];
+               $storehash{'after_resources_'.$idx}=$LONCAPA::map::resources[$idx];
+               $changedflag=1;
+            }
+            if ($LONCAPA::map::order[$idx] ne $oldorder[$idx]) {
+               $storehash{'before_order_res_'.$idx}=$oldresources[$oldorder[$idx]];
+               $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
+               $changedflag=1;
+            }
+         }
+ 	$storehash{'maxidx'}=$maxidx;
+         if ($changedflag) { &log_docs(\%storehash); }
      }
-     ($errtext,$fatal)=
+ }
-               &mapread($coursenum,$coursedom,$folder.'.'.$container);
-     if ($#Apache::lonratedt::order<1) {
- 	my $idx=&Apache::lonratedt::getresidx();
+ #
- 	if ($idx<=0) { $idx=1; }
+ # Docs Change Log
-        	$Apache::lonratedt::order[0]=$idx;
+ #
-         $Apache::lonratedt::resources[$idx]='';
+ sub docs_change_log {
+     my ($r)=@_;
+     my $folder=$env{'form.folder'};
+     $r->print(&Apache::loncommon::start_page('Course Document Change Log'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
+     my %docslog=&Apache::lonnet::dump('nohist_docslog',
+                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
+                                       $env{'course.'.$env{'request.course.id'}.'.num'});
+     if ((keys(%docslog))[0]=~/^error\:/) { undef(%docslog); }
+     $r->print('<form action="/adm/coursedocs" method="post" name="docslog">'.
+               '<input type="hidden" name="docslog" value="1" />');
+     my %saveable_parameters = ('show' => 'scalar',);
+     &Apache::loncommon::store_course_settings('docs_log',
+                                               \%saveable_parameters);
+     &Apache::loncommon::restore_course_settings('docs_log',
+                                                 \%saveable_parameters);
+     if (!$env{'form.show'}) { $env{'form.show'}=10; }
+     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().
+               '<input type="hidden" name="folder" value="'.$folder.'" />'.
+               '<input type="submit" value="'.&mt('Display').'" /></form>');
+     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
+               '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Folder').'</th><th>'.&mt('Before').'</th><th>'.
+               &mt('After').'</th>'.
+               &Apache::loncommon::end_data_table_header_row());
+     my $shown=0;
+     foreach my $id (sort { $docslog{$b}{'exe_time'}<=>$docslog{$a}{'exe_time'} } (keys(%docslog))) {
+ 	if ($env{'form.displayfilter'} eq 'currentfolder') {
+ 	    if ($docslog{$id}{'logentry'}{'currentfolder'} ne $folder) { next; }
+ 	}
+         my @changes=keys(%{$docslog{$id}{'logentry'}});
+         if ($env{'form.displayfilter'} eq 'containing') {
+ 	    my $wholeentry=$docslog{$id}{'exe_uname'}.':'.$docslog{$id}{'exe_udom'}.':'.
+ 		&Apache::loncommon::plainname($docslog{$id}{'exe_uname'},$docslog{$id}{'exe_udom'});
+ 	    foreach my $key (@changes) {
+ 		$wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
+ 	    }
+ 	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
+ 	}
+         my $count = 0;
+         my $time =
+             &Apache::lonlocal::locallocaltime($docslog{$id}{'exe_time'});
+         my $plainname =
+             &Apache::loncommon::plainname($docslog{$id}{'exe_uname'},
+                                           $docslog{$id}{'exe_udom'});
+         my $about_me_link =
+             &Apache::loncommon::aboutmewrapper($plainname,
+                                                $docslog{$id}{'exe_uname'},
+                                                $docslog{$id}{'exe_udom'});
+         my $send_msg_link='';
+         if ((($docslog{$id}{'exe_uname'} ne $env{'user.name'})
+              || ($docslog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
+             $send_msg_link ='<br />'.
+                 &Apache::loncommon::messagewrapper(&mt('Send message'),
+                                                    $docslog{$id}{'exe_uname'},
+                                                    $docslog{$id}{'exe_udom'});
+         }
+         $r->print(&Apache::loncommon::start_data_table_row());
+         $r->print('<td>'.$time.'</td>
+                        <td>'.$about_me_link.
+                   '<br /><tt>'.$docslog{$id}{'exe_uname'}.
+                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
+                   $send_msg_link.'</td><td>'.
+                   $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
+ # Before
+ 	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) {
+ 		$r->print(&LONCAPA::map::qtescape($oldname));
+ 	    }
+ 	}
+ 	$r->print('<ul>');
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+             if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
+ 		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+ 	    }
+ 	}
+ 	$r->print('</ul>');
+ # After
+         $r->print('</td><td>');
+ 	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 '' && $oldname ne $newname) {
+ 		$r->print(&LONCAPA::map::qtescape($newname));
+ 	    }
+ 	}
+ 	$r->print('<ul>');
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+             if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
+ 		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+ 	    }
+ 	}
+ 	$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') {
+ 		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
+ 		    $r->print('<li>'.
+ 			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
+ 				  $docslog{$id}{'logentry'}{'parameter_value_'.$parameter})
+ 			      .'</li>');
+ 		}
+ 	    }
+ 	    $r->print('</ul>');
+ 	}
+ # End
+         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
+         $shown++;
+         if (!($env{'form.show'} eq &mt('all')
+               || $shown<=$env{'form.show'})) { last; }
      }
-     if (defined($env{'form.markcopy'})) {
+     $r->print(&Apache::loncommon::end_data_table());
+ }
+ 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(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$env{'form.markcopy'}]]);
+     my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
- 	$env{'form.markedcopy_title'}=$title;
+     if (&is_supplemental_title($title)) {
- 	$env{'form.markedcopy_url'}=$url;
+         &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'},'<>&"').'" />
+ ');
      }
-     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted)=&breadcrumbs($folder);
+     $r->print('</p></form>');
-     $r->print($breadcrumbtrail);
+ }
-     if ($fatal) {
- 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ sub do_paste_from_buffer {
+     my ($coursenum,$coursedom,$folder) = @_;
+     return 0 if (!$env{'form.pastemarked'});
+ # paste resource to end of list
+     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
+     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
+ # 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;
+     }
+ # 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);
+ # Store the result
+ }
+ 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]='';
+     }
+     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
+ 	&breadcrumbs($folder,$allowed,$type);
+     $r->print($breadcrumbtrail);
  # ------------------------------------------------------------ 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
- 	    if (defined($env{'form.setparms'})) {
+ 	&snapshotbefore();
- 		my $idx=$env{'form.setparms'};
- # set parameters
- 		if ($env{'form.randpick_'.$idx}) {
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
- 		} else {
- 		    &Apache::lonratedt::delparameter($idx,'parameter_randompick');
- 		}
- 		if ($env{'form.hidprs_'.$idx}) {
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
- 		} else {
- 		    &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
- 		}
- 		if ($env{'form.encprs_'.$idx}) {
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
- 		} else {
- 		    &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
- 		}
- 		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 $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1);
+ 	    splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res);
- 		    my $newpos=$env{'form.newpos'}-1;
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		    my $currentpos=$env{'form.currentpos'}-1;
+ 	    return $errtext if ($fatal);
- 		    my $i;
+ 	}
- 		    my @neworder=();
- 		    if ($newpos>$currentpos) {
+ 	if ($env{'form.pastemarked'}) {
- # moving stuff up
+ 	    &do_paste_from_buffer($coursenum,$coursedom,$folder);
- 			for ($i=0;$i<$currentpos;$i++) {
+ 	    ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
+ 	    return $errtext if ($fatal);
- 			}
+ 	}
- 			for ($i=$currentpos;$i<$newpos;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i+1];
- 			}
-                         $neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
- 			for ($i=$newpos+1;$i<=$#Apache::lonratedt::order;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 		    } else {
- # moving stuff down
- 			for ($i=0;$i<$newpos;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 			$neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
- 			for ($i=$newpos+1;$i<$currentpos+1;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i-1];
- 			}
- 			for ($i=$currentpos+1;$i<=$#Apache::lonratedt::order;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 		    }
- 		    @Apache::lonratedt::order=@neworder;
- 		}
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	$r->print($upload_output);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ 	if (&handle_edit_cmd()) {
- 		    return;
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	    return $errtext if ($fatal);
+ 	}
+ # Group import/search
+ 	if ($env{'form.importdetail'}) {
+ 	    my @imports;
+ 	    foreach (split(/\&/,$env{'form.importdetail'})) {
+ 		if (defined($_)) {
+ 		    my ($name,$url,$residx)=
+ 			map {&unescape($_)} split(/\=/,$_);
+ 		    push(@imports, [$name, $url, $residx]);
  		}
  	    }
- 	    if ($env{'form.pastemarked'}) {
+ 	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
- # paste resource to end of list
+ 					    $container,'londocs',@imports);
-                 my $url=$env{'form.markedcopy_url'};
+ 	    return $errtext if ($fatal);
- 		my $title=$env{'form.markedcopy_title'};
+ 	}
- # Maps need to be copied first
+ # Loading a complete map
- 		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
+ 	if ($env{'form.loadmap'}) {
- 		    $title=&mt('Copy of').' '.$title;
+ 	    if ($env{'form.importmap'}=~/\w/) {
-                     my $newid=$$.time;
+ 		foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
- 		    $url=~/^(.+)\.(\w+)$/;
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$res);
- 		    my $newurl=$1.$newid.'.'.$2;
+ 		    my $idx=&LONCAPA::map::getresidx($url);
- 		    my $storefn=$newurl;
+ 		    $LONCAPA::map::resources[$idx]=$res;
-                     $storefn=~s/^\/\w+\/\w+\/\w+\///;
+ 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
- 		    &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=&Apache::lonratedt::getresidx($url);
- 		$Apache::lonratedt::resources[$newidx]=
- 		    $title.':'.$url.':'.$ext.':normal:res';
- 		$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
- # Store the result
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
  		}
- 	    }
-             $r->print($upload_output);
- 	    if ($env{'form.cmd'}) {
-                 my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
-                 if ($cmd eq 'del') {
- 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
- 		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
- 			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
- 			&Apache::lonnet::removeuploadedurl($url);
- 		    } else {
- 			&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
- 		    }
- 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
-                         $Apache::lonratedt::order[$i]=
-                           $Apache::lonratedt::order[$i+1];
-                     }
-                     $#Apache::lonratedt::order--;
-                 } elsif ($cmd eq 'cut') {
- 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
- 		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
- 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
-                         $Apache::lonratedt::order[$i]=
-                           $Apache::lonratedt::order[$i+1];
-                     }
-                     $#Apache::lonratedt::order--;
-                 } elsif ($cmd eq 'up') {
- 		  if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) {
-                     my $i=$Apache::lonratedt::order[$idx-1];
-                     $Apache::lonratedt::order[$idx-1]=
- 			$Apache::lonratedt::order[$idx];
-                     $Apache::lonratedt::order[$idx]=$i;
- 		   }
-                 } elsif ($cmd eq 'down') {
- 		   if (defined($Apache::lonratedt::order[$idx+1])) {
-                     my $i=$Apache::lonratedt::order[$idx+1];
-                     $Apache::lonratedt::order[$idx+1]=
- 			$Apache::lonratedt::order[$idx];
-                     $Apache::lonratedt::order[$idx]=$i;
- 		   }
-                 } elsif ($cmd eq 'rename') {
-                     my $ratstr = $Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]];
-                     my ($rtitle,@rrest)=split(/\:/,
-                        $Apache::lonratedt::resources[
- 				       $Apache::lonratedt::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/) {
- 			$Apache::lonratedt::resources[
- 				       $Apache::lonratedt::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) {
+ 		return $errtext if ($fatal);
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ 	    } else {
- 		    return;
+ 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
- 		}
-             }
- # 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;
- 		    }
- 		}
- # 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;
- 		}
-             }
- # 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=&Apache::lonratedt::getresidx($url);
-                       $Apache::lonratedt::resources[$idx]=$_;
-                       $Apache::lonratedt::order
- 		          [$#Apache::lonratedt::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>');
-                }
-            }
-        }
- # ---------------------------------------------------------------- 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 (@Apache::lonratedt::order) {
-            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
- 	   $name=&Apache::lonratsrv::qtescape($name);
- 	   $url=&Apache::lonratsrv::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
  	    }
- 	    $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 {
- Line 1306  sub process_file_upload {
+ Line 1540  sub process_file_upload {
          }
          ($errtext,$fatal)=
                &mapread($coursenum,$coursedom,$folder.'.'.$container);
-         if ($#Apache::lonratedt::order<1) {
+         if ($#LONCAPA::map::order<1) {
-             $Apache::lonratedt::order[0]=1;
+             $LONCAPA::map::order[0]=1;
-             $Apache::lonratedt::resources[1]='';
+             $LONCAPA::map::resources[1]='';
          }
          if ($fatal) {
              return 'failed';
- Line 1324  sub process_file_upload {
+ Line 1558  sub process_file_upload {
          }
  # this is for a course, not a user, so set coursedoc flag
  # probably the only place in the system where this should be "1"
-         my $newidx=&Apache::lonratedt::getresidx();
+         my $newidx=&LONCAPA::map::getresidx();
          $destination .= $newidx;
          my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination,
  						$parseaction,$allfiles,
  						$codebase);
          my $ext='false';
-         if ($url=~/^http\:\/\//) { $ext='true'; }
+         if ($url=~m{^http://}) { $ext='true'; }
-         $url=~s/\:/\&colon;/g;
+ 	$url     = &LONCAPA::map::qtunescape($url);
          my $comment=$env{'form.comment'};
-         $comment=~s/\</\&lt\;/g;
+ 	$comment = &LONCAPA::map::qtunescape($comment);
-         $comment=~s/\>/\&gt\;/g;
-         $comment=~s/\:/\&colon;/g;
          if ($folder=~/^supplemental/) {
                $comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
                    $env{'user.domain'}.'___&&&___'.$comment;
          }
-         $Apache::lonratedt::resources[$newidx]=
+         $LONCAPA::map::resources[$newidx]=
-                   $comment.':'.$url.':'.$ext.':normal:res';
+ 	    $comment.':'.$url.':'.$ext.':normal:res';
-         $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= $newidx;
+         $LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx;
          ($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 />
+ 		    my $state = '
-    <form name="upload_embedded" action="/adm/coursedocs"
+    <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
-                   method="post" enctype="multipart/form-data">
+    <input type="hidden" name="cmd" value="upload_embedded" />
-    <input type="hidden" name="folderpath" value="'.$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 />
+ 		    $phase_status = 'phasetwo';
-    <table>';
-                     foreach my $embed_file (keys(%{$allfiles})) {
+                     $$upload_output .=
-                         $$upload_output .= '<tr><td>'.$embed_file.
+ 			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
-           '<input name="embedded_item_'.$num.'" type="file" />
+ 			&Apache::loncommon::ask_for_embedded_content(
-            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+                             '/adm/coursedocs',$state,$allfiles,$codebase);
-                         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>';
                  } else {
                      $$upload_output .= 'No embedded items identified<br />';
                  }
- Line 1410  sub process_secondary_uploads {
+ Line 1622  sub process_secondary_uploads {
      $destination .= $newidx;
      my ($url,$filename);
      $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination);
-     ($filename) = ($url =~ m-^/uploaded/$coursedom/$coursenum/$destination/(.+)$-);
+     ($filename) = ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/\Q$destination\E/(.+)$});
      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(
+     my ($foldertitle,$pagetitle,$renametitle);
-      &unescape($title)),'"<>&\'');
+     if (&is_supplemental_title($title)) {
-     my $renametitle=$title;
+ 	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
-     my $foldertitle=$title;
+ 	$pagetitle = $foldertitle;
-     my $pagetitle=$title;
+     } else {
-     my $orderidx=$Apache::lonratedt::order[$index];
+ 	$title=&HTML::Entities::encode($title,'"<>&\'');
-     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/	) {
+ 	$renametitle=$title;
- 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ 	$foldertitle=$title;
- 	$renametitle=$4;
+ 	$pagetitle=$title;
- 	$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
- 	    &Apache::loncommon::plainname($2,$3).': <br />'.
- 	    $foldertitle;
      }
+     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 ($container, $type, $esc_path, $path, $symb);
-     my $folderpath;
      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';
+         $type = $container = 'page';
-         $pagepath=&escape($env{'form.pagepath'});
+         $esc_path=&escape($path = $env{'form.pagepath'});
-         $pagesymb=&escape($env{'form.pagesymb'});
+ 	$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='';
  	if (($folder!~/^supplemental/) &&
- 	    ($#Apache::lonratedt::order>0) &&
+ 	    ($#LONCAPA::map::order>0) &&
  	    ((split(/\:/,
- 	     $Apache::lonratedt::resources[$Apache::lonratedt::order[0]]))[1]
+ 	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
  	     ne '') &&
  	    ((split(/\:/,
- 	     $Apache::lonratedt::resources[$Apache::lonratedt::order[1]]))[1]
+ 	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]
  	     ne '')) {
  	    $selectbox=
  		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
  		'<select name="newpos" onChange="this.form.submit()">';
- 	    for (my $i=1;$i<=$#Apache::lonratedt::order+1;$i++) {
+ 	    for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
  		if ($i==$incindex) {
  		    $selectbox.='<option value="" selected="1">('.$i.')</option>';
  		} else {
- Line 1487  sub entryline {
+ Line 1724  sub entryline {
  		'rn' => 'Rename',
  		'cp' => 'Copy');
  	my $nocopy=0;
+         my $nocut=0;
          if ($url=~/\.(page|sequence)$/) {
- 	    foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
+ 	    if ($url =~ m{/res/}) {
- 		my ($title,$url,$ext,$type)=split(/\:/,$_);
+ 		# no copy for published maps
- 		if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
+ 		$nocopy = 1;
- 		    $nocopy=1;
+ 	    } else {
- 		    last;
+ 		foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$_);
+ 		    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'}) {
+         my $cutlink='&nbsp;';
-            unless ($nocopy) {
-                $copylink=(<<ENDCOPY);
+ 	my $skip_confirm = 0;
- <a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
+ 	if ( $folder =~ /^supplemental/
- <font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+ 	     || ($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);
+ 	if (!$nocut) {
- <form name="entry_$index" action="/adm/coursedocs" method="post">
+ 	    $cutlink=(<<ENDCUT);
- <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
+ <a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
- <input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
+ ENDCUT
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+         }
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+ 	$form_start = (<<END);
- <input type="hidden" name="setparms" value="$orderidx" />
+    <form  action="/adm/coursedocs" method="post">
- <td><table border='0' cellspacing='2' cellpadding='0'>
+    <input type="hidden" name="${type}path" value="$path" />
- <tr><td bgcolor="#DDDDDD">
+    <input type="hidden" name="${type}symb" value="$symb" />
- <a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
+    <input type="hidden" name="setparms" value="$orderidx" />
- <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
+    <input type="hidden" name="changeparms" value="0" />
- <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
  END
-         } else {
+         $form_end = '</form>';
-            unless ($nocopy) {
+ 	$line.=(<<END);
-                $copylink=(<<ENDCOPY);
+ <td>
- <a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
+    <table class="LC_docs_entry_move">
- <font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+       <tr>
- ENDCOPY
+          <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>
-             $line.=(<<END);
+          </td>
- <form name="entry_$index" action="/adm/coursedocs" method="post">
+       </tr>
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+       <tr>
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+         <td>
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+            <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>
- <input type="hidden" name="setparms" value="$orderidx" />
+         </td>
- <td><table border='0' cellspacing='2' cellpadding='0'>
+       </tr>
- <tr><td bgcolor="#DDDDDD">
+     </table>
- <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'>
+ </td>
- <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
+ <td>
- <tr><td bgcolor="#DDDDDD">
+    $form_start
- <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'>
+    $selectbox
- <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
+    $form_end
- </table></td>
+ </td>
- <td>$selectbox
+ <td class="LC_docs_entry_commands">
- </td><td bgcolor="#DDDDDD">
+    <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
- <a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
+ $cutlink
- <font size="-2" color="#990000">$lt{'rm'}</font></a>
+    <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</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>
  $copylink
+ </td>
  END
-         }
      }
  # Figure out what kind of a resource this is
      my ($extension)=($url=~/\.(\w+)$/);
- Line 1574  END
+ Line 1817  END
      if ($uploaded) {
  	if ($extension eq 'sequence') {
  	    $icon=$iconpath.'/folder_closed.gif';
- 	    $url=~/$coursenum\/([\/\w]+)\.sequence$/;
+ 	    $url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/;
  	    $url='/adm/coursedocs?';
  	    $folderarg=$1;
  	    $isfolder=1;
          } elsif ($extension eq 'page') {
              $icon=$iconpath.'/page.gif';
-             $url=~/$coursenum\/([\/\w]+)\.page$/;
+             $url=~/\Q$coursenum\E\/([\/\w]+)\.page$/;
              $pagearg=$1;
              $url='/adm/coursedocs?';
              $ispage=1;
- Line 1588  END
+ Line 1831  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/'.
- Line 1611  END
+ Line 1856  END
  	    }
  	} elsif ($url=~m|^/ext/|) {
  	    $url='/adm/wrapper'.$url;
+ 	    $external = 1;
  	}
          if (&Apache::lonnet::symbverify($symb,$url)) {
  	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
- Line 1624  END
+ Line 1870  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'};
  	if ($folderpath) { $folderpath.='&' };
  # Append randompick number, hidden, and encrypted with ":" to foldername,
  # so it gets transferred between levels
- 	$folderpath.=$folderarg.'&'.$foldername.':'.(&Apache::lonratedt::getparameter($orderidx,
+ 	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
                                                'parameter_randompick'))[0]
-                                                .':'.((&Apache::lonratedt::getparameter($orderidx,
+                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                                'parameter_hiddenresource'))[0]=~/^yes$/i)
-                                                .':'.((&Apache::lonratedt::getparameter($orderidx,
+                                                .':'.((&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.submit()" name="randpick_'.$orderidx.'" value="'.
+ 	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
- 	    (&Apache::lonratedt::getparameter($orderidx,
+ 	    (&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 ='
+ <nobr><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></nobr>';
      }
      if ($ispage) {
          my $pagename=&escape($pagetitle);
- Line 1662  END
+ Line 1913  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.
+     $line.='
- 	'" border="0"></a></td>'.
+   <td class="LC_docs_entry_icon">
-         "<td bgcolor='#FFFFBB'>".($url?"<a href=\"$url\">":'').$title.
+     '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
-         ($url?'</a>':' <font size="-2">'.&mt('(re-initialize course to access)').'</font>')."</td>";
+   </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',
   			      'ec' => 'URL hidden');
  	my $enctext=
- 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
  	my $hidtext=
- 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
  	$line.=(<<ENDPARMS);
- <td bgcolor="#BBBBFF"><font size='-2'>
+   <td class="LC_docs_entry_parameter">
- <nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
+     $form_start
- <td bgcolor="#BBBBFF"><font size='-2'>
+     <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
- <nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
+     $form_end
- <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+   </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;
  }
- Line 1750  sub checkonthis {
+ Line 2017  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();
               }
- Line 1772  sub checkonthis {
+ Line 2039  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>');
            }
        }
     }
- Line 1794  sub list_symbs {
+ Line 2061  sub list_symbs {
      my ($r) = @_;
      $r->print(&Apache::loncommon::start_page('Symb List'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
      my $navmap = Apache::lonnavmaps::navmap->new();
      $r->print("<pre>\n");
      foreach my $res ($navmap->retrieveResources()) {
- Line 1813  sub verifycontent {
+ Line 2081  sub verifycontent {
     my $loaderror=&Apache::lonnet::overloaderror($r);
     if ($loaderror) { return $loaderror; }
     $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$type.' Documents'));
     $hashtied=0;
     undef %alreadyseen;
     %alreadyseen=();
- Line 1820  sub verifycontent {
+ Line 2089  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 />'));
  	   }
         }
- Line 1848  sub checkversions {
+ Line 2117  sub checkversions {
      my ($r) = @_;
      my $type = &Apache::loncommon::course_type();
      $r->print(&Apache::loncommon::start_page("Check $type Document Versions"));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $type Document Versions"));
      my $header='';
      my $startsel='';
      my $monthsel='';
- Line 1899  sub checkversions {
+ Line 2169  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();
      }
- Line 2008  ENDHEADERS
+ Line 2278  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>'.
+                       '</span></td>'.
-                       '<td title="'.$lt{'ve'}.'"><nobr>In '.$type.': '.
+                       '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
                        '<font size="+1">');
  # Used in course
  	    my $usedversion=$hash{'version_'.$linkurl};
- Line 2020  ENDHEADERS
+ Line 2290  ENDHEADERS
  	    } else {
  		$r->print($currentversion);
  	    }
- 	    $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
+ 	    $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'.
-                       '<nobr>Use: ');
+                       '<span class="LC_nobreak">Use: ');
  # Set version
  	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
  						      'set_version_'.$linkurl,
- Line 2030  ENDHEADERS
+ Line 2300  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;
- Line 2054  ENDHEADERS
+ Line 2324  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,
- Line 2067  ENDHEADERS
+ Line 2337  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) {
- Line 2129  sub changewarning {
+ Line 2399  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=>"Edit ".&Apache::loncommon::course_type(),
+ 					    faq=>273,
+ 					    bug=>'Instructor Interface',
+                                             help => 'Docs_Adding_Course_Doc'});
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1',
+ 					    text=>$text,
+ 					    faq=>273,
+ 					    bug=>'Instructor Interface'});
  }
  # ================================================================ Main Handler
- Line 2167  sub handler {
+ Line 2453  sub handler {
  		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
      $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
  		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
+     $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
      $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
  # does this user have privileges to modify docs
      my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
    if ($allowed && $env{'form.verify'}) {
+       &init_breadcrumbs('verify','Verify Content');
        &verifycontent($r);
    } elsif ($allowed && $env{'form.listsymbs'}) {
+       &init_breadcrumbs('listsymbs','List Symbs');
        &list_symbs($r);
+   } elsif ($allowed && $env{'form.docslog'}) {
+       &init_breadcrumbs('docslog','Show Log');
+       &docs_change_log($r);
    } elsif ($allowed && $env{'form.versions'}) {
+       &init_breadcrumbs('versions','Check/Set Resource Versions');
        &checkversions($r);
    } elsif ($allowed && $env{'form.dumpcourse'}) {
+       &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
        &dumpcourse($r);
    } elsif ($allowed && $env{'form.exportcourse'}) {
+       &init_breadcrumbs('exportcourse','Export '.&Apache::loncommon::course_type().' to IMS');
        &exportcourse($r);
    } else {
  # is this a standard course?
- Line 2194  sub handler {
+ Line 2488  sub handler {
      my $uploadtag;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  					    ['folderpath','pagepath',
- 					     'pagesymb','markedcopy_url',
+ 					     'pagesymb']);
- 					     'markedcopy_title']);
+ # 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));
- Line 2207  sub handler {
+ Line 2520  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'}.'" />'.
+         $uploadtag = '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
- 	    '<input type="hidden" name="pagesymb" value="'.$env{'form.pagesymb'}.'" />';
+ 	    '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />';
      }
      if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
         $showdoc='/'.$1;
- Line 2235  sub handler {
+ Line 2548  sub handler {
  # get personal data
      my $uname=$env{'user.name'};
      my $udom=$env{'user.domain'};
-     my $plainname=&escape(
+     my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
-                      &Apache::loncommon::plainname($uname,$udom));
  # graphics settings
- Line 2255  sub handler {
+ Line 2567  sub handler {
    my %codebase = ();
    my ($upload_result,$upload_output);
    if ($allowed) {
-       if (($env{'form.uploaddoc.filename'}) &&                                               ($env{'form.cmd'}=~/^upload_(\w+)/)) {
+       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);
            }
- Line 2360  sub handler {
+ Line 2677  sub handler {
                  'scuf' => 'Score Upload Form',
                  'bull' => 'Bulletin Board',
                  'mypi' => 'My Personal Info',
+                 'grpo' => 'Group Files',
+                 'rost' => 'Course Roster',
  		'abou' => 'About User',
                  'imsf' => 'Import IMS package',
                  'file' =>  'File',
- Line 2369  sub handler {
+ Line 2688  sub handler {
  					  );
  # -----------------------------------------------------------------------------
      if ($allowed) {
+ 	&update_paste_buffer($coursenum,$coursedom);
         my $dumpbut=&dumpbutton();
         my $exportbut=&exportbutton();
         my %lt=&Apache::lonlocal::texthash(
  					 'vc' => 'Verify Content',
  					 'cv' => 'Check/Set Resource Versions',
  					 'ls' => 'List Symbs',
+                                          'sl' => 'Show Log'
  					  );
         my $folderpath=$env{'form.folderpath'};
- Line 2387  sub handler {
+ Line 2708  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="title" />
- <input type="hidden" name="cmd" />
+   <input type="hidden" name="cmd" />
- <input type="hidden" name="markcopy" />
+   <input type="hidden" name="markcopy" />
- $containertag
+   <input type="hidden" name="copyfolder" />
+   $containertag
  </form>
  <form name="simpleedit" method="post" action="/adm/coursedocs">
- <input type=hidden name="importdetail" value="">
+   <input type="hidden" name="importdetail" value="" />
- $uploadtag
+   $uploadtag
  </form>
  <form action="/adm/coursedocs" method="post" name="courseverify">
- <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
+   <div class="LC_docs_course_commands">
- <tr><td bgcolor="#DDDDCC">
- <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
+       <div>
- </td><td bgcolor="#DDDDCC">
+         <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
-     <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
+       </div>
- $dumpbut
+       <div>
- $exportbut
+         <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
- </td><td bgcolor="#DDDDCC">
+       </div>
-     <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+         $dumpbut
- </td></tr></table>
+         $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()
         }
- Line 2450  ENDCOURSEVERIFY
+ Line 2788  ENDCOURSEVERIFY
  	}
  	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
         $r->print(<<ENDFORM);
- <table cellspacing=4 cellpadding=4><tr>
+ <table class="LC_docs_adddocs">
- <th bgcolor="#DDDDDD">$lt{'uplm'}</th>
+ <tr>
- <th bgcolor="#DDDDDD">$lt{'impp'}</th>
+ <th>$lt{'uplm'}</th>
- <th bgcolor="#DDDDDD">$lt{'spec'}</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>
+ <span class="LC_nobreak">
- <input type="submit" value="$lt{'upld'}">
+ <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>
+ <span class="LC_nobreak">
- <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}" />
+ <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'}" />
+ <input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
- <p>
  <hr />
+ <p>
  $lt{'copm'}<br />
- <input type="text" size="40" name="importmap"><br />
+ <input type="text" size="40" name="importmap" /><br />
- <nobr><input type=button
+ <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'}">
+ value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
- $help{'Load_Map'}</nobr>
+ $help{'Load_Map'}</span>
  </p>
  </form>
  <hr />
- Line 2510  ENDFORM
+ Line 2850  ENDFORM
  <hr />
  <form action="/adm/coursedocs" method="post" name="newext">
  $uploadtag
- <input type=hidden name="importdetail" value="">
+ <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="">
+ <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="">
+ <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"
+ <input type="hidden" name="importdetail"
- value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+ value="$lt{'syll'}=/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="newnav">
  $uploadtag
- <input type=hidden name="importdetail"
+ <input type="hidden" name="importdetail"
- value="Navigate Content=/adm/navmaps">
+ value="$lt{'navc'}=/adm/navmaps" />
- <nobr>
+ <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="">
+ <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="">
+ <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="">
+ <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="">
+ <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="">
+ <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"
+ <input type="hidden" name="importdetail"
- value="$plainname=/adm/$udom/$uname/aboutme">
+ 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="">
+ <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="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
+ <span class="LC_nobreak">
+ <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
+ $help{'Group Files'}
+ </span>
+ </form>
+ <br /><form action="/adm/coursedocs" method="post" name="newroster">
+ $uploadtag
+ <input type="hidden" name="importdetail"
+ value="$lt{'rost'}=/adm/viewclasslist" />
+ <span class="LC_nobreak">
+ <input name="newroster" type="submit" value="$lt{'rost'}" />
+ $help{'Course Roster'}
+ </span>
  </form>
  ENDFORM
         }
- Line 2627  ENDFORM
+ Line 2985  ENDFORM
             $r->print(<<ENDBLOCK);
  <form action="/adm/coursedocs" method="post" name="newsmpproblem">
  $uploadtag
- <input type=hidden name="importdetail" value="">
+ <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="">
+ <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
         }
- Line 2650  ENDBLOCK
+ Line 3008  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'};
- Line 2658  ENDBLOCK
+ Line 3016  ENDBLOCK
  	   $folder='supplemental';
         }
         if ($folder =~ /^supplemental$/ &&
- 	   $env{'form.folderpath'} =~ /^default\&/) {
+ 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
- 	   $env{'form.folderpath'}='supplemental&'.
+           $env{'form.folderpath'} = 'supplemental&'.
- 	       &escape(&mt('Supplemental '.$type.' Documents'));
+                                     &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=
+ 	   my $folderseq=
-                   '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+ 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
-                      '.sequence';
+ 	       '.sequence';
-           $r->print(<<ENDSUPFORM);
+ 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- <table cellspacing=4 cellpadding=4><tr>
+ 	   $r->print(<<ENDSUPFORM);
- <th bgcolor="#DDDDDD">$lt{'upls'}</th>
+ <table class="LC_docs_adddocs"><tr>
- <th bgcolor="#DDDDDD">$lt{'spec'}</th>
+ <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="folderpath" value="$path" />
- <input type="hidden" name="cmd" value="upload_supplemental">
+ <input type="hidden" name="cmd" value="upload_supplemental" />
- <nobr>
+ <span class="LC_nobreak">
- <input type="submit" value="$lt{'upld'}">
+ <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="">
+ <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="">
+ <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"
+ <input type="hidden" name="importdetail"
- value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+ 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"
+ <input type="hidden" name="importdetail"
- value="$plainname=/adm/$udom/$uname/aboutme">
+ 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>".
+ &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></p>');
+           &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
        }
    }
   }
- Line 2760  ENDSUPFORM
+ Line 3128  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();
- Line 2771  function makenewfolder(targetform,folder
+ Line 3162  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();
- Line 2780  function makenewpage(targetform,folderse
+ Line 3171  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';
- Line 2793  function makeexamupload() {
+ Line 3195  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';
- Line 2802  function makesmppage() {
+ Line 3204  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';
- Line 2811  function makesmpproblem() {
+ Line 3213  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';
- Line 2820  function makedropbox() {
+ Line 3222  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';
- Line 2829  function makebulboard() {
+ Line 3231  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'}");
         }
     }
  }
- Line 2859  function finishpick() {
+ Line 3261  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
+     var residx=this.document.forms.extimport.residx.value;
-      ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
+     eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
-     '";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') {
- Line 2880  function changename(folderpath,index,old
+ Line 3282  function changename(folderpath,index,old
      }
  }
- function removeres(folderpath,index,oldtitle,container,pagesymb) {
+ function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-     if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
+     if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+ 	this.document.forms.renameform.markcopy.value=-1;
  	this.document.forms.renameform.cmd.value='del_'+index;
          if (container == 'sequence') {
              this.document.forms.renameform.folderpath.value=folderpath;
- Line 2894  function removeres(folderpath,index,oldt
+ Line 3297  function removeres(folderpath,index,oldt
      }
  }
- function cutres(folderpath,index,oldtitle,container,pagesymb) {
+ function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-     if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
+     if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
  	this.document.forms.renameform.cmd.value='cut_'+index;
  	this.document.forms.renameform.markcopy.value=index;
+ 	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
          if (container == 'sequence') {
              this.document.forms.renameform.folderpath.value=folderpath;
          }
- Line 2909  function cutres(folderpath,index,oldtitl
+ Line 3313  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;
      }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.244
changed lines
	Added in v.1.312