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.277 and 1.333

-version 1.277, 2007/06/15 19:12:56
+version 1.333, 2009/02/02 11:23:56
  Line 26
  # http://www.lon-capa.org/
  #
  package Apache::londocs;
  use strict;
- Line 53  my %alreadyseen=();
+ Line 55  my %alreadyseen=();
  my $hadchanges;
- # Available help topics
  my %help=();
- # Mapread read maps into LONCAPA::map:: global arrays
- # @order and @resources, determines status
- # sets @order - pointer to resources in right order
- # sets @resources - array with the resources with correct idx
- #
  sub mapread {
      my ($coursenum,$coursedom,$map)=@_;
- Line 81  sub storemap {
+ Line 77  sub storemap {
      return ($errtext,0);
  }
- # ----------------------------------------- Return hash with valid author names
  sub authorhosts {
      my %outhash=();
      my $home=0;
      my $other=0;
-     foreach (keys %env) {
+     foreach my $key (keys(%env)) {
- 	if ($_=~/^user\.role\.(au|ca)\.(.+)$/) {
+ 	if ($key=~/^user\.role\.(au|ca)\.(.+)$/) {
  	    my $role=$1;
  	    my $realm=$2;
- 	    my ($start,$end)=split(/\./,$env{$_});
+ 	    my ($start,$end)=split(/\./,$env{$key});
  	    if (($start) && ($start>time)) { next; }
  	    if (($end) && (time>$end)) { next; }
- 	    my $ca; my $cd;
+ 	    my ($ca,$cd);
  	    if ($1 eq 'au') {
  		$ca=$env{'user.name'};
  		$cd=$env{'user.domain'};
- Line 116  sub authorhosts {
+ Line 112  sub authorhosts {
      }
      return ($home,$other,%outhash);
  }
- # ------------------------------------------------------ Generate "dump" button
  sub dumpbutton {
      my ($home,$other,%outhash)=&authorhosts();
      my $type = &Apache::loncommon::course_type();
      if ($home+$other==0) { return ''; }
-     my $output='</td><td bgcolor="#DDDDCC">';
      if ($home) {
- 	return '</td><td bgcolor="#DDDDCC">'.
+ 	return '<input type="submit" name="dumpcourse" value="'.
- 	    '<input type="submit" name="dumpcourse" value="'.
  	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
  	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
      } 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 140  sub clean {
+ Line 135  sub clean {
      $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
      return $title;
  }
- # -------------------------------------------------------- Actually dump course
  sub dumpcourse {
      my ($r) = @_;
- Line 160  sub dumpcourse {
+ Line 156  sub dumpcourse {
  	my $title=$env{'form.authorfolder'};
  	$title=&clean($title);
  	my %replacehash=();
- 	foreach (keys %env) {
+ 	foreach my $key (keys(%env)) {
- 	    if ($_=~/^form\.namefor\_(.+)/) {
+ 	    if ($key=~/^form\.namefor\_(.+)/) {
- 		$replacehash{$1}=$env{$_};
+ 		$replacehash{$1}=$env{$key};
  	    }
  	}
  	my $crs='/uploaded/'.$env{'request.course.id'}.'/';
  	$crs=~s/\_/\//g;
- 	foreach (keys %replacehash) {
+ 	foreach my $item (keys(%replacehash)) {
- 	    my $newfilename=$title.'/'.$replacehash{$_};
+ 	    my $newfilename=$title.'/'.$replacehash{$item};
  	    $newfilename=~s/\.(\w+)$//;
  	    my $ext=$1;
  	    $newfilename=&clean($newfilename);
- Line 183  sub dumpcourse {
+ Line 179  sub dumpcourse {
  		    unless(mkdir($makepath,0777)) { $fail=1; }
  		}
  	    }
- 	    $r->print('<br /><tt>'.$_.'</tt> => <tt>'.$newfilename.'</tt>: ');
+ 	    $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
  	    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
- 		if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+ 		if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
  		    print $fh &Apache::lonclonecourse::rewritefile(
-          &Apache::lonclonecourse::readfile($env{'request.course.id'},$_),
+          &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
  				     (%replacehash,$crs => '')
  								    );
  		} else {
  		    print $fh
-          &Apache::lonclonecourse::readfile($env{'request.course.id'},$_);
+          &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
  		       }
  		$fh->close();
  	    } else {
  		$fail=1;
  	    }
  	    if ($fail) {
- 		$r->print('<font color="red">fail</font>');
+ 		$r->print('<span class="LC_error">'.&mt('fail').'</span>');
  	    } else {
- 		$r->print('<font color="green">ok</font>');
+ 		$r->print('<span class="LC_success">'.&mt('ok').'</span>');
  	    }
  	}
      } else {
- Line 210  sub dumpcourse {
+ Line 206  sub dumpcourse {
  	    $r->print(
  		      '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
  	}
- 	foreach (sort keys %outhash) {
+ 	foreach my $key (sort(keys(%outhash))) {
- 	    if ($_=~/^home_(.+)$/) {
+ 	    if ($key=~/^home_(.+)$/) {
  		if ($home==1) {
  		    $r->print(
  		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
- Line 227  sub dumpcourse {
+ Line 223  sub dumpcourse {
  	my $title=$origcrsdata{'description'};
  	$title=~s/[\/\s]+/\_/gs;
  	$title=&clean($title);
- 	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
+ 	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3>'
+                  .'<input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
  	&tiehash();
- 	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');
+ 	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3>'
- 	foreach (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+                  .&Apache::loncommon::start_data_table()
- 	    $r->print('<tr><td>'.$_.'</td>');
+                  .&Apache::loncommon::start_data_table_header_row()
- 	    my ($ext)=($_=~/\.(\w+)$/);
+                  .'<th>'.&mt('Internal Filename').'</th>'
+                  .'<th>'.&mt('Title').'</th>'
+                  .'<th>'.&mt('Save as ...').'</th>'
+                  .&Apache::loncommon::end_data_table_header_row());
+ 	foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+ 	    $r->print(&Apache::loncommon::start_data_table_row()
+                      .'<td>'.$file.'</td>');
+ 	    my ($ext)=($file=~/\.(\w+)$/);
  	    my $title=$hash{'title_'.$hash{
- 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+ 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
  	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
  	    if (!$title) {
- 		$title=$_;
+ 		$title=$file;
  	    } else {
  		$title=~s|/|_|g;
  	    }
  	    $title=~s/\.(\w+)$//;
  	    $title=&clean($title);
  	    $title.='.'.$ext;
- 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
+ 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
+                      .&Apache::loncommon::end_data_table_row());
  	}
- 	$r->print("</table>\n");
+ 	$r->print(&Apache::loncommon::end_data_table());
  	&untiehash();
  	$r->print(
-   '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump [_1] DOCS',$type).'" /></p></form>');
+   '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $type DOCS").'" /></p></form>');
      }
  }
- # ------------------------------------------------------ Generate "export" button
  sub exportbutton {
      my $type = &Apache::loncommon::course_type();
-     return '</td><td bgcolor="#DDDDCC">'.
+     return '<input type="submit" name="exportcourse" value="'.
-             '<input type="submit" name="exportcourse" value="'.
              &mt('Export '.$type.' to IMS').'" />'.
      &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
  }
  sub exportcourse {
      my $r=shift;
      my $type = &Apache::loncommon::course_type();
      my %discussiontime = &Apache::lonnet::dump('discussiontimes',
                                                 $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
-     my $numdisc = keys %discussiontime;
+     my $numdisc = keys(%discussiontime);
      my $navmap = Apache::lonnavmaps::navmap->new();
+     if (!defined($navmap)) {
+         $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package').
+                   '<h2>IMS Export Failed</h2>'.
+                   '<div class="LC_error">'.
+                   &mt('Unable to retrieve information about course contents').
+                   '</div><a href="/adm/coursedocs">'.&mt('Return to Course Editor').'</a>');
+         &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
+         return;
+     }
      my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
      my $curRes;
      my $outcome;
- Line 308  sub exportcourse {
+ Line 323  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'));
- Line 379  sub exportcourse {
+ Line 394  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 438  function containerCheck(item) {
+ Line 453  function containerCheck(item) {
      }
          |;
-         foreach my $container (sort { $a <=> $b } keys %children) {
+         foreach my $container (sort { $a <=> $b } (keys(%children))) {
-             my @contents = split/:/,$children{$container};
+             my @contents = split(/:/,$children{$container});
              for (my $i=0; $i<@contents; $i ++) {
                  $scripttag .= '    parents['.$container.']['.$i.'] = '.$contents[$i]."\n";
              }
- Line 461  function containerCheck(item) {
+ Line 476  function containerCheck(item) {
  	$r->print($display.'</table>'.
                    '<p><input type="hidden" name="finishexport" value="1">'.
                    '<input type="submit" name="exportcourse" value="'.
-                   &mt('Export '.$type.' DOCS').'" /></p></form>'.
+                   &mt('Export '.$type.' DOCS').'" /></p></form>');
- 		  &Apache::loncommon::end_page());
      }
  }
- Line 547  sub build_package {
+ Line 561  sub build_package {
              if ($curRes->is_sequence() || $curRes->is_page()) {
                  $lastcontainer = $count;
              }
-             if (grep/^$count$/,@$exportitems) {
+             if (grep(/^$count$/,@$exportitems)) {
                  &get_dependencies($exportitems,\%parent,$depth,\@dependencies);
              }
          }
- Line 571  sub build_package {
+ Line 585  sub build_package {
          if (ref($curRes)) {
              $count ++;
-             if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) {
+             if ((grep(/^$count$/,@$exportitems)) || (grep(/^$count$/,@dependencies))) {
                  my $symb = $curRes->symb();
                  my $isvisible = 'true';
                  my $resourceref;
- Line 605  sub build_package {
+ Line 619  sub build_package {
                       '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
                       '" type="webcontent" href="'.$content_file.'">'."\n".
                       '       <file href="'.$content_file.'" />'."\n";
-                         foreach (@hrefs) {
+                         foreach my $item (@hrefs) {
                              $imsresources .=
-                      '        <file href="'.$_.'" />'."\n";
+                      '        <file href="'.$item.'" />'."\n";
                          }
-                         if (grep/^$count$/,@$discussions) {
+                         if (grep(/^$count$/,@$discussions)) {
                              my $ressymb = $symb;
                              my $mode;
                              if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
- Line 650  sub build_package {
+ Line 664  sub build_package {
  sub get_dependencies {
      my ($exportitems,$parent,$depth,$dependencies) = @_;
      if ($depth > 1) {
-         if ((!grep/^$$parent{$depth}$/,@$exportitems) && (!grep/^$$parent{$depth}$/,@$dependencies)) {
+         if ((!grep(/^$$parent{$depth}$/,@$exportitems)) && (!grep(/^$$parent{$depth}$/,@$dependencies))) {
-             push @$dependencies, $$parent{$depth};
+             push(@{$dependencies},$$parent{$depth});
              if ($depth > 2) {
                  &get_dependencies($exportitems,$parent,$depth-1,$dependencies);
              }
- Line 817  sub extract_media {
+ Line 831  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 857  sub extract_media {
+ Line 871  sub extract_media {
              my $copiedfile;
              if ($copiedfile = Apache::File->new('>'.$destination)) {
                  print $copiedfile $embed_content;
-                 push @{$href}, 'resources/'.$count.'/res/'.$filename;
+                 push(@{$href},'resources/'.$count.'/res/'.$filename);
                  my $attrib_regexp = '';
                  if (@{$allfiles{$embed_file}} > 1) {
                      $attrib_regexp = join('|',@{$allfiles{$embed_file}});
- Line 901  sub store_template {
+ Line 915  sub store_template {
      }
  }
- # Imports the given (name, url) resources into the course
- # coursenum, coursedom, and folder must precede the list
  sub group_import {
      my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
      while (@files) {
- 	my $name = shift(@files);
+ 	my ($name, $url, $residx) = @{ shift(@files) };
- 	my $url  = shift(@files);
- 	#FIXME check if file exists before overwriting, might be restoring it
          if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
  	     && ($caller eq 'londocs')
  	     && (!&Apache::lonnet::stat_file($url))) {
- Line 925  sub group_import {
+ Line 936  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 933  sub group_import {
+ Line 944  sub group_import {
              }
          }
  	if ($url) {
- 	    my $idx = &LONCAPA::map::getresidx($url);
+ 	    if (!$residx
- 	    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
+ 		|| defined($LONCAPA::map::zombies[$residx])) {
+ 		$residx = &LONCAPA::map::getresidx($url,$residx);
+ 		push(@LONCAPA::map::order, $residx);
+ 	    }
  	    my $ext = 'false';
  	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
  	    $url  = &LONCAPA::map::qtunescape($url);
  	    $name = &LONCAPA::map::qtunescape($name);
- 	    $LONCAPA::map::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 958  sub breadcrumbs {
+ Line 972  sub breadcrumbs {
      my $folderpath;
      my $cpinfo='';
      my $plain='';
-     if ($env{'form.markedcopy_url'}) {
-        $cpinfo='&markedcopy_url='.
-                &escape($env{'form.markedcopy_url'}).
-                '&markedcopy_title='.
-                &escape($env{'form.markedcopy_title'});
-     }
      my $randompick=-1;
      my $isencrypted=0;
      my $ishidden=0;
+     my $is_random_order=0;
      while (@folders) {
  	my $folder=shift(@folders);
- 	my $foldername=shift(@folders);
+     	my $foldername=shift(@folders);
  	if ($folderpath) {$folderpath.='&';}
  	$folderpath.=$folder.'&'.$foldername;
  	my $url='/adm/coursedocs?folderpath='.
  	    &escape($folderpath);
-             my $name=&unescape($foldername);
+ 	    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,
- Line 995  sub breadcrumbs {
+ Line 1012  sub breadcrumbs {
      }
      $plain=~s/\&gt\;\s*$//;
      return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
- 					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain);
+ 					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
  }
  sub log_docs {
- Line 1033  sub log_docs {
+ Line 1050  sub log_docs {
                         'currentfolder' => $env{'form.folder'});
          if ($parmidx) {
             $storehash{'parameter_res'}=$oldresources[$parmidx];
-            foreach my $parm (keys %parmaction) {
+            foreach my $parm (keys(%parmaction)) {
                $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
                $storehash{'parameter_value_'.$parm}=$parmvalue{$parm};
             }
- Line 1060  sub log_docs {
+ Line 1077  sub log_docs {
  }
- #
- # Docs Change Log
- #
  sub docs_change_log {
      my ($r)=@_;
      my $folder=$env{'form.folder'};
- Line 1086  sub docs_change_log {
+ Line 1103  sub docs_change_log {
      my %lt=('hiddenresource' => 'Resources hidden',
  	    'encrypturl'     => 'URL hidden',
  	    'randompick'     => 'Randomly pick',
+ 	    'randomorder'    => 'Randomly ordered',
  	    'set'            => 'set to',
  	    'del'            => 'deleted');
      $r->print(&Apache::loncommon::display_filter().
- Line 1155  sub docs_change_log {
+ Line 1173  sub docs_change_log {
  	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
  	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
  	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
- 	    if ($oldname ne $newname) {
+ 	    if ($oldname ne '' && $oldname ne $newname) {
  		$r->print(&LONCAPA::map::qtescape($newname));
  	    }
  	}
- Line 1168  sub docs_change_log {
+ Line 1186  sub docs_change_log {
  	$r->print('</ul>');
  	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
  	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
- 	    foreach my $parameter ('randompick','hiddenresource','encrypturl') {
+ 	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
  		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
  		    $r->print('<li>'.
  			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
- Line 1185  sub docs_change_log {
+ Line 1203  sub docs_change_log {
                || $shown<=$env{'form.show'})) { last; }
      }
      $r->print(&Apache::loncommon::end_data_table());
-     $r->print(&Apache::loncommon::end_page());
  }
- sub editor {
+ sub update_paste_buffer {
-     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
+     my ($coursenum,$coursedom) = @_;
-     my $errtext='';
-     my $fatal=0;
+     return if (!defined($env{'form.markcopy'}));
-     my $container='sequence';
+     return if (!defined($env{'form.copyfolder'}));
-     if ($env{'form.pagepath'}) {
+     return if ($env{'form.markcopy'} < 0);
-         $container='page';
+     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+ 				    $env{'form.copyfolder'});
+     return if ($fatal);
+ # Mark for copying
+     my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
+     if (&is_supplemental_title($title)) {
+         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
+ 	($title) = &parse_supplemental_title($title);
+     } elsif ($env{'docs.markedcopy_supplemental'}) {
+         &Apache::lonnet::delenv('docs\\.markedcopy_supplemental');
+     }
+     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
+     &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
+ 			    'docs.markedcopy_url'   => $url});
+     delete($env{'form.markcopy'});
+ }
+ sub print_paste_buffer {
+     my ($r,$container) = @_;
+     return if (!defined($env{'docs.markedcopy_url'}));
+     $r->print(<<ENDPASTE);
+ <form name="pasteform" action="/adm/coursedocs" method="post"><p>
+ ENDPASTE
+     $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');
+     my $type;
+     if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+ 	$type = &mt('External Resource');
+ 	$r->print($type.': '.
+ 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
+ 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
+     }  else {
+ 	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
+ 	my $icon = &Apache::loncommon::icon($extension);
+ 	if ($extension eq 'sequence' &&
+ 	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
+ 	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+ 	    $icon .= '/folder_closed.gif';
+ 	}
+ 	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
+ 	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
+     }
+     if ($container eq 'page') {
+ 	$r->print('
+ 	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
+ 	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
+ ');
+     } else {
+ 	$r->print('
+         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
+ ');
      }
-     ($errtext,$fatal)=
+     $r->print('</p></form>');
-               &mapread($coursenum,$coursedom,$folder.'.'.$container);
+ }
+ sub do_paste_from_buffer {
+     my ($coursenum,$coursedom,$folder) = @_;
+     if (!$env{'form.pastemarked'}) {
+         return;
+     }
+ # paste resource to end of list
+     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
+     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
+ # Maps need to be copied first
+     if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
+ 	$title=&mt('Copy of').' '.$title;
+ 	my $newid=$$.int(rand(100)).time;
+ 	my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
+         if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
+             my $path = $1;
+             my $prefix = $2;
+             my $ancestor = $3;
+             if (length($ancestor) > 10) {
+                 $ancestor = substr($ancestor,-10,10);
+             }
+             $oldid = $path.$prefix.$ancestor;
+         }
+         my $counter = 0;
+         my $newurl=$oldid.$newid.'.'.$ext;
+         my $is_unique = &uniqueness_check($newurl);
+         while (!$is_unique && $counter < 100) {
+             $counter ++;
+             $newid ++;
+             $newurl = $oldid.$newid;
+             $is_unique = &uniqueness_check($newurl);
+         }
+         if (!$is_unique) {
+             if ($url=~/\.page$/) {
+                 return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
+             } else {
+                 return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+             }
+         }
+ 	my $storefn=$newurl;
+ 	$storefn=~s{^/\w+/$match_domain/$match_username/}{};
+ 	my $paste_map_result =
+             &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+ 					       &Apache::lonnet::getfile($url));
+         if ($paste_map_result eq '/adm/notfound.html') {
+             if ($url=~/\.page$/) {
+                 return &mt('Paste failed: an error occurred saving the composite page');
+             } else {
+                 return &mt('Paste failed: an error occurred saving the folder');
+             }
+         }
+ 	$url = $newurl;
+     }
+ # published maps can only exists once, so remove it from paste buffer when done
+     if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
+ 	&Apache::lonnet::delenv('docs\\.markedcopy');
+     }
+     if ($url=~ m{/smppg$}) {
+ 	my $db_name = &Apache::lonsimplepage::get_db_name($url);
+ 	if ($db_name =~ /^smppage_/) {
+ 	    #simple pages, need to copy the db contents to a new one.
+ 	    my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
+ 	    my $now = time();
+ 	    $db_name =~ s{_\d*$ }{_$now}x;
+ 	    my $result=&Apache::lonnet::put($db_name,\%contents,
+ 					    $coursedom,$coursenum);
+ 	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
+ 	    $title=&mt('Copy of').' '.$title;
+ 	}
+     }
+     $title = &LONCAPA::map::qtunescape($title);
+     my $ext='false';
+     if ($url=~m{^http(|s)://}) { $ext='true'; }
+     $url       = &LONCAPA::map::qtunescape($url);
+ # Now insert the URL at the bottom
+     my $newidx = &LONCAPA::map::getresidx($url);
+     if ($env{'docs.markedcopy_supplemental'}) {
+         if ($folder =~ /^supplemental/) {
+             $title = $env{'docs.markedcopy_supplemental'};
+         } else {
+             (undef,undef,$title) =
+                 &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+         }
+     } else {
+         if ($folder=~/^supplemental/) {
+            $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                   $env{'user.domain'}.'___&&&___'.$title;
+         }
+     }
+     $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
+     push(@LONCAPA::map::order, $newidx);
+     return 'ok';
+ # Store the result
+ }
+ sub uniqueness_check {
+     my ($newurl) = @_;
+     my $unique = 1;
+     foreach my $res (@LONCAPA::map::order) {
+         my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+         $url=&LONCAPA::map::qtescape($url);
+         if ($newurl eq $url) {
+             $unique = 0;
+             last;
+         }
+     }
+     return $unique;
+ }
+ my %parameter_type = ( 'randompick'     => 'int_pos',
+ 		       'hiddenresource' => 'string_yesno',
+ 		       'encrypturl'     => 'string_yesno',
+ 		       'randomorder'    => 'string_yesno',);
+ my $valid_parameters_re = join('|',keys(%parameter_type));
+ # set parameters
+ sub update_parameter {
+     return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
+     my $which = $env{'form.changeparms'};
+     my $idx = $env{'form.setparms'};
+     if ($env{'form.'.$which.'_'.$idx}) {
+ 	my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx}
+ 	                                     : 'yes';
+ 	&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
+ 				      $parameter_type{$which});
+ 	&remember_parms($idx,$which,'set',$value);
+     } else {
+ 	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
+ 	&remember_parms($idx,$which,'del');
+     }
+     return 1;
+ }
+ sub handle_edit_cmd {
+     my ($coursenum,$coursedom) =@_;
+     my ($cmd,$idx)=split('_',$env{'form.cmd'});
+     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
+     my ($title, $url, @rrest) = split(':', $ratstr);
+     if ($cmd eq 'del') {
+ 	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+ 	    ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+ 	    &Apache::lonnet::removeuploadedurl($url);
+ 	} else {
+ 	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+ 	}
+ 	splice(@LONCAPA::map::order, $idx, 1);
+     } elsif ($cmd eq 'cut') {
+ 	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+ 	splice(@LONCAPA::map::order, $idx, 1);
+     } elsif ($cmd eq 'up'
+ 	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
+ 	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
+     } elsif ($cmd eq 'down'
+ 	     && defined($LONCAPA::map::order[$idx+1])) {
+ 	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
+     } elsif ($cmd eq 'rename') {
+ 	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
+ 	if ($comment=~/\S/) {
+ 	    $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
+ 		$comment.':'.join(':', $url, @rrest);
+ 	}
+ # Devalidate title cache
+ 	my $renamed_url=&LONCAPA::map::qtescape($url);
+ 	&Apache::lonnet::devalidate_title_cache($renamed_url);
+     } else {
+ 	return 0;
+     }
+     return 1;
+ }
+ sub editor {
+     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
+     my $container= ($env{'form.pagepath'}) ? 'page'
+ 		                           : 'sequence';
+     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+ 				    $folder.'.'.$container);
+     return $errtext if ($fatal);
      if ($#LONCAPA::map::order<1) {
  	my $idx=&LONCAPA::map::getresidx();
  	if ($idx<=0) { $idx=1; }
         	$LONCAPA::map::order[0]=$idx;
          $LONCAPA::map::resources[$idx]='';
      }
-     if (defined($env{'form.markcopy'})) {
- # Mark for copying
+     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
- 	my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
+ 	&breadcrumbs($folder,$allowed,$type);
- 	$env{'form.markedcopy_title'}=$title;
- 	$env{'form.markedcopy_url'}=$url;
-     }
-     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder);
      $r->print($breadcrumbtrail);
-     if ($fatal) {
- 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
-     } else {
  # ------------------------------------------------------------ Process commands
  # ---------------- if they are for this folder and user allowed to make changes
- 	if (($allowed) && ($env{'form.folder'} eq $folder)) {
+     if (($allowed) && ($env{'form.folder'} eq $folder)) {
  # set parameters and change order
-             &snapshotbefore();
+ 	&snapshotbefore();
- 	    if ($env{'form.changeparms'}) {
- 		my $idx=$env{'form.setparms'};
+ 	if (&update_parameter()) {
- # set parameters
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($env{'form.changeparms'} eq 'randompick') {
+ 	    return $errtext if ($fatal);
- 		    if ($env{'form.randpick_'.$idx}) {
+ 	}
- 			&LONCAPA::map::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
- 			&remember_parms($idx,'randompick','set',$env{'form.randpick_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_randompick');
- 			&remember_parms($idx,'randompick','del');
- 		    }
- 		}
- 		if ($env{'form.changeparms'} eq 'hiddenresource') {
- 		    if ($env{'form.hidprs_'.$idx}) {
- 			&LONCAPA::map::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
- 			&remember_parms($idx,'hiddenresource','set',$env{'form.hidprs_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_hiddenresource');
- 			&remember_parms($idx,'hiddenresource','del');
- 		    }
- 		}
- 		if ($env{'form.changeparms'} eq 'encrypturl') {
- 		    if ($env{'form.encprs_'.$idx}) {
- 			&LONCAPA::map::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
- 			&remember_parms($idx,'encrypturl','set',$env{'form.encprs_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_encrypturl');
- 			&remember_parms($idx,'encrypturl','del');
- 		    }
- 		}
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
- 		}
- 	    }
- 	    if ($env{'form.newpos'}) {
+ 	if ($env{'form.newpos'} && $env{'form.currentpos'}) {
  # change order
- 		my $newpos=$env{'form.newpos'}-1;
+ 	    my $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1);
- 		my $currentpos=$env{'form.currentpos'}-1;
+ 	    splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res);
- 		my $i;
- 		my @neworder=();
- 		if ($newpos>$currentpos) {
- # moving stuff up
- 		    for ($i=0;$i<$currentpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		    for ($i=$currentpos;$i<$newpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i+1];
- 		    }
- 		    $neworder[$newpos]=$LONCAPA::map::order[$currentpos];
- 		    for ($i=$newpos+1;$i<=$#LONCAPA::map::order;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		} else {
- # moving stuff down
- 		    for ($i=0;$i<$newpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		    $neworder[$newpos]=$LONCAPA::map::order[$currentpos];
- 		    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i-1];
- 		    }
- 		    for ($i=$currentpos+1;$i<=$#LONCAPA::map::order;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		}
- 		@LONCAPA::map::order=@neworder;
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
- 		}
- 	    }
- 	    if ($env{'form.pastemarked'}) {
- # paste resource to end of list
-                 my $url=$env{'form.markedcopy_url'};
- 		my $title=$env{'form.markedcopy_title'};
- # Maps need to be copied first
- 		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
- 		    $title=&mt('Copy of').' '.$title;
-                     my $newid=$$.time;
- 		    $url=~/^(.+)\.(\w+)$/;
- 		    my $newurl=$1.$newid.'.'.$2;
- 		    my $storefn=$newurl;
-                     $storefn=~s{^/\w+/$match_domain/$match_username/}{};
- 		    &Apache::lonclonecourse::writefile
- 			($env{'request.course.id'},$storefn,
- 			 &Apache::lonnet::getfile($url));
- 		    $url=$newurl;
- 		}
- 		$title = &LONCAPA::map::qtunescape($title);
- 		my $ext='false';
- 		if ($url=~/^http\:\/\//) { $ext='true'; }
- 		$url   = &LONCAPA::map::qtunescape($url);
- # Now insert the URL at the bottom
-                 my $newidx=&LONCAPA::map::getresidx($url);
- 		$LONCAPA::map::resources[$newidx]=
- 		    $title.':'.$url.':'.$ext.':normal:res';
- 		$LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx;
- # Store the result
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
- 		}
- 	    }
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
-             $r->print($upload_output);
+ 	    return $errtext if ($fatal);
- 	    if ($env{'form.cmd'}) {
+ 	}
-                 my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
-                 if ($cmd eq 'del') {
+ 	if ($env{'form.pastemarked'}) {
- 		    my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
+             my $paste_res =
- 		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+                 &do_paste_from_buffer($coursenum,$coursedom,$folder);
- 			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+             if ($paste_res eq 'ok') {
- 			&Apache::lonnet::removeuploadedurl($url);
+                 ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		    } else {
+                 return $errtext if ($fatal);
- 			&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+             } elsif ($paste_res ne '') {
- 		    }
+                 $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
- 		    for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {
-                         $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
-                     }
-                     $#LONCAPA::map::order--;
-                 } elsif ($cmd eq 'cut') {
- 		    my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
- 		    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
- 		    for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {
-                         $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
-                     }
-                     $#LONCAPA::map::order--;
-                 } elsif ($cmd eq 'up') {
- 		  if (($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
-                     my $i=$LONCAPA::map::order[$idx-1];
-                     $LONCAPA::map::order[$idx-1] = $LONCAPA::map::order[$idx];
-                     $LONCAPA::map::order[$idx] = $i;
- 		   }
-                 } elsif ($cmd eq 'down') {
- 		   if (defined($LONCAPA::map::order[$idx+1])) {
-                     my $i=$LONCAPA::map::order[$idx+1];
-                     $LONCAPA::map::order[$idx+1] = $LONCAPA::map::order[$idx];
-                     $LONCAPA::map::order[$idx] = $i;
- 		   }
-                 } elsif ($cmd eq 'rename') {
-                     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
-                     my ($rtitle,@rrest)=split(/\:/,
-                        $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
-                     my $comment=$env{'form.title'};
-                     $comment = &LONCAPA::map::qtunescape($comment);
- 		    if ($comment=~/\S/) {
- 			$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
- 			    $comment.':'.join(':',@rrest);
- 		    }
- # Devalidate title cache
-                     my $renamed_url=&LONCAPA::map::qtescape($rrest[0]);
- 		    &Apache::lonnet::devalidate_title_cache($renamed_url);
-                 }
- # Store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
- 					    $folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
- 		}
              }
+ 	}
+ 	$r->print($upload_output);
+ 	if (&handle_edit_cmd()) {
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	    return $errtext if ($fatal);
+ 	}
  # Group import/search
- 	    if ($env{'form.importdetail'}) {
+ 	if ($env{'form.importdetail'}) {
- 		my @imports;
+ 	    my @imports;
- #		&Apache::lonnet::logthis("imp detail ".$env{'form.importdetail'});
+ 	    foreach my $item (split(/\&/,$env{'form.importdetail'})) {
- 		foreach (split(/\&/,$env{'form.importdetail'})) {
+ 		if (defined($item)) {
- 		    if (defined($_)) {
+ 		    my ($name,$url,$residx)=
- 			my ($name,$url)=split(/\=/,$_);
+ 			map {&unescape($_)} split(/\=/,$item);
- 			$name=&unescape($name);
+ 		    push(@imports, [$name, $url, $residx]);
- 			$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;
  		}
-             }
+ 	    }
+ 	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
+ 					    $container,'londocs',@imports);
+ 	    return $errtext if ($fatal);
+ 	}
  # Loading a complete map
- 	   if ($env{'form.loadmap'}) {
+ 	if ($env{'form.loadmap'}) {
-                if ($env{'form.importmap'}=~/\w/) {
+ 	    if ($env{'form.importmap'}=~/\w/) {
- 	          foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
+ 		foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
- 		      my ($title,$url,$ext,$type)=split(/\:/,$_);
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$res);
-                       my $idx=&LONCAPA::map::getresidx($url);
+ 		    my $idx=&LONCAPA::map::getresidx($url);
-                       $LONCAPA::map::resources[$idx]=$_;
+ 		    $LONCAPA::map::resources[$idx]=$res;
-                       $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
+ 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
- 	          }
+ 		}
- # Store the changed version
+ 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
-   	          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+ 					    $folder.'.'.$container);
- 					   $folder.'.'.$container);
+ 		return $errtext if ($fatal);
- 	          if ($fatal) {
+ 	    } else {
- 		      $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
- 		      return;
- 	          }
-                } else {
-                    $r->print('<p><font color="red">'.&mt('No map selected.').'</font></p>');
-                }
-            }
-            &log_differences($plain);
-        }
- # ---------------------------------------------------------------- End commands
- # ---------------------------------------------------------------- Print screen
-         my $idx=0;
- 	my $shown=0;
-         if (($ishidden) || ($isencrypted) || ($randompick>=0)) {
-            $r->print('<p>'.&mt('Parameters').':<ul>'.
-                      ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
-                      ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
-                      ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
-                      '</ul></p>');
-         }
-         if ($randompick>=0) {
-            $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
-         }
-         $r->print('<table>');
-         foreach (@LONCAPA::map::order) {
-            my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$_]);
- 	   $name=&LONCAPA::map::qtescape($name);
- 	   $url=&LONCAPA::map::qtescape($url);
-            unless ($name) {  $name=(split(/\//,$url))[-1]; }
-            unless ($name) { $idx++; next; }
-            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
-            $idx++;
- 	   $shown++;
-         }
- 	unless ($shown) {
- 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
- 	}
-         $r->print("\n</table>\n");
- 	if ($env{'form.markedcopy_url'}) {
- 	    $r->print(<<ENDPASTE);
- <p><form name="pasteform" action="/adm/coursedocs" method="post">
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
- ENDPASTE
-             $r->print(
- 	   '<input type="submit" name="pastemarked" value="'.&mt('Paste').
- 		      '" /> '.&Apache::loncommon::filedescription(
- 		(split(/\./,$env{'form.markedcopy_url'}))[-1]).': '.
- 		      $env{'form.markedcopy_title'});
-             if ($container eq 'page') {
- 		$r->print(<<PAGEINFO);
- <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
- <input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
- PAGEINFO
-             } else {
- 		$r->print(<<FOLDERINFO);
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- FOLDERINFO
  	    }
- 	    $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 1531  sub process_file_upload {
+ Line 1630  sub process_file_upload {
  						$parseaction,$allfiles,
  						$codebase);
          my $ext='false';
-         if ($url=~/^http\:\/\//) { $ext='true'; }
+         if ($url=~m{^http://}) { $ext='true'; }
  	$url     = &LONCAPA::map::qtunescape($url);
          my $comment=$env{'form.comment'};
  	$comment = &LONCAPA::map::qtunescape($comment);
- Line 1546  sub process_file_upload {
+ Line 1645  sub process_file_upload {
          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
  				    $folder.'.'.$container);
          if ($fatal) {
-             $$upload_output .= '<p><font color="red">'.$errtext.'</font></p>';
+             $$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';
              return 'failed';
          } else {
              if ($parseaction eq 'parse') {
- Line 1554  sub process_file_upload {
+ Line 1653  sub process_file_upload {
                  if ($total_embedded > 0) {
                      my $num = 0;
  		    my $state = '
-    <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" />
+    <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
     <input type="hidden" name="cmd" value="upload_embedded" />
     <input type="hidden" name="newidx" value="'.$newidx.'" />
     <input type="hidden" name="primaryurl" value="'.&escape($url).'" />
- Line 1563  sub process_file_upload {
+ Line 1662  sub process_file_upload {
                      $$upload_output .=
  			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
- 			&ask_for_embedded_content('/adm/coursedocs',
+ 			&Apache::loncommon::ask_for_embedded_content(
- 						  $state,$allfiles,$codebase);
+                             '/adm/coursedocs',$state,$allfiles,$codebase);
                  } else {
                      $$upload_output .= 'No embedded items identified<br />';
                  }
- Line 1574  sub process_file_upload {
+ Line 1673  sub process_file_upload {
      return $phase_status;
  }
- sub ask_for_embedded_content {
-     my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
-     my $upload_output = '
-    <form name="upload_embedded" action="'.$actionurl.'"
-                   method="post" enctype="multipart/form-data">';
-     $upload_output .= $state;
-     $upload_output .= '<b>Upload embedded files</b>:<br />'.
- 	&Apache::loncommon::start_data_table();
-     my $num = 0;
-     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
- 	$upload_output .= &Apache::loncommon::start_data_table_row().
- 	    '<td>'.$embed_file.'</td><td>';
- 	if ($args->{'ignore_remote_references'}
- 	    && $embed_file =~ m{^\w+://}) {
- 	    $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
- 	} elsif ($args->{'error_on_invalid_names'}
- 	    && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
- 	    $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
- 	} else {
- 	    $upload_output .='
-            <input name="embedded_item_'.$num.'" type="file" value="bob" />
-            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
- 	    my $attrib = join(':',@{$$allfiles{$embed_file}});
- 	    $upload_output .=
- 		"\n\t\t".
- 		'<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
- 		$attrib.'" />';
- 	    if (exists($$codebase{$embed_file})) {
- 		$upload_output .=
- 		    "\n\t\t".
- 		    '<input name="codebase_'.$num.'" type="hidden" value="'.
- 		    &escape($$codebase{$embed_file}).'" />';
- 	    }
- 	}
- 	$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
- 	$num++;
-     }
-     $upload_output .= &Apache::loncommon::end_data_table().'<br />
-    <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
-    <input type ="submit" value="'.&mt('Upload Listed Files').'" />
-    '.&mt('(only files for which a location has been provided will be uploaded)').'
-    </form>';
-     return $upload_output;
- }
  sub process_secondary_uploads {
      my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;
      my $folder=$env{'form.folder'};
- Line 1642  sub process_secondary_uploads {
+ Line 1692  sub process_secondary_uploads {
      return $filename;
  }
+ sub is_supplemental_title {
+     my ($title) = @_;
+     return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
+ }
+ sub parse_supplemental_title {
+     my ($title) = @_;
+     my ($foldertitle,$renametitle);
+     if ($title =~ /&amp;&amp;&amp;/) {
+ 	$title = &HTML::Entites::decode($title);
+     }
+  if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
+ 	$renametitle=$4;
+ 	my ($time,$uname,$udom) = ($1,$2,$3);
+ 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ 	my $name =  &Apache::loncommon::plainname($uname,$udom);
+ 	$name = &HTML::Entities::encode($name,'"<>&\'');
+ 	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
+ 	    $name.': <br />'.$foldertitle;
+     }
+     if (wantarray) {
+ 	return ($title,$foldertitle,$renametitle);
+     }
+     return $title;
+ }
  # --------------------------------------------------------------- An entry line
  sub entryline {
      my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
-     $title=&HTML::Entities::encode($title,'"<>&\'');
-     my $renametitle=$title;
+     my ($foldertitle,$pagetitle,$renametitle);
-     my $foldertitle=$title;
+     if (&is_supplemental_title($title)) {
-     my $pagetitle=$title;
+ 	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
-     my $orderidx=$LONCAPA::map::order[$index];
+ 	$pagetitle = $foldertitle;
-     if ($title=~ /^(\d+)___&amp;&amp;&amp;___($match_username)___&amp;&amp;&amp;___($match_domain)___&amp;&amp;&amp;___(.*)$/	) {
+     } else {
- 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ 	$title=&HTML::Entities::encode($title,'"<>&\'');
- 	$renametitle=$4;
+ 	$renametitle=$title;
- 	$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
+ 	$foldertitle=$title;
- 	    &Apache::loncommon::plainname($2,$3).': <br />'.
+ 	$pagetitle=$title;
- 	    $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='';
- Line 1715  sub entryline {
+ Line 1792  sub entryline {
  	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 my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$item);
+ 		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
+ 			$nocopy=1;
+ 			last;
+ 		    }
  		}
  	    }
  	}
- Line 1729  sub entryline {
+ Line 1811  sub entryline {
          }
          my $copylink='&nbsp;';
          my $cutlink='&nbsp;';
-         if ($env{'form.pagepath'}) {
-            if (!$nocopy) {
+ 	my $skip_confirm = 0;
-                $copylink=(<<ENDCOPY);
+ 	if ( $folder =~ /^supplemental/
- <a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
+ 	     || ($url =~ m{( /smppg$
- <font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+ 			    |/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
-            }
+         }
-            if (!$nocut) {
+ 	if (!$nocut) {
-                $cutlink=(<<ENDCUT);
+ 	    $cutlink=(<<ENDCUT);
- <a href='javascript:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'>
+ <a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
- <font size="-2" color="#550044">$lt{'ct'}</font></a>
  ENDCUT
-             }
+         }
-             $line.=(<<END);
+ 	$form_start = (<<END);
- <form name="entry_$index" action="/adm/coursedocs" method="post">
+    <form  action="/adm/coursedocs" method="post">
- <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
+    <input type="hidden" name="${type}path" value="$path" />
- <input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
+    <input type="hidden" name="${type}symb" value="$symb" />
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+    <input type="hidden" name="setparms" value="$orderidx" />
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+    <input type="hidden" name="changeparms" value="0" />
- <input type="hidden" name="setparms" value="$orderidx" />
- <input type="hidden" name="changeparms" value="0" />
- <td><table border='0' cellspacing='2' cellpadding='0'>
- <tr><td bgcolor="#DDDDDD">
- <a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
- <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
- <tr><td bgcolor="#DDDDDD">
- <a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
- <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
- </table></td>
- <td>$selectbox
- </td><td bgcolor="#DDDDDD">
- <a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
- <font size="-2" color="#990000">$lt{'rm'}</font></a>
- $cutlink
- <a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
- <font size="-2" color="#009900">$lt{'rn'}</font></a>
- $copylink
  END
-         } else {
+         $form_end = '</form>';
-            if (!$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>
-             if (!$nocut) {
+          </td>
-                $cutlink=(<<ENDCUT);
+       </tr>
- <a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'>
+       <tr>
- <font size="-2" color="#550044">$lt{'ct'}</font></a>
+         <td>
- ENDCUT
+            <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
-             }
+         </td>
-             $line.=(<<END);
+       </tr>
- <form name="entry_$index" action="/adm/coursedocs" method="post">
+     </table>
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ </td>
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+ <td>
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+    $form_start
- <input type="hidden" name="setparms" value="$orderidx" />
+    $selectbox
- <input type="hidden" name="changeparms" value="0" />
+    $form_end
- <td><table border='0' cellspacing='2' cellpadding='0'>
+ </td>
- <tr><td bgcolor="#DDDDDD">
+ <td class="LC_docs_entry_commands">
- <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'>
+    <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
- <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
- <tr><td bgcolor="#DDDDDD">
- <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'>
- <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
- </table></td>
- <td>$selectbox
- </td><td bgcolor="#DDDDDD">
- <a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
- <font size="-2" color="#990000">$lt{'rm'}</font></a>
  $cutlink
- <a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
+    <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
- <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 1832  END
+ Line 1897  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 1855  END
+ Line 1922  END
  	    }
  	} elsif ($url=~m|^/ext/|) {
  	    $url='/adm/wrapper'.$url;
+ 	    $external = 1;
  	}
          if (&Apache::lonnet::symbverify($symb,$url)) {
  	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
- Line 1868  END
+ Line 1936  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'};
- Line 1880  END
+ Line 1948  END
                                                 .':'.((&LONCAPA::map::getparameter($orderidx,
                                                'parameter_hiddenresource'))[0]=~/^yes$/i)
                                                 .':'.((&LONCAPA::map::getparameter($orderidx,
-                                               'parameter_encrypturl'))[0]=~/^yes$/i);
+                                               'parameter_encrypturl'))[0]=~/^yes$/i)
+                                                .':'.((&LONCAPA::map::getparameter($orderidx,
+                                               'parameter_randomorder'))[0]=~/^yes$/i);
  	$url.='folderpath='.&escape($folderpath).$cpinfo;
  	$parameterset='<label>'.&mt('Randomly Pick: ').
- 	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randpick_'.$orderidx.'" value="'.
+ 	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
  	    (&LONCAPA::map::getparameter($orderidx,
                                                'parameter_randompick'))[0].
                                                '" />'.
- '<font size="-2"><a href="javascript:void(0)">'.&mt('Save').'</a></font></label>';
+ '<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
+     	my $ro_set=
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+ 	$rand_order_text ='
+ <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';
      }
      if ($ispage) {
          my $pagename=&escape($pagetitle);
- Line 1906  END
+ Line 1979  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',
- Line 1921  END
+ Line 2003  END
  	my $hidtext=
  	    ((&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.changeparms.value='hiddenresource';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.changeparms.value='encrypturl';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;
  }
- # ---------------------------------------------------------------- tie the hash
+ =pod
+ =item tiehash()
+ tie the hash
+ =cut
  sub tiehash {
      my ($mode)=@_;
- Line 1958  sub untiehash {
+ Line 2053  sub untiehash {
      return OK;
  }
- # --------------------------------------------------------------- check on this
  sub checkonthis {
      my ($r,$url,$level,$title)=@_;
- Line 1967  sub checkonthis {
+ Line 2063  sub checkonthis {
      $r->rflush();
      if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
         $r->print("\n<br />");
+        if ($level==0) {
+            $r->print("<br />");
+        }
         for (my $i=0;$i<=$level*5;$i++) {
             $r->print('&nbsp;');
         }
- Line 1976  sub checkonthis {
+ Line 2075  sub checkonthis {
  	  my $result=&Apache::lonnet::repcopy(
                                &Apache::lonnet::filelocation('',$url));
            if ($result eq 'ok') {
-              $r->print('<font color="green">'.&mt('ok').'</font>');
+              $r->print('<span class="LC_success">'.&mt('ok').'</span>');
               $r->rflush();
               &Apache::lonnet::countacc($url);
               $url=~/\.(\w+)$/;
- Line 1986  sub checkonthis {
+ Line 2085  sub checkonthis {
                   for (my $i=0;$i<=$level*5;$i++) {
                       $r->print('&nbsp;');
                   }
-                  $r->print('- '.&mt('Rendering').': ');
+                  $r->print('- '.&mt('Rendering:').' ');
  		 my ($errorcount,$warningcount)=split(/:/,
  	       &Apache::lonnet::ssi_body($url,
  			       ('grade_target'=>'web',
- Line 1994  sub checkonthis {
+ Line 2093  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('[quant,_1,error]',$errorcount).'</span>');
- 				  &mt('error(s)').'</b></font> ');
                       }
  		     if ($warningcount) {
-                         $r->print('<font color="blue">'.
+                         $r->print('<span class="LC_warning">'.
- 			  $warningcount.' '.
+                           &mt('[quant,_1,warning]',$warningcount).'</span>');
- 				  &mt('warning(s)').'</font>');
                       }
                   } else {
-                      $r->print('<font color="green">'.&mt('ok').'</font>');
+                      $r->print('<span class="LC_success">'.&mt('ok').'</span>');
                   }
                   $r->rflush();
               }
  	     my $dependencies=
                  &Apache::lonnet::metadata($url,'dependencies');
-              foreach (split(/\,/,$dependencies)) {
+              foreach my $dep (split(/\,/,$dependencies)) {
- 		 if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {
+ 		 if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) {
-                     &checkonthis($r,$_,$level+1);
+                     &checkonthis($r,$dep,$level+1);
                   }
               }
            } elsif ($result eq 'unavailable') {
-              $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
+              $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
            } elsif ($result eq 'not_found') {
  	      unless ($url=~/\$/) {
- 		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+ 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
  	      } else {
- 		  $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
+ 		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
  	      }
            } else {
-              $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
+              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
            }
-       }
+        }
-    }
+     }
  }
- #
- # ----------------------------------------------------------------- List Symbs
+ =pod
- #
+ =item list_symbs()
+ List Symbs
+ =cut
  sub list_symbs {
      my ($r) = @_;
+     my $type = &Apache::loncommon::course_type();
      $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");
+     if (!defined($navmap)) {
-     foreach my $res ($navmap->retrieveResources()) {
+         $r->print('<h2>'.&mt('Retrieval of List Failed').'</h2>'.
- 	$r->print($res->compTitle()."\t".$res->symb()."\n");
+                   '<div class="LC_error">'.
+                   &mt('Unable to retrieve information about course contents').
+                   '</div>');
+         &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
+     } else {
+         $r->print("<pre>\n");
+         foreach my $res ($navmap->retrieveResources()) {
+ 	    $r->print($res->compTitle()."\t".$res->symb()."\n");
+         }
+         $r->print("\n</pre>\n");
      }
-     $r->print("\n</pre>\n");
      $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
  }
- #
- # -------------------------------------------------------------- Verify Content
- #
  sub verifycontent {
      my ($r) = @_;
      my $type = &Apache::loncommon::course_type();
- Line 2063  sub verifycontent {
+ Line 2172  sub verifycontent {
     undef %alreadyseen;
     %alreadyseen=();
     &tiehash();
-    foreach (keys %hash) {
+    foreach my $key (keys(%hash)) {
-        if ($hash{$_}=~/\.(page|sequence)$/) {
+        if ($hash{$key}=~/\.(page|sequence)$/) {
- 	   if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {
+ 	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
- 	       $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{$key}).'</span><br />'.
  			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
  	   }
         }
-        if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$_})})) {
+        if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) {
-            &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});
+            &checkonthis($r,$hash{$key},0,$hash{'title_'.$1});
         }
     }
     &untiehash();
- Line 2082  sub verifycontent {
+ Line 2191  sub verifycontent {
  }
- # -------------------------------------------------------------- Check Versions
  sub devalidateversioncache {
      my $src=shift;
      &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
- Line 2113  sub checkversions {
+ Line 2220  sub checkversions {
      my %newsetversions=();
      if ($env{'form.setmostrecent'}) {
  	$haschanged=1;
- 	foreach (keys %hash) {
+ 	foreach my $key (keys(%hash)) {
- 	    if ($_=~/^ids\_(\/res\/.+)$/) {
+ 	    if ($key=~/^ids\_(\/res\/.+)$/) {
  		$newsetversions{$1}='mostrecent';
                  &devalidateversioncache($1);
  	    }
  	}
      } elsif ($env{'form.setcurrent'}) {
  	$haschanged=1;
- 	foreach (keys %hash) {
+ 	foreach my $key (keys(%hash)) {
- 	    if ($_=~/^ids\_(\/res\/.+)$/) {
+ 	    if ($key=~/^ids\_(\/res\/.+)$/) {
  		my $getvers=&Apache::lonnet::getversion($1);
  		if ($getvers>0) {
  		    $newsetversions{$1}=$getvers;
- Line 2132  sub checkversions {
+ Line 2239  sub checkversions {
  	}
      } elsif ($env{'form.setversions'}) {
  	$haschanged=1;
- 	foreach (keys %env) {
+ 	foreach my $key (keys(%env)) {
- 	    if ($_=~/^form\.set_version_(.+)$/) {
+ 	    if ($key=~/^form\.set_version_(.+)$/) {
  		my $src=$1;
- 		if (($env{$_}) && ($env{$_} ne $setversions{$src})) {
+ 		if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
- 		    $newsetversions{$src}=$env{$_};
+ 		    $newsetversions{$src}=$env{$key};
  		    &devalidateversioncache($src);
  		}
  	    }
- Line 2148  sub checkversions {
+ Line 2255  sub checkversions {
  			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
  	    $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
  	} else {
- 	    $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</font></h1>');
+ 	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
  	}
  	&mark_hash_old();
      }
- Line 2157  sub checkversions {
+ Line 2264  sub checkversions {
  # show all documents
  	$header=&mt('All Documents in '.$type);
  	$allsel=1;
- 	foreach (keys %hash) {
+ 	foreach my $key (keys(%hash)) {
- 	    if ($_=~/^ids\_(\/res\/.+)$/) {
+ 	    if ($key=~/^ids\_(\/res\/.+)$/) {
  		my $src=$1;
  		$changes{$src}=1;
  	    }
- Line 2168  sub checkversions {
+ Line 2275  sub checkversions {
  	%changes=&Apache::lonnet::dump
  	 ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'},
                       $env{'course.'.$env{'request.course.id'}.'.num'});
- 	my $firstkey=(keys %changes)[0];
+ 	my $firstkey=(keys(%changes))[0];
  	unless ($firstkey=~/^error\:/) {
  	    unless ($env{'form.timerange'}) {
  		$env{'form.timerange'}=604800;
- Line 2232  sub checkversions {
+ Line 2339  sub checkversions {
  <input type="submit" name="setversions" value="$lt{'sv'}" />
  <table border="0">
  ENDHEADERS
-     foreach (sort keys %changes) {
+     foreach my $key (sort(keys(%changes))) {
- 	if ($changes{$_}>$starttime) {
+ 	if ($changes{$key}>$starttime) {
- 	    my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
+ 	    my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
- 	    my $currentversion=&Apache::lonnet::getversion($_);
+ 	    my $currentversion=&Apache::lonnet::getversion($key);
  	    if ($currentversion<0) {
  		$currentversion=&mt('Could not be determined.');
  	    }
- 	    my $linkurl=&Apache::lonnet::clutter($_);
+ 	    my $linkurl=&Apache::lonnet::clutter($key);
  	    $r->print(
  		      '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
  		      &Apache::lonnet::gettitle($linkurl).
- Line 2255  ENDHEADERS
+ Line 2362  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 2267  ENDHEADERS
+ Line 2374  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 2277  ENDHEADERS
+ Line 2384  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 2301  ENDHEADERS
+ Line 2408  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 2314  ENDHEADERS
+ Line 2421  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 2376  sub changewarning {
+ Line 2483  sub changewarning {
  	$message='Changes will become active for your current session after [_1], or the next time you log in.';
      }
      $r->print("\n\n".
- '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
+ '<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
  '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
  '<input type="hidden" name="orgurl" value="'.$url.
- '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+ '" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
  &mt($message,' <input type="hidden" name="'.
      $env{'request.role'}.'" value="1" /><input type="button" value="'.
      &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
- $help{'Caching'}.'</font></h3></form>'."\n\n");
+ $help{'Caching'}.'</span></h3></form>'."\n\n");
  }
- # =========================================== Breadcrumbs for special functions
  sub init_breadcrumbs {
      my ($form,$text)=@_;
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
- 					    text=>&Apache::loncommon::course_type()." Documents",
+ 					    text=>"Edit ".&Apache::loncommon::course_type(),
  					    faq=>273,
  					    bug=>'Instructor Interface',
                                              help => 'Docs_Adding_Course_Doc'});
- Line 2402  sub init_breadcrumbs {
+ Line 2508  sub init_breadcrumbs {
  					    bug=>'Instructor Interface'});
  }
- # ================================================================ Main Handler
  sub handler {
      my $r = shift;
      &Apache::loncommon::content_type($r,'text/html');
- Line 2410  sub handler {
+ Line 2518  sub handler {
      return OK if $r->header_only;
      my $type = &Apache::loncommon::course_type();
  # --------------------------------------------- Initialize help topics for this
-     foreach ('Adding_Course_Doc','Main_Course_Documents',
+     foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
- 	     'Adding_External_Resource','Navigate_Content',
+ 	               'Adding_External_Resource','Navigate_Content',
- 	     'Adding_Folders','Docs_Overview', 'Load_Map',
+ 	               'Adding_Folders','Docs_Overview', 'Load_Map',
- 	     'Supplemental','Score_Upload_Form','Adding_Pages',
+ 	               'Supplemental','Score_Upload_Form','Adding_Pages',
- 	     'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
+ 	               'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
- 	     'Check_Resource_Versions','Verify_Content') {
+ 	               'Check_Resource_Versions','Verify_Content') {
- 	$help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
+ 	$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
      }
      # Composite help files
      $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
- Line 2463  sub handler {
+ Line 2572  sub handler {
      my $showdoc=0;
      my $containertag;
      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 2478  sub handler {
+ Line 2608  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 2517  sub handler {
+ Line 2647  sub handler {
      }
  # -------------------------------------------------------------------- Body tag
      $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';
+     my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}];
      $r->print(&Apache::loncommon::start_page("$type Documents", $script,
- 					     {'force_register' => $showdoc,}).
+ 				    {'force_register' => $showdoc,
+                                      'bread_crumbs' => $brcrum}).
  	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
    my %allfiles = ();
- Line 2528  sub handler {
+ Line 2660  sub handler {
        if (($env{'form.uploaddoc.filename'}) &&
  	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
  # Process file upload - phase one - upload and parse primary file.
+ 	  undef($hadchanges);
            $upload_result = &process_file_upload(\$upload_output,$coursenum,
  						$coursedom,\%allfiles,
  						\%codebase,$1);
+ 	  if ($hadchanges) {
+ 	      &mark_hash_old();
+ 	  }
            if ($upload_result eq 'phasetwo') {
                $r->print($upload_output);
            }
- Line 2553  sub handler {
+ Line 2689  sub handler {
                    }
                    my @attributes = ();
                    if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
-                       @attributes = split/:/,$env{'form.embedded_attrib_'.$i};
+                       @attributes = split(/:/,$env{'form.embedded_attrib_'.$i});
                    } else {
                        @attributes = ($env{'form.embedded_attrib_'.$i});
                    }
-                   foreach (@attributes) {
+                   foreach my $attr (@attributes) {
-                       push(@{$attribs{$i}},&unescape($_));
+                       push(@{$attribs{$i}},&unescape($attr));
                    }
                    if ($javacodebase) {
                        $codebase{$i} = $javacodebase;
- Line 2576  sub handler {
+ Line 2712  sub handler {
                my $updateflag = 0;
                my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);
                if ($getstatus eq 'ok') {
-                   foreach my $item (keys %newname) {
+                   foreach my $item (keys(%newname)) {
                        if ($newname{$item} ne $origname{$item}) {
                            my $attrib_regexp = '';
                            if (@{$attribs{$item}} > 1) {
- Line 2610  sub handler {
+ Line 2746  sub handler {
                  'uplm' => 'Upload a new main '.lc($type).' document',
                  'upls' => 'Upload a new supplemental '.lc($type).' document',
                  'impp' => 'Import a document',
-                 'pubd' => 'Published documents',
+                 'pubd' => 'Published Documents',
  		'copm' => 'All documents out of a published map into this folder',
-                 'spec' => 'Special documents',
                  'upld' => 'Upload Document',
                  'srch' => 'Search',
                  'impo' => 'Import',
- Line 2632  sub handler {
+ Line 2767  sub handler {
                  'bull' => 'Bulletin Board',
                  'mypi' => 'My Personal Info',
                  'grpo' => 'Group Files',
+                 'rost' => 'Course Roster',
  		'abou' => 'About User',
                  'imsf' => 'Import IMS package',
                  'file' =>  'File',
                  'title' => 'Title',
                  'comment' => 'Comment',
-                 'parse' => 'If HTML file, upload embedded images/multimedia files'
+                 'parse' => 'Upload embedded images/multimedia files if HTML file!',
+ 		'nd' => 'New Document',
+ 		'pm' => 'Published Map',
+ 		'sd' => 'Special Document',
+ 		'mo' => 'More Options',
+ 		'hao' => 'Hide all Options'
  					  );
  # -----------------------------------------------------------------------------
+ 	my $fileupload=(<<FIUP);
+ 	$lt{'file'}:<br />
+ 	<input type="file" name="uploaddoc" size="40" />
+ FIUP
+ 	my $checkbox=(<<CHBO);
+ 	<!-- <label>$lt{'parse'}?
+ 	<input type="checkbox" name="parserflag" />
+ 	</label> -->
+ 	<label>
+ 	<input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'}
+ 	</label>
+ CHBO
+ 	my $fileuploadform=(<<FUFORM);
+ 	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	$fileupload
+ 	<br />
+ 	$lt{'title'}:<br />
+ 	<input type="text" size="50" name="comment" />
+ 	$uploadtag
+ 	<input type="hidden" name="cmd" value="upload_default" />
+ 	<br />
+ 	<span class="LC_nobreak">
+ 	$checkbox
+ 	</span>
+ 	<br />
+ 	<br />
+ 	<span class="LC_nobreak">
+ 	<input type="submit" value="$lt{'upld'}" />
+ 	 $help{'Uploading_From_Harddrive'}
+ 	</span>
+ 	</form>
+ FUFORM
+ 	my $simpleeditdefaultform=(<<SEDFFORM);
+ 	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+ 	$lt{'pubd'}<br />
+ 	$uploadtag
+ 	<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+ 	<br />
+ 	<span class="LC_nobreak">
+ 	<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
+ 	$help{'Importing_LON-CAPA_Resource'}
+ 	</span>
+ 	<br />
+ 	<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
+ 	<hr />
+ 	<p>
+ 	$lt{'copm'}<br />
+ 	<input type="text" size="40" name="importmap" /><br />
+ 	<span class="LC_nobreak"><input type="button"
+ 	onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+ 	value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
+ 	$help{'Load_Map'}</span>
+ 	</p>
+ 	</form>
+ SEDFFORM
+ 	my $extresourcesform=(<<ERFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newext">
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newext" type="button" onClick="javascript:makenewext('newext');"
+ 	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	</span>
+ 	</form>
+ ERFORM
      if ($allowed) {
-        my $dumpbut=&dumpbutton();
+ 	&update_paste_buffer($coursenum,$coursedom);
-        my $exportbut=&exportbutton();
         my %lt=&Apache::lonlocal::texthash(
  					 'vc' => 'Verify Content',
  					 'cv' => 'Check/Set Resource Versions',
- Line 2660  sub handler {
+ Line 2870  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);
+        $r->print(&generate_admin_options($containertag,$uploadtag,\%lt,\%help,\%env));
- <form name="renameform" method="post" action="/adm/coursedocs">
- <input type="hidden" name="title" />
- <input type="hidden" name="cmd" />
- <input type="hidden" name="markcopy" />
- $containertag
- </form>
- <form name="simpleedit" method="post" action="/adm/coursedocs">
- <input type="hidden" name="importdetail" value="" />
- $uploadtag
- </form>
- <form action="/adm/coursedocs" method="post" name="courseverify">
- <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
- <tr><td bgcolor="#DDDDCC">
- <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
- </td><td bgcolor="#DDDDCC">
-     <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
- $dumpbut
- $exportbut
- </td><td bgcolor="#DDDDCC">
-     <input type="submit" name="listsymbs" value="$lt{'ls'}" />
- </td><td bgcolor="#DDDDCC">
-     <input type="hidden" name="folder" value="$env{'form.folder'}" />
-     <input type="submit" name="docslog" value="$lt{'sl'}" />
- </td></tr></table>
- </form>
- 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>');
      if (($standard) && ($allowed) && (!$forcesupplement)) {
- 	$r->print('<tr><td bgcolor="#BBBBBB">');
- #  '<h2>'.&mt('Main Course Documents').
- #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
         my $folder=$env{'form.folder'};
         if ($folder eq '' || $folder eq 'supplemental') {
             $folder='default';
  	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
+            $uploadtag = '<input type="hidden" name="folderpath" value="'.
+ 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
         }
         my $postexec='';
         if ($folder eq 'default') {
- 	   $r->print('<script>this.window.name="loncapaclient";</script>');
+ 	   $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>');
         } else {
             #$postexec='self.close();';
         }
         $hadchanges=0;
-        &editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output);
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
+ 			   $upload_output,$type);
+        if ($error) {
+ 	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+        }
         if ($hadchanges) {
- 	   &mark_hash_old()
+ 	   &mark_hash_old();
         }
         &changewarning($r,$postexec);
         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
- Line 2725  ENDCOURSEVERIFY
+ Line 2911  ENDCOURSEVERIFY
  	    $container='page';
  	}
  	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
-        $r->print(<<ENDFORM);
- <table cellspacing=4 cellpadding=4><tr>
- <th bgcolor="#DDDDDD">$lt{'uplm'}</th>
- <th bgcolor="#DDDDDD">$lt{'impp'}</th>
+ 	my $recoverform=(<<RFORM);
- <th bgcolor="#DDDDDD">$lt{'spec'}</th>
+ 	<form action="/adm/groupsort" method="post" name="recover">
- </tr>
+ 	<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
- <tr><td bgcolor="#DDDDDD">
+ 	</form>
- $lt{'file'}:<br />
+ RFORM
- <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
- <input type="file" name="uploaddoc" size="40">
+ 	my $imspform=(<<IMSPFORM);
- <br />
+ 	<form action="/adm/imsimportdocs" method="post" name="ims">
- $lt{'title'}:<br />
+ 	<input type="hidden" name="folder" value="$folder" />
- <input type="text" size="50" name="comment">
+ 	<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
- $uploadtag
+ 	</form>
- <input type="hidden" name="cmd" value="upload_default">
+ IMSPFORM
- <br />
- <nobr>
+ 	my $newnavform=(<<NNFORM);
- <label>$lt{'parse'}?
+ 	<form action="/adm/coursedocs" method="post" name="newnav">
- <input type="checkbox" name="parserflag" />
+ 	$uploadtag
- </label>
+ 	<input type="hidden" name="importdetail"
- </nobr>
+ 	value="$lt{'navc'}=/adm/navmaps" />
- <br />
+ 	<span class="LC_nobreak">
- <br />
+ 	<input name="newnav" type="submit" value="$lt{'navc'}" />
- <nobr>
+ 	$help{'Navigate_Content'}
- <input type="submit" value="$lt{'upld'}">
+ 	</span>
-  $help{'Uploading_From_Harddrive'}
+ 	</form>
- </nobr>
+ NNFORM
- </form>
+ 	my $newsmppageform=(<<NSPFORM);
- </td>
+ 	<form action="/adm/coursedocs" method="post" name="newsmppg">
- <td bgcolor="#DDDDDD">
+ 	$uploadtag
- <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+ 	<input type="hidden" name="importdetail" value="" />
- $lt{'pubd'}<br />
+ 	<span class="LC_nobreak">
- $uploadtag
+ 	<input name="newsmppg" type="button" value="$lt{'sipa'}"
- <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+ 	onClick="javascript:makesmppage();" /> $help{'Simple Page'}
- <br />
+ 	</span>
- <nobr>
+ 	</form>
- <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}" />
+ NSPFORM
- $help{'Importing_LON-CAPA_Resource'}
- </nobr>
+ 	my $newsmpproblemform=(<<NSPROBFORM);
- <br />
+ 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
- <input type=button onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
+ 	$uploadtag
- <p>
+ 	<input type="hidden" name="importdetail" value="" />
- <hr />
+ 	<span class="LC_nobreak">
- $lt{'copm'}<br />
+ 	<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- <input type="text" size="40" name="importmap"><br />
+ 	onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- <nobr><input type=button
+ 	</span>
- onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+ 	</form>
- value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
- $help{'Load_Map'}</nobr>
+ NSPROBFORM
- </p>
- </form>
+ 	my $newdropboxform=(<<NDBFORM);
- <hr />
+ 	<form action="/adm/coursedocs" method="post" name="newdropbox">
- <form action="/adm/groupsort" method="post" name="recover">
+ 	$uploadtag
- <input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
+ 	<input type="hidden" name="importdetail" value="" />
- </form>
+ 	<span class="LC_nobreak">
- ENDFORM
+ 	<input name="newdropbox" type="button" value="$lt{'drbx'}"
-        unless ($env{'form.pagepath'}) {
+ 	onClick="javascript:makedropbox();" />
- 	   $r->print(<<ENDFORM);
+ 	</span>
- <hr />
+ 	</form>
- <form action="/adm/coursedocs" method="post" name="newext">
+ NDBFORM
- $uploadtag
- <input type="hidden" name="importdetail" value="" />
+ 	my $newexuploadform=(<<NEXUFORM);
- <nobr>
+ 	<form action="/adm/coursedocs" method="post" name="newexamupload">
- <input name="newext" type="button" onClick="javascript:makenewext('newext');"
+ 	$uploadtag
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	<input type="hidden" name="importdetail" value="" />
- </nobr>
+ 	<span class="LC_nobreak">
- </form>
+ 	<input name="newexamupload" type="button" value="$lt{'scuf'}"
- <br /><form action="/adm/imsimportdocs" method="post" name="ims">
+ 	onClick="javascript:makeexamupload();" />
- <input type="hidden" name="folder" value="$folder" />
+ 	$help{'Score_Upload_Form'}
- <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+ 	</span>
- </nobr>
+ 	</form>
- </form>
+ NEXUFORM
- ENDFORM
-        }
+ 	my $newbulform=(<<NBFORM);
-        $r->print('</td><td bgcolor="#DDDDDD">');
+ 	<form action="/adm/coursedocs" method="post" name="newbul">
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newbulletin" type="button" value="$lt{'bull'}"
+ 	onClick="javascript:makebulboard();" />
+ 	$help{'Bulletin Board'}
+ 	</span>
+ 	</form>
+ NBFORM
+ 	my $newaboutmeform=(<<NAMFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newaboutme">
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail"
+ 	value="$plainname=/adm/$udom/$uname/aboutme" />
+ 	<span class="LC_nobreak">
+ 	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+ 	$help{'My Personal Info'}
+ 	</span>
+ 	</form>
+ NAMFORM
+ 	my $newaboutsomeoneform=(<<NASOFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newaboutsomeone" type="button" value="$lt{'abou'}"
+ 	onClick="javascript:makeabout();" />
+ 	</span>
+ 	</form>
+ NASOFORM
+ 	my $newrosterform=(<<NROSTFORM);
+ 	<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>
+ NROSTFORM
         unless ($env{'form.pagepath'}) {
-            $r->print(<<ENDFORM);
+ 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- <br /><form action="/adm/coursedocs" method="post" name="newfolder">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ 	my $newpageform=(<<NPFORM);
- <input type="hidden" name="importdetail" value="" />
+ 	<form action="/adm/coursedocs" method="post" name="newpage">
- <nobr>
+ 	<input type="hidden" name="folderpath" value="$path" />
- <input name="newfolder" type="button"
+ 	<input type="hidden" name="importdetail" value="" />
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	<span class="LC_nobreak">
- value="$lt{'newf'}" />$help{'Adding_Folders'}
+ 	<input name="newpage" type="button"
- </nobr>
+ 	onClick="javascript:makenewpage(this.form,'$pageseq');"
- </form>
+ 	value="$lt{'newp'}" />$help{'Adding_Pages'}
- <br /><form action="/adm/coursedocs" method="post" name="newpage">
+ 	</span>
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ 	</form>
- <input type="hidden" name="importdetail" value="" />
+ NPFORM
- <nobr>
- <input name="newpage" type="button"
+ 	my $newfolderform=(<<NFFORM);
- onClick="javascript:makenewpage(this.form,'$pageseq');"
+ 	<form action="/adm/coursedocs" method="post" name="newfolder">
- value="$lt{'newp'}" />$help{'Adding_Pages'}
+ 	<input type="hidden" name="folderpath" value="$path" />
- </nobr>
+ 	<input type="hidden" name="importdetail" value="" />
- </form>
+ 	<span class="LC_nobreak">
- <br /><form action="/adm/coursedocs" method="post" name="newsyl">
+ 	<input name="newfolder" type="button"
- $uploadtag
+ 	onClick="javascript:makenewfolder(this.form,'$folderseq');"
- <input type="hidden" name="importdetail"
+ 	value="$lt{'newf'}" />$help{'Adding_Folders'}
- value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+ 	</span>
- <nobr>
+ 	</form>
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
+ NFFORM
-  $help{'Syllabus'}
- </nobr>
+ 	my $newsylform=(<<NSYLFORM);
- </form>
+ 	<form action="/adm/coursedocs" method="post" name="newsyl">
- <br /><form action="/adm/coursedocs" method="post" name="newnav">
+ 	$uploadtag
- $uploadtag
+ 	<input type="hidden" name="importdetail"
- <input type="hidden" name="importdetail"
+ 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
- value="Navigate Content=/adm/navmaps" />
+ 	<span class="LC_nobreak">
- <nobr>
+ 	<input name="newsyl" type="submit" value="$lt{'syll'}" />
- <input name="newnav" type="submit" value="$lt{'navc'}" />
+ 	$help{'Syllabus'}
- $help{'Navigate_Content'}
+ 	</span>
- </nobr>
+ 	</form>
- </form>
+ NSYLFORM
- <br /><form action="/adm/coursedocs" method="post" name="newsmppg">
- $uploadtag
+ 	my $newgroupfileform=(<<NGFFORM);
- <input type="hidden" name="importdetail" value="" />
+ 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
- <nobr>
+ 	$uploadtag
- <input name="newsmppg" type="button" value="$lt{'sipa'}"
+ 	<input type="hidden" name="importdetail"
- onClick="javascript:makesmppage();" /> $help{'Simple Page'}
+ 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
- </nobr>
+ 	<span class="LC_nobreak">
- </form>
+ 	<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
- <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
+ 	$help{'Group Files'}
- $uploadtag
+ 	</span>
- <input type="hidden" name="importdetail" value="" />
+ 	</form>
- <nobr>
+ NGFFORM
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- </nobr>
+         my $specialdocumentsform=(<<SPDOFORM);
- </form>
+ 	<br />$newfolderform
- <br /><form action="/adm/coursedocs" method="post" name="newdropbox">
+ 	<br />$newpageform
- $uploadtag
+ 	<br />$newsylform
- <input type="hidden" name="importdetail" value="" />
+ 	<br />$newnavform
- <nobr>
+ 	<br />$newsmppageform
- <input name="newdropbox" type="button" value="$lt{'drbx'}"
+ 	<br />$newsmpproblemform
- onClick="javascript:makedropbox();" />
+ 	<br />$newdropboxform
- </nobr>
+ 	<br />$newexuploadform
- </form>
+ 	<br />$newbulform
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
+ 	<br />$newaboutmeform
- $uploadtag
+ 	<br />$newaboutsomeoneform
- <input type="hidden" name="importdetail" value="" />
+ 	<br />$newgroupfileform
- <nobr>
+ 	<br />$newrosterform
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
+ SPDOFORM
- onClick="javascript:makeexamupload();" />
- $help{'Score_Upload_Form'}
- </nobr>
+ my %orderhash = (
- </form>
+                 'aa' => 'New Document',
- <br /><form action="/adm/coursedocs" method="post" name="newbul">
+                 'bb' => 'Published Documents',
- $uploadtag
+                 'cc' => 'Special Documents',
- <input type="hidden" name="importdetail" value="" />
+ 		'dd' => 'More Options',
- <nobr>
+                 'zz' => 'Hide all Option',
- <input name="newbulletin" type="button" value="$lt{'bull'}"
+                 );
- onClick="javascript:makebulboard();" />
+ my %namehash = (
- $help{'Bulletin Board'}
+                 'New Document' => $fileuploadform,
- </nobr>
+                 'Published Documents' => $simpleeditdefaultform,
- </form>
+                 'Special Documents' => $specialdocumentsform,
- <br /><form action="/adm/coursedocs" method="post" name="newaboutme">
+ 		'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform,
- $uploadtag
+                 'drei' => 'dr',
- <input type="hidden" name="importdetail"
+                 );
- value="$plainname=/adm/$udom/$uname/aboutme" />
+ my $tid = '1';
- <nobr>
+ my $varcd = 'Course Documents';
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+ $r->print(&generate_edit_table($varcd,\%namehash,\%orderhash));
- $help{'My Personal Info'}
+       }
- </nobr>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
- $uploadtag
- <input type="hidden" name="importdetail" value="" />
- <nobr>
- <input name="newaboutsomeone" type="button" value="$lt{'abou'}"
- onClick="javascript:makeabout();" />
- </nobr>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
- $uploadtag
- <input type="hidden" name="importdetail"
- value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
- <nobr>
- <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
- $help{'Group Files'}
- </nobr>
- </form>
- ENDFORM
-        }
         if ($env{'form.pagepath'}) {
-            $r->print(<<ENDBLOCK);
- <form action="/adm/coursedocs" method="post" name="newsmpproblem">
- $uploadtag
- <input type="hidden" name="importdetail" value="" />
- <nobr>
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- </nobr>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
- $uploadtag
- <input type="hidden" name="importdetail" value="" />
- <nobr>
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
- onClick="javascript:makeexamupload();" />
- $help{'Score_Upload_Form'}
- </nobr>
- </form>
- ENDBLOCK
         }
-        $r->print('</td></tr>'."\n".
- '</table>');
-        $r->print('</td></tr>');
      }
  # ----------------------------------------------------- Supplemental documents
      if (!$forcestandard) {
-        $r->print('<tr><td bgcolor="#BBBBBB">');
- # '<h2>'.&mt('Supplemental Course Documents').
- #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
         my $folder=$env{'form.folder'};
         unless ($folder=~/^supplemental/) {
  	   $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';
+ 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+ 	my $supupdocform=(<<SUPDOCFORM);
+ 	<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	$fileupload
+ 	<br />
+ 	<br />
+ 	<span class="LC_nobreak">
+ 	$checkbox
+ 	</span>
+ 	<br /><br />
+ 	$lt{'comment'}:<br />
+ 	<textarea cols=50 rows=4 name='comment'>
+ 	</textarea>
+ 	<br />
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="cmd" value="upload_supplemental" />
+ 	<span class="LC_nobreak">
+ 	<input type="submit" value="$lt{'upld'}" />
+ 	 $help{'Uploading_From_Harddrive'}
+ 	</span>
+ 	</form>
+ SUPDOCFORM
+ 	my $supnewfolderform=(<<SNFFORM);
+ 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newfolder" type="button"
+ 	onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	value="$lt{'newf'}" /> $help{'Adding_Folders'}
+ 	</span>
+ 	</form>
+ SNFFORM
+ 	my $supnewextform=(<<SNEFORM);
+ 	<form action="/adm/coursedocs" method="post" name="supnewext">
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newext" type="button"
+ 	onClick="javascript:makenewext('supnewext');"
+ 	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	</span>
+ 	</form>
+ SNEFORM
+ 	my $supnewsylform=(<<SNSFORM);
+ 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail"
+ 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+ 	<span class="LC_nobreak">
+ 	<input name="newsyl" type="submit" value="$lt{'syll'}" />
+ 	$help{'Syllabus'}
+ 	</span>
+ 	</form>
+ SNSFORM
+ 	my $supnewaboutmeform=(<<SNAMFORM);
+ 	<form action="/adm/coursedocs" method="post" name="subnewaboutme">
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail"
+ 	value="$plainname=/adm/$udom/$uname/aboutme" />
+ 	<span class="LC_nobreak">
+ 	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+ 	$help{'My Personal Info'}
+ 	</span>
+ 	</form>
+ SNAMFORM
+ my %suporderhash = (
+                 'ee' => 'New Document',
+                 'ff' => 'Special Documents',
+                 'zz' => 'Hide all Options',
+                 );
+ my %supnamehash = (
+                 'New Document' => $supupdocform,
+                 'Special Documents' => $supnewfolderform.'<br />'.$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform,
+                 );
+ my $tid='2';
+ my $varscd = 'Supplemented Course Documents';
+ $r->print(<<FORM);
+ <ul class="LC_TabContent">
+ 	<li>New Document</li>
+ 	<li>Special Documents</li>
+ </ul>
+ FORM
-           $r->print(<<ENDSUPFORM);
+ #$r->print(&generate_edit_table($varscd,\%supnamehash,\%suporderhash));
- <table cellspacing=4 cellpadding=4><tr>
- <th bgcolor="#DDDDDD">$lt{'upls'}</th>
+ 	}
- <th bgcolor="#DDDDDD">$lt{'spec'}</th>
+    }
- </tr>
- <tr><td bgcolor="#DDDDDD">
- <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
- <input type="file" name="uploaddoc" size="40">
- <br />
- <br />
- <nobr>
- <label>$lt{'parse'}?
- <input type="checkbox" name="parserflag" />
- </label>
- </nobr>
- <br /><br />
- $lt{'comment'}:<br />
- <textarea cols=50 rows=4 name='comment'>
- </textarea>
- <br />
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type="hidden" name="cmd" value="upload_supplemental">
- <nobr>
- <input type="submit" value="$lt{'upld'}">
-  $help{'Uploading_From_Harddrive'}
- </nobr>
- </form>
- </td>
- <td bgcolor="#DDDDDD">
- <form action="/adm/coursedocs" method="post" name="supnewfolder">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type="hidden" name="importdetail" value="" />
- <nobr>
- <input name="newfolder" type="button"
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
- value="$lt{'newf'}" /> $help{'Adding_Folders'}
- </nobr>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="supnewext">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type="hidden" name="importdetail" value="" />
- <nobr>
- <input name="newext" type="button"
- onClick="javascript:makenewext('supnewext');"
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
- </nobr>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type="hidden" name="importdetail"
- value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
- <nobr>
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
- $help{'Syllabus'}
- </nobr>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type="hidden" name="importdetail"
- value="$plainname=/adm/$udom/$uname/aboutme" />
- <nobr>
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
- $help{'My Personal Info'}
- </nobr>
- </form>
- </td></tr>
- </table></td></tr>
- ENDSUPFORM
-        }
-     }
      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 3041  ENDSUPFORM
+ Line 3264  ENDSUPFORM
   return OK;
  }
+ sub generate_admin_options {
+   my ($containertag,$uploadtag,$lt_ref,$help_ref,$env_ref) = @_;
+   my %lt = %{$lt_ref};
+   my %help = %{$help_ref};
+   my %env = %{$env_ref};
+   my $dumpbut=&dumpbutton();
+   my $exportbut=&exportbutton();
+   return (<<ENDOPTIONFORM);
+  <form name="renameform" method="post" action="/adm/coursedocs">
+    <input type="hidden" name="title" />
+    <input type="hidden" name="cmd" />
+    <input type="hidden" name="markcopy" />
+    <input type="hidden" name="copyfolder" />
+    $containertag
+  </form>
+  <form name="simpleedit" method="post" action="/adm/coursedocs">
+    <input type="hidden" name="importdetail" value="" />
+    $uploadtag
+  </form>
+  <form action="/adm/coursedocs" method="post" name="courseverify">
+    <ul style="list-style-type:none">
+        <li>
+            <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
+        </li>
+        <li>
+            <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
+        </li>
+        <li>
+            $dumpbut
+        </li>
+        <li>
+            $exportbut
+        </li>
+        <li>
+           <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+         </li>
+         <li>
+           <input type="hidden" name="folder" value="$env{'form.folder'}" />
+           <input type="submit" name="docslog" value="$lt{'sl'}" />
+         </li>
+    </ul>
+  </form>
+  <div style="clear: both; height: 0px;">&nbsp;</div>
+ ENDOPTIONFORM
+ }
+ sub generate_edit_table {
+     my ($varcd,$namehash_ref,$orderhash_ref) = @_;
+     my %namehash = %{$namehash_ref};             #name verlinkt mit id
+     my %orderhash = %{$orderhash_ref};           #name mit kürzel verlinkt mit name
+     my $form;
+     {
+     $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt('Upload '.$varcd).'</h4>';
+     $form .= '<ul id="navigation" class="LC_TabContent">';
+     foreach my $name (sort(keys(%orderhash))){
+         if($name eq 'zz'){
+             $form .= '<li onclick="javascript:hideAll(this);" class="active">'.&mt($orderhash{$name}).'</li>';
+         }else{
+             $form .= '<li onclick="javascript:showPage(this, \''.$orderhash{$name}.'\');">'.&mt($orderhash{$name}).'</li>';
+         }
+     }
+     $form .= '<div id="content" style="padding: 0 0; margin: 0 0;">';
+     foreach my $field (keys(%namehash)){
+         $form .= '<div id="'.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
+       }
+     $form .= '</div></div>';
+     }
+     return $form;
+ }
  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 3056  function makenewfolder(targetform,folder
+ Line 3375  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 3065  function makenewpage(targetform,folderse
+ Line 3384  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 3078  function makeexamupload() {
+ Line 3408  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 3087  function makesmppage() {
+ Line 3417  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 3096  function makesmpproblem() {
+ Line 3426  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 3105  function makedropbox() {
+ Line 3435  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 3114  function makebulboard() {
+ Line 3444  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 3144  function finishpick() {
+ Line 3474  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 3165  function changename(folderpath,index,old
+ Line 3495  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 3179  function removeres(folderpath,index,oldt
+ Line 3510  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 3194  function cutres(folderpath,index,oldtitl
+ Line 3526  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;
      }
- Line 3206  function markcopy(folderpath,index,oldti
+ Line 3539  function markcopy(folderpath,index,oldti
      this.document.forms.renameform.submit();
  }
+ function unselectInactive() {
+ 	currentTable = document.getElementById('tableId');
+ 	currentNav = document.getElementById('navigation');
+ 	currentLis = currentNav.getElementsByTagName('LI');
+ 	for (i = 0; i < currentLis.length; i++) {
+ 		currentLis[i].className = 'i';
+ 	}
+ }
+ function hideAll(current) {
+ 	unselectInactive();
+ 	current.className = 'active';
+ 	currentData = document.getElementById('content');
+ 	currentDivs = currentData.getElementsByTagName('DIV');
+ 	for (i = 0; i < currentDivs.length; i++) {
+ 		currentDivs[i].style.display = 'none';
+ 	}
+ }
+ function showPage(current, pageId) {
+ 	hideAll(current);
+ 	unselectInactive();
+ 	current.className = 'active';
+ 	currentData = document.getElementById(pageId);
+ 	currentData.style.display = 'block';
+ 	return false;
+ }
  ENDNEWSCRIPT
  }
 ;
  __END__
+ =head1 NAME
+ Apache::londocs.pm
+ =head1 SYNOPSIS
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 SUBROUTINES
+ =over
+ =item %help=()
+ Available help topics
+ =item mapread()
+ Mapread read maps into LONCAPA::map:: global arrays
+ @order and @resources, determines status
+ sets @order - pointer to resources in right order
+ sets @resources - array with the resources with correct idx
+ =item authorhosts()
+ Return hash with valid author names
+ =item dumpbutton()
+ Generate "dump" button
+ =item clean()
+ =item dumpcourse()
+     Actually dump course
+ =item exportbutton()
+     Generate "export" button
+ =item exportcourse()
+ =item create_ims_store()
+ =item build_package()
+ =item get_dependencies()
+ =item process_content()
+ =item replicate_content()
+ =item extract_media()
+ =item store_template()
+ =item group_import()
+     Imports the given (name, url) resources into the course
+     coursenum, coursedom, and folder must precede the list
+ =item breadcrumbs()
+ =item log_docs()
+ =item docs_change_log()
+ =item update_paste_buffer()
+ =item print_paste_buffer()
+ =item do_paste_from_buffer()
+ =item update_parameter()
+ =item handle_edit_cmd()
+ =item editor()
+ =item process_file_upload()
+ =item process_secondary_uploads()
+ =item is_supplemental_title()
+ =item parse_supplemental_title()
+ =item entryline()
+ =item tiehash()
+ =item untiehash()
+ =item checkonthis()
+ check on this
+ =item verifycontent()
+ Verify Content
+ =item devalidateversioncache() & checkversions()
+ Check Versions
+ =item mark_hash_old()
+ =item is_hash_old()
+ =item changewarning()
+ =item init_breadcrumbs()
+ Breadcrumbs for special functions
+ =back
+ =cut

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

Removed from v.1.277
changed lines
	Added in v.1.333