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.291 and 1.354

-version 1.291, 2007/07/13 23:08:07
+version 1.354, 2009/03/10 18:49:22
  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 ''; }
      if ($home) {
- 	return '<div>'.
+ 	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').
+ 	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
- 	    '</div>';
      } else {
  	return '<div>'.
       &mt('Dump '.$type.
- Line 139  sub dumpbutton {
+ Line 133  sub dumpbutton {
  sub clean {
      my ($title)=@_;
      $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
      return $title;
  }
- # -------------------------------------------------------- Actually dump course
  sub dumpcourse {
      my ($r) = @_;
- Line 161  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 180  sub dumpcourse {
+ Line 175  sub dumpcourse {
  	    my $fail=0;
  	    for (my $i=0;$i<$#dirs;$i++) {
  		$makepath.='/'.$dirs[$i];
  		unless (-e $makepath) {
  		    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 {
- Line 211  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 228  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 '<div>'.
+     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').'</div>';
+     &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 309  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 439  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 462  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 548  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 572  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 606  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 651  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 746  sub replicate_content {
+ Line 759  sub replicate_content {
      if ($caller eq 'templateupload') {
          $url = $symb;
          $url =~ s#//#/#g;
      } else {
          ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
      }
      my $content;
- Line 786  sub replicate_content {
+ Line 799  sub replicate_content {
                      $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
                  }
              } elsif ($caller eq 'noedit') {
  # Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this.
                  $repstatus = 'ok';
                  $content = 'Not the owner of this resource';
              }
              if ($repstatus eq 'ok') {
                  print $copiedfile $content;
- Line 818  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 839  sub extract_media {
+ Line 852  sub extract_media {
              }
          }
          if ($caller eq 'resource') {
              my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';
              my $embed_path = &Apache::lonnet::filelocation($respath,$embed_url);
              $embed_content = &Apache::lonnet::getfile($embed_path);
              unless ($embed_content eq -1) {
                  $repstatus = 'ok';
- Line 858  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 902  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, $url, $residx) = @{ shift(@files) };
          if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
  	     && ($caller eq 'londocs')
  	     && (!&Apache::lonnet::stat_file($url))) {
- Line 924  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 932  sub group_import {
+ Line 944  sub group_import {
              }
          }
  	if ($url) {
  	    if (!$residx
  		|| defined($LONCAPA::map::zombies[$residx])) {
  		$residx = &LONCAPA::map::getresidx($url,$residx);
  		push(@LONCAPA::map::order, $residx);
- Line 941  sub group_import {
+ Line 953  sub group_import {
  	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
  	    $url  = &LONCAPA::map::qtunescape($url);
  	    $name = &LONCAPA::map::qtunescape($name);
  	    $LONCAPA::map::resources[$residx] =
  		join(':', ($name, $url, $ext, 'normal', 'res'));
  	}
      }
- Line 949  sub group_import {
+ Line 961  sub group_import {
  }
  sub breadcrumbs {
-     my ($where)=@_;
+     my ($where,$allowed,$type)=@_;
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      my (@folders);
      if ($env{'form.pagepath'}) {
- Line 963  sub breadcrumbs {
+ Line 975  sub breadcrumbs {
      my $randompick=-1;
      my $isencrypted=0;
      my $ishidden=0;
+     my $is_random_order=0;
      while (@folders) {
  	my $folder=shift(@folders);
- 	my $foldername=shift(@folders);
+     	my $foldername=shift(@folders);
  	if ($folderpath) {$folderpath.='&';}
  	$folderpath.=$folder.'&'.$foldername;
  	my $url='/adm/coursedocs?folderpath='.
  	    &escape($folderpath);
-             my $name=&unescape($foldername);
+ 	    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 991  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 1029  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 1056  sub log_docs {
+ Line 1077  sub log_docs {
  }
- #
- # Docs Change Log
- #
  sub docs_change_log {
      my ($r)=@_;
      my $folder=$env{'form.folder'};
- Line 1082  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 1103  sub docs_change_log {
+ Line 1125  sub docs_change_log {
  	    foreach my $key (@changes) {
  		$wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
  	    }
  	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
  	}
          my $count = 0;
          my $time =
- Line 1164  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 1198  sub update_paste_buffer {
+ Line 1220  sub update_paste_buffer {
  # Mark for copying
      my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
      if (&is_supplemental_title($title)) {
+         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
  	($title) = &parse_supplemental_title($title);
+     } elsif ($env{'docs.markedcopy_supplemental'}) {
+         &Apache::lonnet::delenv('docs.markedcopy_supplemental');
      }
      $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
-     &Apache::lonnet::appenv('docs.markedcopy_title' => $title,
+     &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
- 			    'docs.markedcopy_url'   => $url);
+ 			    'docs.markedcopy_url'   => $url});
      delete($env{'form.markcopy'});
  }
- Line 1224  ENDPASTE
+ Line 1249  ENDPASTE
  		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
      }  else {
  	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
- 	my $type = &Apache::loncommon::filedescription($extension);
+ 	my $icon = &Apache::loncommon::icon($extension);
- 	my $icon = '<img src="'.&Apache::loncommon::icon($extension).
+ 	if ($extension eq 'sequence' &&
- 	    '" alt="" class="LC_icon" />';
+ 	    $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') {
- Line 1243  ENDPASTE
+ Line 1272  ENDPASTE
  }
  sub do_paste_from_buffer {
-     my ($coursenum,$coursedom,$folder,$container) = @_;
+     my ($coursenum,$coursedom,$folder) = @_;
+     if (!$env{'form.pastemarked'}) {
+         return;
+     }
  # paste resource to end of list
      my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
      my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
  # Maps need to be copied first
      if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
  	$title=&mt('Copy of').' '.$title;
- 	my $newid=$$.time;
+ 	my $newid=$$.int(rand(100)).time;
- 	$url=~/^(.+)\.(\w+)$/;
+ 	my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
- 	my $newurl=$1.$newid.'.'.$2;
+         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/}{};
- 	&Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+ 	my $paste_map_result =
- 					   &Apache::lonnet::getfile($url));
+             &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');
+ 	&Apache::lonnet::delenv('docs.markedcopy');
      }
      if ($url=~ m{/smppg$}) {
  	my $db_name = &Apache::lonsimplepage::get_db_name($url);
- Line 1272  sub do_paste_from_buffer {
+ Line 1338  sub do_paste_from_buffer {
  	    $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;
  	}
      }
- Line 1282  sub do_paste_from_buffer {
+ Line 1348  sub do_paste_from_buffer {
      $url       = &LONCAPA::map::qtunescape($url);
  # Now insert the URL at the bottom
      my $newidx = &LONCAPA::map::getresidx($url);
+     if ($env{'docs.markedcopy_supplemental'}) {
+         if ($folder =~ /^supplemental/) {
+             $title = $env{'docs.markedcopy_supplemental'};
+         } else {
+             (undef,undef,$title) =
+                 &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+         }
+     } else {
+         if ($folder=~/^supplemental/) {
+            $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                   $env{'user.domain'}.'___&&&___'.$title;
+         }
+     }
      $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
      push(@LONCAPA::map::order, $newidx);
+     return 'ok';
  # Store the result
-     return &storemap($coursenum,$coursedom,$folder.'.'.$container);
  }
- sub editor {
+ sub uniqueness_check {
-     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;
+     my ($newurl) = @_;
-     my $errtext='';
+     my $unique = 1;
-     my $fatal=0;
+     foreach my $res (@LONCAPA::map::order) {
-     my $container='sequence';
+         my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
-     if ($env{'form.pagepath'}) {
+         $url=&LONCAPA::map::qtescape($url);
-         $container='page';
+         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;
      }
-     ($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container);
+     return 1;
+ }
+ sub editor {
+     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
+     my $container= ($env{'form.pagepath'}) ? 'page'
+ 		                           : 'sequence';
+     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+ 				    $folder.'.'.$container);
+     return $errtext if ($fatal);
      if ($#LONCAPA::map::order<1) {
  	my $idx=&LONCAPA::map::getresidx();
  	if ($idx<=0) { $idx=1; }
- Line 1304  sub editor {
+ Line 1471  sub editor {
          $LONCAPA::map::resources[$idx]='';
      }
-     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder);
+     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
+ 	&breadcrumbs($folder,$allowed,$type);
      $r->print($breadcrumbtrail);
-     if ($fatal) {
- 	   $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-     } else {
  # ------------------------------------------------------------ Process commands
  # ---------------- if they are for this folder and user allowed to make changes
- 	if (($allowed) && ($env{'form.folder'} eq $folder)) {
+     if (($allowed) && ($env{'form.folder'} eq $folder)) {
  # set parameters and change order
-             &snapshotbefore();
+ 	&snapshotbefore();
- 	    if ($env{'form.changeparms'}) {
- 		my $idx=$env{'form.setparms'};
- # set parameters
- 		if ($env{'form.changeparms'} eq 'randompick') {
- 		    if ($env{'form.randpick_'.$idx}) {
- 			&LONCAPA::map::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
- 			&remember_parms($idx,'randompick','set',$env{'form.randpick_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_randompick');
- 			&remember_parms($idx,'randompick','del');
- 		    }
- 		}
- 		if ($env{'form.changeparms'} eq 'hiddenresource') {
- 		    if ($env{'form.hidprs_'.$idx}) {
- 			&LONCAPA::map::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
- 			&remember_parms($idx,'hiddenresource','set',$env{'form.hidprs_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_hiddenresource');
- 			&remember_parms($idx,'hiddenresource','del');
- 		    }
- 		}
- 		if ($env{'form.changeparms'} eq 'encrypturl') {
- 		    if ($env{'form.encprs_'.$idx}) {
- 			&LONCAPA::map::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
- 			&remember_parms($idx,'encrypturl','set',$env{'form.encprs_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_encrypturl');
- 			&remember_parms($idx,'encrypturl','del');
- 		    }
- 		}
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
- 		    return;
- 		}
- 	    }
- 	    if ($env{'form.newpos'}) {
+ 	if (&update_parameter()) {
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	    return $errtext if ($fatal);
+ 	}
+ 	if ($env{'form.newpos'} && $env{'form.currentpos'}) {
  # change order
- 		my $newpos=$env{'form.newpos'}-1;
+ 	    my $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=();
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($newpos>$currentpos) {
+ 	    return $errtext if ($fatal);
- # moving stuff up
+ 	}
- 		    for ($i=0;$i<$currentpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		    for ($i=$currentpos;$i<$newpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i+1];
- 		    }
- 		    $neworder[$newpos]=$LONCAPA::map::order[$currentpos];
- 		    for ($i=$newpos+1;$i<=$#LONCAPA::map::order;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		} else {
- # moving stuff down
- 		    for ($i=0;$i<$newpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		    $neworder[$newpos]=$LONCAPA::map::order[$currentpos];
- 		    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i-1];
- 		    }
- 		    for ($i=$currentpos+1;$i<=$#LONCAPA::map::order;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		}
- 		@LONCAPA::map::order=@neworder;
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
- 		    return;
- 		}
- 	    }
- 	    if ($env{'form.pastemarked'}) {
+ 	if ($env{'form.pastemarked'}) {
- 		my ($errtext,$fatal) =
+             my $paste_res =
- 		    &do_paste_from_buffer($coursenum,$coursedom,$folder,
+                 &do_paste_from_buffer($coursenum,$coursedom,$folder);
- 					  $container);
+             if ($paste_res eq 'ok') {
- 		if ($fatal) {
+                 ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
+                 return $errtext if ($fatal);
- 		    return;
+             } elsif ($paste_res ne '') {
- 		}
+                 $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
- 	    }
-             $r->print($upload_output);
- 	    if ($env{'form.cmd'}) {
-                 my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
-                 if ($cmd eq 'del') {
- 		    my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
- 		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
- 			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
- 			&Apache::lonnet::removeuploadedurl($url);
- 		    } else {
- 			&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
- 		    }
- 		    for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {
-                         $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
-                     }
-                     $#LONCAPA::map::order--;
-                 } elsif ($cmd eq 'cut') {
- 		    my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
- 		    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
- 		    for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {
-                         $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
-                     }
-                     $#LONCAPA::map::order--;
-                 } elsif ($cmd eq 'up') {
- 		  if (($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
-                     my $i=$LONCAPA::map::order[$idx-1];
-                     $LONCAPA::map::order[$idx-1] = $LONCAPA::map::order[$idx];
-                     $LONCAPA::map::order[$idx] = $i;
- 		   }
-                 } elsif ($cmd eq 'down') {
- 		   if (defined($LONCAPA::map::order[$idx+1])) {
-                     my $i=$LONCAPA::map::order[$idx+1];
-                     $LONCAPA::map::order[$idx+1] = $LONCAPA::map::order[$idx];
-                     $LONCAPA::map::order[$idx] = $i;
- 		   }
-                 } elsif ($cmd eq 'rename') {
-                     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
-                     my ($rtitle,@rrest)=split(/\:/,
-                        $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
-                     my $comment=$env{'form.title'};
-                     $comment = &LONCAPA::map::qtunescape($comment);
- 		    if ($comment=~/\S/) {
- 			$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
- 			    $comment.':'.join(':',@rrest);
- 		    }
- # Devalidate title cache
-                     my $renamed_url=&LONCAPA::map::qtescape($rrest[0]);
- 		    &Apache::lonnet::devalidate_title_cache($renamed_url);
-                 }
- # Store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
- 					    $folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></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;
- 		foreach (split(/\&/,$env{'form.importdetail'})) {
+ 	    foreach my $item (split(/\&/,$env{'form.importdetail'})) {
- 		    if (defined($_)) {
+ 		if (defined($item)) {
- 			my ($name,$url,$residx)=
+ 		    my ($name,$url,$residx)=
- 			    map {&unescape($_)} split(/\=/,$_);
+ 			map {&unescape($_)} split(/\=/,$item);
- 			push(@imports, [$name, $url, $residx]);
+ 		    push(@imports, [$name, $url, $residx]);
- 		    }
- 		}
- # Store the changed version
- 		($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
- 					       $container,'londocs',@imports);
- 		if ($fatal) {
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
- 		    return;
  		}
-             }
+ 	    }
+ 	    ($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><span class="LC_error">'.$errtext.'</span></p>');
+ 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
- 		      return;
- 	          }
+ 	    }
-                } else {
- 		    $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
-                }
-            }
-            &log_differences($plain);
  	}
+ 	&log_differences($plain);
+     }
  # ---------------------------------------------------------------- End commands
  # ---------------------------------------------------------------- Print screen
-         my $idx=0;
+     my $idx=0;
- 	my $shown=0;
+     my $shown=0;
-         if (($ishidden) || ($isencrypted) || ($randompick>=0)) {
+     if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
-            $r->print('<p>'.&mt('Parameters').':<ul>'.
+ 	$r->print('<p>'.&mt('Parameters').':<ul>'.
-                      ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
+ 		  ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
-                      ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
+ 		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
-                      ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
+ 		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
-                      '</ul></p>');
+ 		  '</ul></p>');
-         }
+     }
-         if ($randompick>=0) {
+     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('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
-         }
+     }
-         $r->print('<table class="LC_docs_editor">');
+     if ($is_random_order) {
-         foreach my $res (@LONCAPA::map::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>');
-            my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+     }
- 	   $name=&LONCAPA::map::qtescape($name);
+     $r->print('<table class="LC_docs_editor">');
- 	   $url=&LONCAPA::map::qtescape($url);
+     foreach my $res (@LONCAPA::map::order) {
-            unless ($name) {  $name=(split(/\//,$url))[-1]; }
+ 	my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
-            unless ($name) { $idx++; next; }
+ 	$name=&LONCAPA::map::qtescape($name);
-            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
+ 	$url=&LONCAPA::map::qtescape($url);
- 				$coursenum));
+ 	unless ($name) {  $name=(split(/\//,$url))[-1]; }
-            $idx++;
+ 	unless ($name) { $idx++; next; }
- 	   $shown++;
+ 	$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
-         }
+ 			     $coursenum));
- 	unless ($shown) {
+ 	$idx++;
- 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
+ 	$shown++;
- 	}
+     }
-         $r->print("\n</table>\n");
+     unless ($shown) {
+ 	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
- 	&print_paste_buffer($r,$container);
      }
+     $r->print("\n</table>\n");
+     if ($allowed) {
+         &print_paste_buffer($r,$container);
+     }
+     return;
  }
  sub process_file_upload {
- Line 1610  sub process_file_upload {
+ Line 1660  sub process_file_upload {
     <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
  		    $phase_status = 'phasetwo';
                      $$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 1623  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 1743  sub entryline {
+ Line 1744  sub entryline {
      my $line='<tr>';
      my ($form_start,$form_end);
  # Edit commands
-     my $container;
      my ($container, $type, $esc_path, $path, $symb);
      if ($env{'form.folderpath'}) {
  	$type = 'folder';
  Line 1763  sub entryline {
  	my $incindex=$index+1;
  	my $selectbox='';
  	if (($folder!~/^supplemental/) &&
  	    ($#LONCAPA::map::order>0) &&
  	    ((split(/\:/,
  	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
  	     ne '') &&
  	    ((split(/\:/,
  	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]
  	     ne '')) {
  	    $selectbox=
  		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
  Line 1796  sub entryline {
  		# no copy for published maps
  		$nocopy = 1;
  	    } else {
- 		foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
+ 		foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
- 		    my ($title,$url,$ext,$type)=split(/\:/,$_);
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$item);
  		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
  			$nocopy=1;
  			last;
  Line 1805  sub entryline {
  		}
  	    }
  	}
          if ($url=~/^\/res\/lib\/templates\//) {
             $nocopy=1;
             $nocut=1;
          }
          my $copylink='&nbsp;';
  Line 1899  END
      }
      my $orig_url = $url;
+     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
      my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
  	my $symb=&Apache::lonnet::symbclean(
- Line 1920  END
+ Line 1921  END
  	    } elsif ($url!~/\.(sequence|page)$/) {
  		$url='/adm/coursedocs/showdoc'.$url;
  	    }
  	} elsif ($url=~m|^/ext/|) {
  	    $url='/adm/wrapper'.$url;
  	    $external = 1;
  	}
- Line 1936  END
+ Line 1937  END
  	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
  	}
      }
-     my $parameterset='&nbsp;';
+     my ($parameterset,$rand_order_text) = ('&nbsp;', '&nbsp;');
      if ($isfolder || $extension eq 'sequence') {
  	my $foldername=&escape($foldertitle);
  	my $folderpath=$env{'form.folderpath'};
  	if ($folderpath) { $folderpath.='&' };
  # Append randompick number, hidden, and encrypted with ":" to foldername,
  # so it gets transferred between levels
  	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
                                                'parameter_randompick'))[0]
                                                 .':'.((&LONCAPA::map::getparameter($orderidx,
                                                'parameter_hiddenresource'))[0]=~/^yes$/i)
                                                 .':'.((&LONCAPA::map::getparameter($orderidx,
-                                               'parameter_encrypturl'))[0]=~/^yes$/i);
+                                               'parameter_encrypturl'))[0]=~/^yes$/i)
+                                                .':'.((&LONCAPA::map::getparameter($orderidx,
+                                               'parameter_randomorder'))[0]=~/^yes$/i);
  	$url.='folderpath='.&escape($folderpath).$cpinfo;
  	$parameterset='<label>'.&mt('Randomly Pick: ').
- 	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randpick_'.$orderidx.'" value="'.
+ 	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
  	    (&LONCAPA::map::getparameter($orderidx,
                                                'parameter_randompick'))[0].
                                                '" />'.
  '<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
+     	my $ro_set=
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+ 	$rand_order_text ='
+ <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 2000  END
+ Line 2006  END
  	$line.=(<<ENDPARMS);
    <td class="LC_docs_entry_parameter">
      $form_start
-     <label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+     <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
      $form_end
    </td>
    <td class="LC_docs_entry_parameter">
      $form_start
-     <label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+     <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
      $form_end
    </td>
+   <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
    <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
  ENDPARMS
      }
- Line 2015  ENDPARMS
+ Line 2022  ENDPARMS
      return $line;
  }
- # ---------------------------------------------------------------- tie the hash
+ =pod
+ =item tiehash()
+ tie the hash
+ =cut
  sub tiehash {
      my ($mode)=@_;
- Line 2041  sub untiehash {
+ Line 2054  sub untiehash {
      return OK;
  }
- # --------------------------------------------------------------- check on this
  sub checkonthis {
      my ($r,$url,$level,$title)=@_;
- Line 2050  sub checkonthis {
+ Line 2064  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 2059  sub checkonthis {
+ Line 2076  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 2069  sub checkonthis {
+ Line 2086  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 2078  sub checkonthis {
+ Line 2095  sub checkonthis {
                       ($warningcount)) {
  		     if ($errorcount) {
                          $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
- 			  $errorcount.' '.
+                           &mt('[quant,_1,error]',$errorcount).'</span>');
- 				  &mt('error(s)').'</span> ');
                       }
  		     if ($warningcount) {
                          $r->print('<span class="LC_warning">'.
- 			  $warningcount.' '.
+                           &mt('[quant,_1,warning]',$warningcount).'</span>');
- 				  &mt('warning(s)').'</span>');
                       }
                   } else {
                       $r->print('<span class="LC_success">'.&mt('ok').'</span>');
- Line 2093  sub checkonthis {
+ Line 2108  sub checkonthis {
               }
  	     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('<span class="LC_error">'.&mt('connection down').'</span>');
            } elsif ($result eq 'not_found') {
  	      unless ($url=~/\$/) {
- 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></font>');
+ 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
  	      } else {
  		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
  	      }
            } else {
               $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
            }
-       }
+        }
-    }
+     }
  }
- #
- # ----------------------------------------------------------------- List Symbs
+ =pod
- #
+ =item list_symbs()
+ List Symbs
+ =cut
  sub list_symbs {
      my ($r) = @_;
+     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 2146  sub verifycontent {
+ Line 2173  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 /><span class="LC_error">'.
  			 &mt('The following sequence or page is included more than once in your '.$type.': ').
- 			 &unescape($hash{$_}).'</span><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 2165  sub verifycontent {
+ Line 2192  sub verifycontent {
  }
- # -------------------------------------------------------------- Check Versions
  sub devalidateversioncache {
      my $src=shift;
      &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
- Line 2196  sub checkversions {
+ Line 2221  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 2215  sub checkversions {
+ Line 2240  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 2228  sub checkversions {
+ Line 2253  sub checkversions {
      if ($haschanged) {
          if (&Apache::lonnet::put('resourceversions',\%newsetversions,
  			  $env{'course.'.$env{'request.course.id'}.'.domain'},
  			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
  	    $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
  	} else {
  	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
- Line 2240  sub checkversions {
+ Line 2265  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 2251  sub checkversions {
+ Line 2276  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 2315  sub checkversions {
+ Line 2340  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 2380  ENDHEADERS
+ Line 2405  ENDHEADERS
                  $entries_per_col = $num_entries/4 + 1;
              }
              my $entries_count = 0;
              $r->print('<td valign="top"><font size="-2">');
              my $cols_output = 1;
              for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
  		my $url=$root.'.'.$prevvers.'.'.$extension;
- Line 2459  sub changewarning {
+ Line 2484  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 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><span class="LC_warning">'.
- Line 2469  sub changewarning {
+ Line 2494  sub changewarning {
  $help{'Caching'}.'</span></h3></form>'."\n\n");
  }
- # =========================================== Breadcrumbs for special functions
  sub init_breadcrumbs {
      my ($form,$text)=@_;
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
- 					    text=>&Apache::loncommon::course_type()." Documents",
+ 					    text=>"Edit ".&Apache::loncommon::course_type(),
  					    faq=>273,
  					    bug=>'Instructor Interface',
                                              help => 'Docs_Adding_Course_Doc'});
- Line 2485  sub init_breadcrumbs {
+ Line 2509  sub init_breadcrumbs {
  					    bug=>'Instructor Interface'});
  }
- # ================================================================ Main Handler
  sub handler {
      my $r = shift;
      &Apache::loncommon::content_type($r,'text/html');
- Line 2493  sub handler {
+ Line 2519  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 2511  sub handler {
+ Line 2538  sub handler {
  		    'Option_Response_Simple');
      $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
  		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
-     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
+     $help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic(
  		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
-     $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
+     $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
      $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
  # does this user have privileges to modify docs
- Line 2546  sub handler {
+ Line 2573  sub handler {
      my $showdoc=0;
      my $containertag;
      my $uploadtag;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  					    ['folderpath','pagepath',
  					     'pagesymb']);
+ # No folderpath, no pagepath, see if we have something stored
+     if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
+         &Apache::loncommon::restore_course_settings('docs_folderpath',
+                                               {'folderpath' => 'scalar'});
+     }
+     if (!$env{'form.folderpath'}) {
+         &Apache::loncommon::restore_course_settings('docs_folderpath',
+                                               {'pagepath' => 'scalar'});
+     }
+     if ($env{'form.pagepath'}) {
+        $env{'form.folderpath'}='';
+     }
+     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
+         $env{'form.folderpath'} = 'supplemental&'.
+                                   &escape(&mt('Supplemental '.$type.' Documents')).'&'.
+                                   $env{'form.folderpath'};
+     }
+     &Apache::loncommon::store_course_settings('docs_folderpath',
+                                                 {'pagepath' => 'scalar',
+                                                  'folderpath' => 'scalar'});
      if ($env{'form.folderpath'}) {
  	my (@folderpath)=split('&',$env{'form.folderpath'});
  	$env{'form.foldername'}=&unescape(pop(@folderpath));
- Line 2567  sub handler {
+ Line 2616  sub handler {
         $showdoc='/'.$1;
      }
      unless ($showdoc) { # got called from remote
         if (($env{'form.folder'}=~/^(?:group|default)_/) ||
            ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
             $forcestandard = 1;
         }
         $forcesupplement=($env{'form.folder'}=~/^supplemental_/);
         if ($allowed) {
           &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
           $script=&Apache::lonratedt::editscript('simple');
         }
      } else { # got called in sequence from course
         $allowed=0;
- Line 2585  sub handler {
+ Line 2634  sub handler {
      my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
      my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
  # get personal data
      my $uname=$env{'user.name'};
      my $udom=$env{'user.domain'};
      my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
- Line 2599  sub handler {
+ Line 2648  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 2609  sub handler {
+ Line 2660  sub handler {
    if ($allowed) {
        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 2630  sub handler {
+ Line 2685  sub handler {
                    $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
                    $origname{$i} = &unescape($env{'form.embedded_orig_'.$i});
                    if (exists($env{'form.embedded_codebase_'.$i})) {
                        $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});
                        $origname{$i} =~ s#^\Q$javacodebase\E/##;
                    }
                    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 2658  sub handler {
+ Line 2713  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 2668  sub handler {
+ Line 2723  sub handler {
                            }
                            if ($content =~ m#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#) {
                            }
                            $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi;
                        }
                        if (exists($codebase{$item})) {
                            $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i; #' stupid emacs
- Line 2680  sub handler {
+ Line 2735  sub handler {
                    my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
                    my $url = &Apache::lonnet::store_edited_file($primary_url,$content,$docudom,$docuname,\$saveresult);
                } else {
                    &Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus);
                }
            }
        }
- Line 2692  sub handler {
+ Line 2747  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 2707  sub handler {
+ Line 2761  sub handler {
                  'extr' => 'External Resource',
                  'syll' => 'Syllabus',
                  'navc' => 'Navigate Contents',
-                 'sipa' => 'Simple Page',
+                 'sipa' => 'Simple Course Page',
                  'sipr' => 'Simple Problem',
                  'drbx' => 'Drop Box',
                  'scuf' => 'Score Upload Form',
-                 'bull' => 'Bulletin Board',
+                 'bull' => 'Discussion Board',
-                 'mypi' => 'My Personal Info',
+                 'mypi' => 'My Personal Information Page',
-                 'grpo' => 'Group Files',
+                 'grpo' => 'Group Portfolio',
- 		'abou' => 'About User',
+                 'rost' => 'Course Roster',
+ 				'abou' => 'Personal Information Page for a 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) {
  	&update_paste_buffer($coursenum,$coursedom);
-        my $dumpbut=&dumpbutton();
-        my $exportbut=&exportbutton();
         my %lt=&Apache::lonlocal::texthash(
  					 'vc' => 'Verify Content',
  					 'cv' => 'Check/Set Resource Versions',
- Line 2745  sub handler {
+ Line 2873  sub handler {
             $containertag = '<input type="hidden" name="folderpath" value="" />';
             $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
         }
+ 	$r->print(<<HIDDENFORM);
-        $r->print(<<ENDCOURSEVERIFY);
+ 	<form name="renameform" method="post" action="/adm/coursedocs">
- <form name="renameform" method="post" action="/adm/coursedocs">
+    <input type="hidden" name="title" />
-   <input type="hidden" name="title" />
+    <input type="hidden" name="cmd" />
-   <input type="hidden" name="cmd" />
+    <input type="hidden" name="markcopy" />
-   <input type="hidden" name="markcopy" />
+    <input type="hidden" name="copyfolder" />
-   <input type="hidden" name="copyfolder" />
+    $containertag
-   $containertag
+  </form>
- </form>
+  <form name="simpleedit" method="post" action="/adm/coursedocs">
- <form name="simpleedit" method="post" action="/adm/coursedocs">
+    <input type="hidden" name="importdetail" value="" />
-   <input type="hidden" name="importdetail" value="" />
+    $uploadtag
-   $uploadtag
+  </form>
- </form>
+ HIDDENFORM
- <form action="/adm/coursedocs" method="post" name="courseverify">
+     }
-   <div class="LC_docs_course_commands">
+ # --------------------------------------------------------- Main tab structure
+     my $activeClass = 1;
-       <div>
+     $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
-         <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
+     if (($standard) && ($allowed) && (!$forcesupplement)) {
-       </div>
+ 	my $active = '';
-       <div>
+         if($activeClass == 1){
-         <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
+            $active = 'class="active"';
-       </div>
+ 	   $activeClass = 0;
-         $dumpbut
+ 	}
-         $exportbut
+ 	$r->print('<li '.$active.'onclick="javascript:showPage(this,\'Main Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>');
-       <div>
+     }
-         <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+     if (!$forcestandard) {
-       </div>
+ 	my $active = '';
-       <div>
+         if($activeClass == 1){
-         <input type="hidden" name="folder" value="$env{'form.folder'}" />
+            $active = 'class="active"';
-         <input type="submit" name="docslog" value="$lt{'sl'}" />
+         }
-       </div>
+ 	$r->print('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
-   </div>
- </form>
- <div style="clear: both; height: 0px;">&nbsp;</div>
- ENDCOURSEVERIFY
-        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
- 		     &mt('Editing the Table of Contents for your '.$type)));
      }
+     $r->print('</ul><div class="LC_ContentBoxSpecial" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
  # --------------------------------------------------------- Standard documents
-     $r->print('<table class="LC_docs_documents">');#border=2 cellspacing=4 cellpadding=4>');
      if (($standard) && ($allowed) && (!$forcesupplement)) {
- 	$r->print('<tr><td class="LC_docs_document">');
+        my $active = 'style="display: none;"';
- #  '<h2>'.&mt('Main Course Documents').
+        if($activeClass == 0){
- #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
+           $active = 'style="display: block;"';
+        }
+        $r->print('<div class="LC_ContentBox" id="Main Course Documents" '.$active.'>');
+         $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
+                      &mt('Editing the Table of Contents for your '.$type)));
         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') {
- Line 2800  ENDCOURSEVERIFY
+ Line 2928  ENDCOURSEVERIFY
         } else {
             #$postexec='self.close();';
         }
-        $hadchanges=0;
-        &editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output);
-        if ($hadchanges) {
- 	   &mark_hash_old()
-        }
-        &changewarning($r,$postexec);
         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                       '.sequence';
         my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
- Line 2815  ENDCOURSEVERIFY
+ Line 2937  ENDCOURSEVERIFY
  	    $container='page';
  	}
  	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
-        $r->print(<<ENDFORM);
- <table class="LC_docs_adddocs">
- <tr>
- <th>$lt{'uplm'}</th>
+ 	my $recoverform=(<<RFORM);
- <th>$lt{'impp'}</th>
+ 	<form action="/adm/groupsort" method="post" name="recover">
- <th>$lt{'spec'}</th>
+ 	<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
- </tr>
+ 	</form>
- <tr>
+ RFORM
- <td>
- $lt{'file'}:<br />
+ 	my $imspform=(<<IMSPFORM);
- <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	<form action="/adm/imsimportdocs" method="post" name="ims">
- <input type="file" name="uploaddoc" size="40" />
+ 	<input type="hidden" name="folder" value="$folder" />
- <br />
+ 	<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
- $lt{'title'}:<br />
+ 	</form>
- <input type="text" size="50" name="comment" />
+ IMSPFORM
- $uploadtag
- <input type="hidden" name="cmd" value="upload_default" />
+ 	my $newnavform=(<<NNFORM);
- <br />
+ 	<form action="/adm/coursedocs" method="post" name="newnav">
- <span class="LC_nobreak">
+ 	$uploadtag
- <label>$lt{'parse'}?
+ 	<input type="hidden" name="importdetail"
- <input type="checkbox" name="parserflag" />
+ 	value="$lt{'navc'}=/adm/navmaps" />
- </label>
+ 	<span class="LC_nobreak">
- </span>
+ 	<input name="newnav" type="submit" value="$lt{'navc'}" />
- <br />
+ 	$help{'Navigate_Content'}
- <br />
+ 	</span>
- <span class="LC_nobreak">
+ 	</form>
- <input type="submit" value="$lt{'upld'}" />
+ NNFORM
-  $help{'Uploading_From_Harddrive'}
+ 	my $newsmppageform=(<<NSPFORM);
- </span>
+ 	<form action="/adm/coursedocs" method="post" name="newsmppg">
- </form>
+ 	$uploadtag
- </td>
+ 	<input type="hidden" name="importdetail" value="" />
- <td>
+ 	<span class="LC_nobreak">
- <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+ 	<input name="newsmppg" type="button" value="$lt{'sipa'}"
- $lt{'pubd'}<br />
+ 	onClick="javascript:makesmppage();" /> $help{'Simple Page'}
- $uploadtag
+ 	</span>
- <input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+ 	</form>
- <br />
+ NSPFORM
- <span class="LC_nobreak">
- <input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
+ 	my $newsmpproblemform=(<<NSPROBFORM);
- $help{'Importing_LON-CAPA_Resource'}
+ 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
- </span>
+ 	$uploadtag
- <br />
+ 	<input type="hidden" name="importdetail" value="" />
- <input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
+ 	<span class="LC_nobreak">
- <hr />
+ 	<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- <p>
+ 	onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- $lt{'copm'}<br />
+ 	</span>
- <input type="text" size="40" name="importmap" /><br />
+ 	</form>
- <span class="LC_nobreak"><input type="button"
- onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+ NSPROBFORM
- value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
- $help{'Load_Map'}</span>
+ 	my $newdropboxform=(<<NDBFORM);
- </p>
+ 	<form action="/adm/coursedocs" method="post" name="newdropbox">
- </form>
+ 	$uploadtag
- <hr />
+ 	<input type="hidden" name="importdetail" value="" />
- <form action="/adm/groupsort" method="post" name="recover">
+ 	<span class="LC_nobreak">
- <input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
+ 	<input name="newdropbox" type="button" value="$lt{'drbx'}"
- </form>
+ 	onClick="javascript:makedropbox();" />
- ENDFORM
+ 	</span>
-        unless ($env{'form.pagepath'}) {
+ 	</form>
- 	   $r->print(<<ENDFORM);
+ NDBFORM
- <hr />
- <form action="/adm/coursedocs" method="post" name="newext">
+ 	my $newexuploadform=(<<NEXUFORM);
- $uploadtag
+ 	<form action="/adm/coursedocs" method="post" name="newexamupload">
- <input type="hidden" name="importdetail" value="" />
+ 	$uploadtag
- <span class="LC_nobreak">
+ 	<input type="hidden" name="importdetail" value="" />
- <input name="newext" type="button" onClick="javascript:makenewext('newext');"
+ 	<span class="LC_nobreak">
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	<input name="newexamupload" type="button" value="$lt{'scuf'}"
- </span>
+ 	onClick="javascript:makeexamupload();" />
- </form>
+ 	$help{'Score_Upload_Form'}
- <br /><form action="/adm/imsimportdocs" method="post" name="ims">
+ 	</span>
- <input type="hidden" name="folder" value="$folder" />
+ 	</form>
- <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+ NEXUFORM
- </form>
- ENDFORM
+ 	my $newbulform=(<<NBFORM);
-        }
+ 	<form action="/adm/coursedocs" method="post" name="newbul">
-        $r->print('</td><td>');
+ 	$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 Information Page'}
+ 	</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
+ my $specialdocumentsform;
+ my $newfolderform;
         unless ($env{'form.pagepath'}) {
  	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
-            $r->print(<<ENDFORM);
- <br /><form action="/adm/coursedocs" method="post" name="newfolder">
+ 	my $newpageform=(<<NPFORM);
- <input type="hidden" name="folderpath" value="$path" />
+ 	<form action="/adm/coursedocs" method="post" name="newpage">
- <input type="hidden" name="importdetail" value="" />
+ 	<input type="hidden" name="folderpath" value="$path" />
- <span class="LC_nobreak">
+ 	<input type="hidden" name="importdetail" value="" />
- <input name="newfolder" type="button"
+ 	<span class="LC_nobreak">
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	<input name="newpage" type="button"
- value="$lt{'newf'}" />$help{'Adding_Folders'}
+ 	onClick="javascript:makenewpage(this.form,'$pageseq');"
- </span>
+ 	value="$lt{'newp'}" />$help{'Adding_Pages'}
- </form>
+ 	</span>
- <br /><form action="/adm/coursedocs" method="post" name="newpage">
+ 	</form>
- <input type="hidden" name="folderpath" value="$path" />
+ NPFORM
- <input type="hidden" name="importdetail" value="" />
- <span class="LC_nobreak">
+ 	$newfolderform=(<<NFFORM);
- <input name="newpage" type="button"
+ 	<form action="/adm/coursedocs" method="post" name="newfolder">
- onClick="javascript:makenewpage(this.form,'$pageseq');"
+ 	<input type="hidden" name="folderpath" value="$path" />
- value="$lt{'newp'}" />$help{'Adding_Pages'}
+ 	<input type="hidden" name="importdetail" value="" />
- </span>
+ 	<span class="LC_nobreak">
- </form>
+ 	<input name="newfolder" type="button"
- <br /><form action="/adm/coursedocs" method="post" name="newsyl">
+ 	onClick="javascript:makenewfolder(this.form,'$folderseq');"
- $uploadtag
+ 	value="$lt{'newf'}" />$help{'Adding_Folders'}
- <input type="hidden" name="importdetail"
+ 	</span>
- value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+ 	</form>
- <span class="LC_nobreak">
+ NFFORM
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
-  $help{'Syllabus'}
+ 	my $newsylform=(<<NSYLFORM);
- </span>
+ 	<form action="/adm/coursedocs" method="post" name="newsyl">
- </form>
+ 	$uploadtag
- <br /><form action="/adm/coursedocs" method="post" name="newnav">
+ 	<input type="hidden" name="importdetail"
- $uploadtag
+ 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
- <input type="hidden" name="importdetail"
+ 	<span class="LC_nobreak">
- value="Navigate Content=/adm/navmaps" />
+ 	<input name="newsyl" type="submit" value="$lt{'syll'}" />
- <span class="LC_nobreak">
+ 	$help{'Syllabus'}
- <input name="newnav" type="submit" value="$lt{'navc'}" />
+ 	</span>
- $help{'Navigate_Content'}
+ 	</form>
- </span>
+ NSYLFORM
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newsmppg">
+ 	my $newgroupfileform=(<<NGFFORM);
- $uploadtag
+ 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
- <input type="hidden" name="importdetail" value="" />
+ 	$uploadtag
- <span class="LC_nobreak">
+ 	<input type="hidden" name="importdetail"
- <input name="newsmppg" type="button" value="$lt{'sipa'}"
+ 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
- onClick="javascript:makesmppage();" /> $help{'Simple Page'}
+ 	<span class="LC_nobreak">
- </span>
+ 	<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
- </form>
+ 	$help{'Group Portfolio'}
- <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
+ 	</span>
- $uploadtag
+ 	</form>
- <input type="hidden" name="importdetail" value="" />
+ NGFFORM
- <span class="LC_nobreak">
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
+ 	$specialdocumentsform="<br />$newpageform<br />$newsylform<br />$newgroupfileform";
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+       }
- </span>
+ 	$specialdocumentsform.="<br />$newnavform<br />$newsmppageform
- </form>
+ 				<br />$newsmpproblemform<br />$newdropboxform
- <br /><form action="/adm/coursedocs" method="post" name="newdropbox">
+        				<br />$newexuploadform<br />$newbulform
- $uploadtag
+        				<br />$newaboutmeform<br />$newaboutsomeoneform
- <input type="hidden" name="importdetail" value="" />
+        				<br />$newrosterform";
- <span class="LC_nobreak">
+ if($env{'form.pagepath'}) {
- <input name="newdropbox" type="button" value="$lt{'drbx'}"
+ 	$specialdocumentsform="<br />$newsmpproblemform<br />$newexuploadform";
- onClick="javascript:makedropbox();" />
+ }
- </span>
- </form>
+ my %orderhash = (
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
+                 'aa' => 'New Document',
- $uploadtag
+                 'bb' => 'Published Documents',
- <input type="hidden" name="importdetail" value="" />
+                 'cc' => 'Special Documents',
- <span class="LC_nobreak">
+ 		'dd' => 'More Tools',
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
+                 'zz' => 'Hide all Options',
- onClick="javascript:makeexamupload();" />
+                 );
- $help{'Score_Upload_Form'}
+ my %namehash = (
- </span>
+                 'New Document' => $fileuploadform.'<br />'.$newfolderform,
- </form>
+                 'Published Documents' => $simpleeditdefaultform,
- <br /><form action="/adm/coursedocs" method="post" name="newbul">
+                 'Special Documents' => $specialdocumentsform,
- $uploadtag
+ 		'More Tools' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env),
- <input type="hidden" name="importdetail" value="" />
+                 );
- <span class="LC_nobreak">
+ my $tid='1';
- <input name="newbulletin" type="button" value="$lt{'bull'}"
+ my $content='content';
- onClick="javascript:makebulboard();" />
+ my $navigation='navigation';
- $help{'Bulletin Board'}
+ my $varcd = 'Main Course Documents';
- </span>
+ $r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash));
- </form>
+  $hadchanges=0;
- <br /><form action="/adm/coursedocs" method="post" name="newaboutme">
+         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
- $uploadtag
+        if ($error) {
- <input type="hidden" name="importdetail"
+            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
- value="$plainname=/adm/$udom/$uname/aboutme" />
+        }
- <span class="LC_nobreak">
+        if ($hadchanges) {
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+            &mark_hash_old();
- $help{'My Personal Info'}
- </span>
- </form>
- <br /><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>
- <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
- $uploadtag
- <input type="hidden" name="importdetail"
- value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
- <span class="LC_nobreak">
- <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
- $help{'Group Files'}
- </span>
- </form>
- ENDFORM
         }
+        &changewarning($r,'');
+ $r->print('</div>');
         if ($env{'form.pagepath'}) {
-            $r->print(<<ENDBLOCK);
- <form action="/adm/coursedocs" method="post" name="newsmpproblem">
- $uploadtag
- <input type="hidden" name="importdetail" value="" />
- <span class="LC_nobreak">
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- </span>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
- $uploadtag
- <input type="hidden" name="importdetail" value="" />
- <span class="LC_nobreak">
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
- onClick="javascript:makeexamupload();" />
- $help{'Score_Upload_Form'}
- </span>
- </form>
- ENDBLOCK
         }
-        $r->print('</td></tr>'."\n".
- '</table>');
-        $r->print('</td></tr>');
      }
  # ----------------------------------------------------- Supplemental documents
      if (!$forcestandard) {
-        $r->print('<tr><td class="LC_docs_document">');
+        my $active = 'style="display: none;"';
- # '<h2>'.&mt('Supplemental Course Documents').
+        if($activeClass == 1){
- #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
+           $active = 'style="display: block;"';
+        }
+        $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>');
         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'));
         }
-        &editor($r,$coursenum,$coursedom,$folder,$allowed);
         if ($allowed) {
  	   my $folderseq=
  	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
  	       '.sequence';
  	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- 	   $r->print(<<ENDSUPFORM);
- <table class="LC_docs_adddocs"><tr>
+ 	my $supupdocform=(<<SUPDOCFORM);
- <th>$lt{'upls'}</th>
+ 	<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
- <th>$lt{'spec'}</th>
+ 	$fileupload
- </tr>
+ 	<br />
- <tr><td>
+ 	<br />
- <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	<span class="LC_nobreak">
- <input type="file" name="uploaddoc" size="40" />
+ 	$checkbox
- <br />
+ 	</span>
- <br />
+ 	<br /><br />
- <span class="LC_nobreak">
+ 	$lt{'comment'}:<br />
- <label>$lt{'parse'}?
+ 	<textarea cols=50 rows=4 name='comment'>
- <input type="checkbox" name="parserflag" />
+ 	</textarea>
- </label>
+ 	<br />
- </span>
+ 	<input type="hidden" name="folderpath" value="$path" />
- <br /><br />
+ 	<input type="hidden" name="cmd" value="upload_supplemental" />
- $lt{'comment'}:<br />
+ 	<span class="LC_nobreak">
- <textarea cols=50 rows=4 name='comment'>
+ 	<input type="submit" value="$lt{'upld'}" />
- </textarea>
+ 	 $help{'Uploading_From_Harddrive'}
- <br />
+ 	</span>
- <input type="hidden" name="folderpath" value="$path" />
+ 	</form>
- <input type="hidden" name="cmd" value="upload_supplemental" />
+ SUPDOCFORM
- <span class="LC_nobreak">
- <input type="submit" value="$lt{'upld'}" />
+ 	my $supnewfolderform=(<<SNFFORM);
-  $help{'Uploading_From_Harddrive'}
+ 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
- </span>
+ 	<input type="hidden" name="folderpath" value="$path" />
- </form>
+ 	<input type="hidden" name="importdetail" value="" />
- </td>
+ 	<span class="LC_nobreak">
- <td>
+ 	<input name="newfolder" type="button"
- <form action="/adm/coursedocs" method="post" name="supnewfolder">
+ 	onClick="javascript:makenewfolder(this.form,'$folderseq');"
- <input type="hidden" name="folderpath" value="$path" />
+ 	value="$lt{'newf'}" /> $help{'Adding_Folders'}
- <input type="hidden" name="importdetail" value="" />
+ 	</span>
- <span class="LC_nobreak">
+ 	</form>
- <input name="newfolder" type="button"
+ SNFFORM
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
- value="$lt{'newf'}" /> $help{'Adding_Folders'}
- </span>
+ 	my $supnewextform=(<<SNEFORM);
- </form>
+ 	<form action="/adm/coursedocs" method="post" name="supnewext">
- <br /><form action="/adm/coursedocs" method="post" name="supnewext">
+ 	<input type="hidden" name="folderpath" value="$path" />
- <input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail" value="" />
- <input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
- <span class="LC_nobreak">
+ 	<input name="newext" type="button"
- <input name="newext" type="button"
+ 	onClick="javascript:makenewext('supnewext');"
- onClick="javascript:makenewext('supnewext');"
+ 	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	</span>
- </span>
+ 	</form>
- </form>
+ SNEFORM
- <br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
- <input type="hidden" name="folderpath" value="$path" />
+ 	my $supnewsylform=(<<SNSFORM);
- <input type="hidden" name="importdetail"
+ 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
- value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+ 	<input type="hidden" name="folderpath" value="$path" />
- <span class="LC_nobreak">
+ 	<input type="hidden" name="importdetail"
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
+ 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
- $help{'Syllabus'}
+ 	<span class="LC_nobreak">
- </span>
+ 	<input name="newsyl" type="submit" value="$lt{'syll'}" />
- </form>
+ 	$help{'Syllabus'}
- <br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
+ 	</span>
- <input type="hidden" name="folderpath" value="$path" />
+ 	</form>
- <input type="hidden" name="importdetail"
+ SNSFORM
- value="$plainname=/adm/$udom/$uname/aboutme" />
- <span class="LC_nobreak">
+ 	my $supnewaboutmeform=(<<SNAMFORM);
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+ 	<form action="/adm/coursedocs" method="post" name="subnewaboutme">
- $help{'My Personal Info'}
+ 	<input type="hidden" name="folderpath" value="$path" />
- </span>
+ 	<input type="hidden" name="importdetail"
- </form>
+ 	value="$plainname=/adm/$udom/$uname/aboutme" />
- </td></tr>
+ 	<span class="LC_nobreak">
- </table></td></tr>
+ 	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
- ENDSUPFORM
+ 	$help{'My Personal Information Page'}
+ 	</span>
+ 	</form>
+ SNAMFORM
+ my %suporderhash = (
+                 'ee' => 'New Document',
+                 'ff' => 'Special Documents',
+                 'zz' => 'Hide all Options',
+                 );
+ my %supnamehash = (
+                 'New Document' => $supupdocform.'<br />'.$supnewfolderform,
+                 'Special Documents' => $supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform,
+                 );
+ my $tid='2';
+ my $content='content';
+ my $navigation='navigation';
+ my $varscd = 'Supplemental Course Documents';
+ $r->print(&generate_edit_table($tid,$content,$navigation,$varscd,\%supnamehash,\%suporderhash));
+ my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+        if ($error) {
+            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
-     }
+ $r->print('</div>');
-     $r->print('</table>');
+ 	}
+    }
+ $r->print('</div>');
      if ($allowed) {
  	$r->print('
  <form method="post" name="extimport" action="/adm/coursedocs">
- Line 3140  ENDSUPFORM
+ Line 3299  ENDSUPFORM
   return OK;
  }
+ sub generate_admin_options {
+   my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;
+  my %lt=&Apache::lonlocal::texthash(
+                                          'vc' => 'Verify Content',
+                                          'cv' => 'Check/Set Resource Versions',
+                                          'ls' => 'List Symbs',
+                                          'sl' => 'Show Log'
+                                           );
+   my %help = %{$help_ref};
+   my %env = %{$env_ref};
+   my $dumpbut=&dumpbutton();
+   my $exportbut=&exportbutton();
+   return (<<ENDOPTIONFORM);
+  <form action="/adm/coursedocs" method="post" name="courseverify">
+            <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}<br />
+            <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
+            $dumpbut<br />
+            $exportbut<br />
+           <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+           <input type="hidden" name="folder" value="$env{'form.folder'}" /><br />
+           <input type="submit" name="docslog" value="$lt{'sl'}" />
+  </form>
+ ENDOPTIONFORM
+ }
+ sub generate_edit_table {
+     my ($tid,$content,$navigation,$varcd,$namehash_ref,$orderhash_ref) = @_;
+     my %namehash = %{$namehash_ref};
+     my %orderhash = %{$orderhash_ref};
+     my $form;
+     $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt($varcd).'</h4>';
+     $form .= '<ul id="'.$navigation.$tid.'" class="LC_TabContent">';
+     foreach my $name (sort(keys(%orderhash))){
+         if($name eq 'zz'){
+             $form .= '<span class="LC_Right"><li onclick="javascript:hideAll(this, \''.$navigation.$tid.'\' ,\''.$content.$tid.'\');" class="active">'.&mt($orderhash{$name}).'</li></span>';
+         }else{
+             $form .= '<li onclick="javascript:showPage(this, \''.$tid.$orderhash{$name}.'\', \''.$navigation.$tid.'\',\''.$content.$tid.'\');">'.&mt($orderhash{$name}).'</li>';
+         }
+     }
+     $form .= '</ul>';
+     $form .= '<div id="'.$content.$tid.'" style="padding: 0 0; margin: 0 0;">';
+     foreach my $field (keys(%namehash)){
+         $form .= '<div id="'.$tid.$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 => 'Name of Simple Course Page',
+                                           p_msb => 'Title for the Problem',
+                                           p_mdb => 'Title for the Drop Box',
+                                           p_mbb => 'Title for the Discussion Board',
+                                           p_mab => "Enter user:domain for User's Personal Information Page",
+                                           p_mab2 => 'Personal Information Page of ',
+                                           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 3155  function makenewfolder(targetform,folder
+ Line 3388  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 3179  function edittext(targetname,residx,titl
+ Line 3412  function edittext(targetname,residx,titl
  }
  function makeexamupload() {
-    var title=prompt('Listed Title for the Uploaded Score');
+    var title=prompt('$lt{"p_mxu"}');
     if (title) {
      this.document.forms.newexamupload.importdetail.value=
  	escape(title)+'=/res/lib/templates/examupload.problem';
      this.document.forms.newexamupload.submit();
- Line 3188  function makeexamupload() {
+ Line 3421  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';
      this.document.forms.newsmppg.submit();
- Line 3197  function makesmppage() {
+ Line 3430  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';
      this.document.forms.newsmpproblem.submit();
- Line 3206  function makesmpproblem() {
+ Line 3439  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';
      this.document.forms.newdropbox.submit();
- Line 3215  function makedropbox() {
+ Line 3448  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 3224  function makebulboard() {
+ Line 3457  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();
+        this.document.forms.newaboutsomeone.submit();
- 	   } else {
+    } 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");
-        }
     }
+ } else {
+    alert("$lt{'p_mab_alrt2'}");
+ }
+ }
  }
  function makeims() {
-     var caller = document.forms.ims.folder.value;
+ var caller = document.forms.ims.folder.value;
-     var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+ var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
-     newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+ newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
-     newWindow.location.href = newlocation;
+ newWindow.location.href = newlocation;
  }
  function finishpick() {
-     var title=this.document.forms.extimport.title.value;
+ var title=this.document.forms.extimport.title.value;
-     var url=this.document.forms.extimport.url.value;
+ var url=this.document.forms.extimport.url.value;
-     var form=this.document.forms.extimport.useform.value;
+ var form=this.document.forms.extimport.useform.value;
-     var residx=this.document.forms.extimport.residx.value;
+ var residx=this.document.forms.extimport.residx.value;
-     eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
+ eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
  }
  function changename(folderpath,index,oldtitle,container,pagesymb) {
-     var title=prompt('New Title',oldtitle);
+ var title=prompt('$lt{"p_chn"}',oldtitle);
-     if (title) {
+ if (title) {
- 	this.document.forms.renameform.markcopy.value=-1;
+ this.document.forms.renameform.markcopy.value=-1;
- 	this.document.forms.renameform.title.value=title;
+ this.document.forms.renameform.title.value=title;
- 	this.document.forms.renameform.cmd.value='rename_'+index;
+ this.document.forms.renameform.cmd.value='rename_'+index;
-         if (container == 'sequence') {
+ if (container == 'sequence') {
- 	    this.document.forms.renameform.folderpath.value=folderpath;
+     this.document.forms.renameform.folderpath.value=folderpath;
-         }
+ }
-         if (container == 'page') {
+ if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
+ }
-         this.document.forms.renameform.submit();
+ this.document.forms.renameform.submit();
-     }
+ }
  }
  function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-     if (skip_confirm || confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
+ if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
- 	this.document.forms.renameform.markcopy.value=-1;
+ this.document.forms.renameform.markcopy.value=-1;
- 	this.document.forms.renameform.cmd.value='del_'+index;
+ this.document.forms.renameform.cmd.value='del_'+index;
-         if (container == 'sequence') {
+ if (container == 'sequence') {
-             this.document.forms.renameform.folderpath.value=folderpath;
+     this.document.forms.renameform.folderpath.value=folderpath;
-         }
+ }
-         if (container == 'page') {
+ if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
+ }
-         this.document.forms.renameform.submit();
+ this.document.forms.renameform.submit();
-     }
+ }
  }
  function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-     if (skip_confirm || confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
+ if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
- 	this.document.forms.renameform.cmd.value='cut_'+index;
+ this.document.forms.renameform.cmd.value='cut_'+index;
- 	this.document.forms.renameform.markcopy.value=index;
+ this.document.forms.renameform.markcopy.value=index;
- 	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+ this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-         if (container == 'sequence') {
+ if (container == 'sequence') {
-             this.document.forms.renameform.folderpath.value=folderpath;
+     this.document.forms.renameform.folderpath.value=folderpath;
-         }
+ }
-         if (container == 'page') {
+ if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
+ }
-         this.document.forms.renameform.submit();
+ this.document.forms.renameform.submit();
-     }
+ }
  }
  function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
-     this.document.forms.renameform.markcopy.value=index;
+ this.document.forms.renameform.markcopy.value=index;
-     this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+ this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-     if (container == 'sequence') {
+ if (container == 'sequence') {
- 	this.document.forms.renameform.folderpath.value=folderpath;
+ this.document.forms.renameform.folderpath.value=folderpath;
-     }
+ }
-     if (container == 'page') {
+ if (container == 'page') {
- 	this.document.forms.renameform.pagepath.value=folderpath;
+ this.document.forms.renameform.pagepath.value=folderpath;
- 	this.document.forms.renameform.pagesymb.value=pagesymb;
+ this.document.forms.renameform.pagesymb.value=pagesymb;
-     }
+ }
-     this.document.forms.renameform.submit();
+ this.document.forms.renameform.submit();
+ }
+ function unselectInactive(nav) {
+ currentNav = document.getElementById(nav);
+ currentLis = currentNav.getElementsByTagName('LI');
+ for (i = 0; i < currentLis.length; i++) {
+ 	currentLis[i].className = 'i';
+ }
+ }
+ function hideAll(current, nav, data) {
+ unselectInactive(nav);
+ current.className = 'active';
+ currentData = document.getElementById(data);
+ currentDivs = currentData.getElementsByTagName('DIV');
+ for (i = 0; i < currentDivs.length; i++) {
+ 	if(currentDivs[i].className == 'LC_ContentBox'){
+ 		currentDivs[i].style.display = 'none';
+ 	}
+ }
+ }
+ function showPage(current, pageId, nav, data) {
+ 	hideAll(current, nav, data);
+ 	unselectInactive(nav);
+ 	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.291
changed lines
	Added in v.1.354