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.237 and 1.439

-version 1.237, 2006/06/30 20:33:49
+version 1.439, 2010/10/27 01:00:38
  Line 26
  # http://www.lon-capa.org/
  #
  package Apache::londocs;
  use strict;
- Line 33  use Apache::Constants qw(:common :http);
+ Line 35  use Apache::Constants qw(:common :http);
  use Apache::imsexport;
  use Apache::lonnet;
  use Apache::loncommon;
- use Apache::lonratedt;
+ use Apache::lonhtmlcommon;
- use Apache::lonratsrv;
+ use LONCAPA::map();
+ use Apache::lonratedt();
  use Apache::lonxml;
- use Apache::loncreatecourse;
+ use Apache::lonclonecourse;
  use Apache::lonnavmaps;
  use HTML::Entities;
  use GDBM_File;
  use Apache::lonlocal;
  use Cwd;
- use lib '/home/httpd/lib/perl/';
+ use LONCAPA qw(:DEFAULT :match);
- use LONCAPA;
  my $iconpath;
- Line 54  my %alreadyseen=();
+ Line 56  my %alreadyseen=();
  my $hadchanges;
- # Available help topics
  my %help=();
- # Mapread read maps into lonratedt::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)=@_;
      return
-       &Apache::lonratedt::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
+       &LONCAPA::map::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-                                 $map);
+ 			     $map);
  }
  sub storemap {
      my ($coursenum,$coursedom,$map)=@_;
      my ($outtext,$errtext)=
-       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
+       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-                                 $map,1);
+ 			      $map,1);
      if ($errtext) { return ($errtext,2); }
      $hadchanges=1;
      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'};
  	    } else {
- 		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
+ 		($cd,$ca)=($realm=~/^\/($match_domain)\/($match_username)$/);
  	    }
  	    my $allowed=0;
  	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
- Line 117  sub authorhosts {
+ Line 113  sub authorhosts {
      }
      return ($home,$other,%outhash);
  }
- # ------------------------------------------------------ Generate "dump" button
  sub dumpbutton {
      my ($home,$other,%outhash)=&authorhosts();
-     my $type = &Apache::loncommon::course_type();
+     my $crstype = &Apache::loncommon::course_type();
      if ($home+$other==0) { return ''; }
-     my $output='</td><td bgcolor="#DDDDCC">';
      if ($home) {
- 	return '</td><td bgcolor="#DDDDCC">'.
+         my $link =
- 	    '<input type="submit" name="dumpcourse" value="'.
+             "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"dumpcourse\", \""
- 	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
+            .&mt('Dump '.$crstype.' Documents to Construction Space')
- 	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
+            ."\")'>"
-     } else {
+            .&mt('Dump '.$crstype.' Documents to Construction Space')
- 	return'</td><td bgcolor="#DDDDCC">'.
+            .'</a>';
-      &mt('Dump '.$type.
+         return
- 	 ' DOCS to Construction Space: available on other servers');
+             $link.' '
+            .&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs')
+            .'<br />';
+     } else {
+         return
+             &mt('Dump '.$crstype.' Documents to Construction Space: available on other servers');
      }
  }
  sub clean {
      my ($title)=@_;
      $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
      return $title;
  }
- # -------------------------------------------------------- Actually dump course
  sub dumpcourse {
      my ($r) = @_;
-     my $type = &Apache::loncommon::course_type();
+     my $crstype = &Apache::loncommon::course_type();
-     $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
+     $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Documents to Construction Space').
- 	      '<form name="dumpdoc" method="post">');
+ 	      '<form name="dumpdoc" action="" method="post">');
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Documents to Construction Space'));
      my ($home,$other,%outhash)=&authorhosts();
      unless ($home) { return ''; }
      my $origcrsid=$env{'request.course.id'};
- Line 160  sub dumpcourse {
+ Line 162  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 179  sub dumpcourse {
+ Line 181  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::loncreatecourse::rewritefile(
+ 		    print $fh &Apache::lonclonecourse::rewritefile(
-          &Apache::loncreatecourse::readfile($env{'request.course.id'},$_),
+          &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
  				     (%replacehash,$crs => '')
  								    );
  		} else {
  		    print $fh
-          &Apache::loncreatecourse::readfile($env{'request.course.id'},$_);
+          &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
  		       }
  		$fh->close();
  	    } else {
  		$fail=1;
  	    }
  	    if ($fail) {
- 		$r->print('<font color="red">fail</font>');
+ 		$r->print('<span class="LC_error">'.&mt('fail').'</span>');
  	    } else {
- 		$r->print('<font color="green">ok</font>');
+ 		$r->print('<span class="LC_success">'.&mt('ok').'</span>');
  	    }
  	}
      } else {
- Line 210  sub dumpcourse {
+ Line 212  sub dumpcourse {
  	    $r->print(
  		      '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
  	}
- 	foreach (sort keys %outhash) {
+ 	foreach my $key (sort(keys(%outhash))) {
- 	    if ($_=~/^home_(.+)$/) {
+ 	    if ($key=~/^home_(.+)$/) {
  		if ($home==1) {
  		    $r->print(
  		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
- Line 227  sub dumpcourse {
+ Line 229  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::loncreatecourse::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}};
- 	    $title=~s/&colon;/:/g;
  	    $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 $crstype Documents").'" /></p></form>');
      }
  }
- # ------------------------------------------------------ Generate "export" button
  sub exportbutton {
-     my $type = &Apache::loncommon::course_type();
+     my $crstype = &Apache::loncommon::course_type();
-     return '</td><td bgcolor="#DDDDCC">'.
+     return "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"exportcourse\", \"".&mt('IMS Export')."\")'>".&mt('IMS Export')."</a>".
-             '<input type="submit" name="exportcourse" value="'.
+     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
-             &mt('Export '.$type.' to IMS').'" />'.
-     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
  }
  sub exportcourse {
      my $r=shift;
-     my $type = &Apache::loncommon::course_type();
+     my $crstype = &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 '.$crstype.' to IMS Package').
+                   '<h2>'.&mt('IMS Export Failed').'</h2>'.
+                   '<div class="LC_error">');
+         if ($crstype eq 'Community') {
+             $r->print(&mt('Unable to retrieve information about community contents'));
+         } else {
+             $r->print(&mt('Unable to retrieve information about course contents'));
+         }
+         $r->print('</div><a href="/adm/coursedocs">');
+         if ($crstype eq 'Community') {
+             $r->print(&mt('Return to Community Editor'));
+         } else {
+             $r->print(&mt('Return to Course Editor'));
+         }
+         $r->print('</a>');
+         &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
+         return;
+     }
      my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
      my $curRes;
      my $outcome;
- Line 284  sub exportcourse {
+ Line 313  sub exportcourse {
          my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
          my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
          if (@exportitems == 0 && @discussions == 0) {
-             $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created.  Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export';
+             $outcome =
+                 '<p class="LC_warning">'
+                .&mt('As you did not select any content items or discussions'
+                    .' for export, an IMS package has not been created.')
+                .'</p>'
+                .'<p>'
+                .&mt('Please [_1]go back[_2] to select either content items'
+                    .' or discussions for export.'
+                        ,'<a href="javascript:history.go(-1)">'
+                        ,'</a>')
+                .'</p>';
          } else {
              my $now = time;
              my %symbs;
- Line 307  sub exportcourse {
+ Line 346  sub exportcourse {
                  open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                  close(OUTPUT);
                  chdir $cwd;
-                 $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
+                 $outcome .= '<p>'
+                            .&mt('[_1]Your IMS package[_2] is ready for download.'
+                                ,'<a href="'.$imszipfile.'">','</a>')
+                            .'</p>';
                  if ($copyresult) {
-                     $outcome .= 'The following errors occurred during export - '.$copyresult;
+                     $outcome .= '<p class="LC_error">'
+                                .&mt('The following errors occurred during export - [_1]'
+                                    ,$copyresult)
+                                .'</p>';
                  }
              } 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 = '<p class="LC_error">'
+                           .&mt('Unfortunately you will not be able to retrieve'
+                               .' an IMS archive of your course at this time,'
+                               .' because there was a problem creating a'
+                               .' manifest file.')
+                           .'</p>'
+                           .'<p><a href="javascript:history.go(-1)">'
+                           .&mt('Go Back')
+                           .'</a></p>';
              }
          }
-         $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
+         $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package'));
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
          $r->print($outcome);
          $r->print(&Apache::loncommon::end_page());
      } else {
-         my $display;
+         my $display='<form name="exportdoc" action="" method="post">'."\n".
-         $display = '<form name="exportdoc" method="post">'."\n";
+                     '<p>'.
-         $display .= &mt('Choose which items you wish to export from your '.$type.'.<br /><br />');
+                     &mt('Choose which items you wish to export from your '.$crstype.'.').
-         $display .= '<table border="0" cellspacing="0" cellpadding="3">'.
+                     '</p>'.
-                     '<tr><td><fieldset><legend>&nbsp;<b>Content items</b></legend>'.
+                     '<div class="LC_columnSection"><fieldset>'.
-                     '<input type="button" value="check all" '.
+                     '<legend>'.&mt('Content items').'</legend>'.
+                     '<input type="button" value="'.&mt('check all').'" '.
                      'onclick="javascript:checkAll(document.exportdoc.archive)" />'.
-                     '&nbsp;&nbsp;<input type="button" value="uncheck all"'.
+                     '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                     ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset></td>'.
+                     ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>';
-                     '<td>&nbsp;</td><td>&nbsp;</td>'.
+         if ($numdisc > 0) {
-                     '<td align="right"><fieldset><legend>&nbsp;<b>Discussion posts'.
+             $display .= '<fieldset>'.
-                     '</b></legend><input type="button" value="check all"'.
+                         '<legend>'.&mt('Discussion posts').'</legend>'.
-                     ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
+                         '<input type="button" value="'.&mt('check all').'"'.
-                     '&nbsp;&nbsp;<input type="button" value="uncheck all"'.
+                         ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
-                     ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" /></fieldset></td>'.
+                         '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                     '</tr></table>';
+                         ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'.
+                         '</fieldset>';
+         }
+         $display .= '</div>';
          my $curRes;
          my $depth = 0;
          my $count = 0;
- Line 343  sub exportcourse {
+ Line 401  sub exportcourse {
          my %parent = ();
          my %children = ();
          my $lastcontainer = $startcount;
-         my @bgcolors = ('#F6F6F6','#FFFFFF');
+         $display .= &Apache::loncommon::start_data_table()
-         $display .= '<table cellspacing="0"><tr>'.
+                    .&Apache::loncommon::start_data_table_header_row()
-             '<td><b>Export content item?<br /></b></td><td>&nbsp;</td><td align="right">'."\n";
+                    .'<th>'.&mt('Export content item?').'</th>';
          if ($numdisc > 0) {
-             $display.='<b>Export&nbsp;discussion posts?</b>'."\n";
+             $display .= '<th>'.&mt('Export discussion posts?').'</th>';
          }
-         $display.='&nbsp;</td></tr>';
+         $display .= &Apache::loncommon::end_data_table_header_row();
          while ($curRes = $it->next()) {
              if (ref($curRes)) {
                  $count ++;
- Line 365  sub exportcourse {
+ Line 423  sub exportcourse {
              if (ref($curRes)) {
                  my $symb = $curRes->symb();
                  my $ressymb = $symb;
-                 if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                 if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
                      unless ($ressymb =~ m|adm/wrapper/adm|) {
                          $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                      }
                  }
-                 my $color = $count%2;
+                 my $currelem = $count+$boards+$startcount;
-                 $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n".
+                 $display .= &Apache::loncommon::start_data_table_row()
-                     '<input type="checkbox" name="archive" value="'.$count.'" ';
+                            .'<td>'."\n"
+                            .'<input type="checkbox" name="archive" value="'.$count.'" ';
                  if (($curRes->is_sequence()) || ($curRes->is_page())) {
-                     my $checkitem = $count + $boards + $startcount;
+                     $lastcontainer = $currelem;
-                     $display .= 'onClick="javascript:propagateCheck('."'$checkitem'".')"';
+                     $display .= 'onclick="javascript:propagateCheck('."'$currelem'".')"';
                  }
                  $display .= ' />'."\n";
                  for (my $i=0; $i<$depth; $i++) {
-                     $display .= '<img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" /><img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" />'."\n";
+                     $display .= ('<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />' x2)."\n";
                  }
                  if ($curRes->is_sequence()) {
-                     $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";
+                     $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
-                     $lastcontainer = $count + $startcount + $boards;
                  } elsif ($curRes->is_page()) {
-                     $display .= '<img src="/adm/lonIcons/navmap.page.open.gif">&nbsp;'."\n";
+                     $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
-                     $lastcontainer = $count + $startcount + $boards;
                  }
-                 my $currelem = $count+$boards+$startcount;
                  $children{$parent{$depth}} .= $currelem.':';
-                 $display .= '&nbsp;'.$curRes->title().'</td>';
+                 $display .= '&nbsp;'.$curRes->title().'</td>'."\n";
+                 # Existing discussion posts?
                  if ($discussiontime{$ressymb} > 0) {
                      $boards ++;
-                     $currelem = $count+$boards+$startcount;
+                     $display .= '<td align="right">'
-                     $display .= '<td>&nbsp;</td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" />&nbsp;</td>'."\n";
+                                .'<input type="checkbox" name="discussion" value="'.$count.'" />'
-                 } else {
+                                .'</td>'."\n";
-                     $display .= '<td colspan="2">&nbsp;</td>'."\n";
+                 } elsif ($numdisc > 0) {
+                     $display .= '<td>&nbsp;</td>'."\n";
                  }
+                 $display .= &Apache::loncommon::end_data_table_row();
              }
          }
+         $display .= &Apache::loncommon::end_data_table();
          my $scripttag = qq|
- <script>
+ <script type="text/javascript">
+ // <![CDATA[
  function checkAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
- Line 412  function checkAll(field) {
+ Line 473  function checkAll(field) {
          field.checked = true
      }
  }
  function uncheckAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
- Line 427  function propagateCheck(item) {
+ Line 488  function propagateCheck(item) {
      if (document.exportdoc.elements[item].checked == true) {
          containerCheck(item)
      }
  }
  function containerCheck(item) {
      document.exportdoc.elements[item].checked = true
- Line 438  function containerCheck(item) {
+ Line 499  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 450  function containerCheck(item) {
+ Line 511  function containerCheck(item) {
          for (var j=0; j<parents[item].length; j++) {
              containerCheck(parents[item][j])
          }
       }
  }
+ // ]]>
  </script>
          |;
- 	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
+ 	$r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',
  						 $scripttag));
- 	$r->print($display.'</table>'.
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
-                   '<p><input type="hidden" name="finishexport" value="1">'.
+ 	$r->print($display.
+                   '<p><input type="hidden" name="finishexport" value="1" />'.
                    '<input type="submit" name="exportcourse" value="'.
-                   &mt('Export '.$type.' DOCS').'" /></p></form>'.
+                   &mt('Export').'" /></p></form>');
- 		  &Apache::loncommon::end_page());
      }
  }
- Line 546  sub build_package {
+ Line 607  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 570  sub build_package {
+ Line 631  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 604  sub build_package {
+ Line 665  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/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                             if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
                                  unless ($ressymb =~ m|adm/wrapper/adm|) {
                                      $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                                  }
- Line 649  sub build_package {
+ Line 710  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 696  sub process_content {
+ Line 757  sub process_content {
          }
      } elsif ($symb =~ m-lib/templates/examupload\.problem$-) {
          $content_type = 'examupload';
-     } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) {
+     } elsif ($symb =~ m-adm/($match_domain)/($match_username)/(\d+)/bulletinboard$-) {
          $content_type = 'bulletinboard';
          my $contents =  &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2);
          if ($contents) {
- Line 744  sub replicate_content {
+ Line 805  sub replicate_content {
      if ($caller eq 'templateupload') {
          $url = $symb;
          $url =~ s#//#/#g;
      } else {
          ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
      }
      my $content;
- Line 784  sub replicate_content {
+ Line 845  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 816  sub extract_media {
+ Line 877  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 837  sub extract_media {
+ Line 898  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';
              }
          } elsif ($caller eq 'uploaded') {
              $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);
          }
          if ($repstatus eq 'ok') {
- Line 856  sub extract_media {
+ Line 917  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 900  sub store_template {
+ Line 961  sub store_template {
      }
  }
- # Imports the given (name, url) resources into the course
- # coursenum, coursedom, and folder must precede the list
  sub group_import {
-     my $coursenum = shift;
+     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
-     my $coursedom = shift;
-     my $folder = shift;
+     while (@files) {
-     my $container = shift;
+ 	my ($name, $url, $residx) = @{ shift(@files) };
-     my $caller = shift;
+         if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
-     while (@_) {
+ 	     && ($caller eq 'londocs')
- 	my $name = shift;
+ 	     && (!&Apache::lonnet::stat_file($url))) {
- 	my $url = shift;
-         if (($url =~ m#^/uploaded/$coursedom/$coursenum/(default_\d+\.)(page|sequence)$#) && ($caller eq 'londocs')) {
              my $errtext = '';
              my $fatal = 0;
              my $newmapstr = '<map>'."\n".
- Line 923  sub group_import {
+ Line 982  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 931  sub group_import {
+ Line 990  sub group_import {
              }
          }
  	if ($url) {
- 	    my $idx = &Apache::lonratedt::getresidx($url);
+ 	    if (!$residx
- 	    $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
+ 		|| defined($LONCAPA::map::zombies[$residx])) {
+ 		$residx = &LONCAPA::map::getresidx($url,$residx);
+ 		push(@LONCAPA::map::order, $residx);
+ 	    }
  	    my $ext = 'false';
- 	    if ($url=~/^http:\/\//) { $ext = 'true'; }
+ 	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
- 	    $url =~ s/:/\&colon;/g;
+ 	    $url  = &LONCAPA::map::qtunescape($url);
- 	    $name =~ s/:/\&colon;/g;
+ 	    $name = &LONCAPA::map::qtunescape($name);
- 	    $Apache::lonratedt::resources[$idx] =
+ 	    $LONCAPA::map::resources[$residx] =
- 		join ':', ($name, $url, $ext, 'normal', 'res');
+ 		join(':', ($name, $url, $ext, 'normal', 'res'));
  	}
      }
      return &storemap($coursenum, $coursedom, $folder.'.'.$container);
  }
  sub breadcrumbs {
-     my ($where)=@_;
+     my ($allowed,$crstype)=@_;
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      my (@folders);
      if ($env{'form.pagepath'}) {
- Line 955  sub breadcrumbs {
+ Line 1017  sub breadcrumbs {
      }
      my $folderpath;
      my $cpinfo='';
-     if ($env{'form.markedcopy_url'}) {
+     my $plain='';
-        $cpinfo='&markedcopy_url='.
+     my $randompick=-1;
-                &escape($env{'form.markedcopy_url'}).
+     my $isencrypted=0;
-                '&markedcopy_title='.
+     my $ishidden=0;
-                &escape($env{'form.markedcopy_title'});
+     my $is_random_order=0;
+     if (!$allowed) {
+         my $description = $env{'course.'.$env{'request.course.id'}.'.description'};
+         &Apache::lonhtmlcommon::add_breadcrumb(
+                                                {'href' => '/adm/menu',
+                                                 'title'=> 'Go to main menu',
+                                                 'text' => $description,
+                                                });
+         $plain .= $description.' &gt;';
      }
      while (@folders) {
  	my $folder=shift(@folders);
- 	my $foldername=shift(@folders);
+     	my $foldername=shift(@folders);
  	if ($folderpath) {$folderpath.='&';}
  	$folderpath.=$folder.'&'.$foldername;
  	my $url='/adm/coursedocs?folderpath='.
  	    &escape($folderpath);
+ 	    my $name=&unescape($foldername);
+ # randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
+  	    $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
+ 	    if ($1 ne '') {
+                $randompick=$1;
+             } else {
+                $randompick=-1;
+             }
+             if ($2) { $ishidden=1; }
+             if ($3) { $isencrypted=1; }
+ 	    if ($4 ne '') { $is_random_order = 1; }
+             if ($folder eq 'supplemental') {
+                 $name = &mt('Supplemental '.$crstype.' Documents');
+             }
  	    &Apache::lonhtmlcommon::add_breadcrumb(
  		      {'href'=>$url.$cpinfo,
- 		       'title'=>&unescape($foldername),
+ 		       'title'=>$name,
- 		       'text'=>'<font size="+1">'.
+ 		       'text'=>$name,
- 			   &unescape($foldername).'</font>'
+ 		       'no_mt'=>1,
  		       });
+ 	$plain.=$name.' &gt; ';
+     }
+     $plain=~s/\&gt\;\s*$//;
+     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
+ 					       undef, undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+ }
+ sub log_docs {
+     return &Apache::lonnet::instructor_log('docslog',@_);
+ }
+ {
+     my @oldresources=();
+     my @oldorder=();
+     my $parmidx;
+     my %parmaction=();
+     my %parmvalue=();
+     my $changedflag;
+     sub snapshotbefore {
+         @oldresources=@LONCAPA::map::resources;
+         @oldorder=@LONCAPA::map::order;
+         $parmidx=undef;
+         %parmaction=();
+         %parmvalue=();
+         $changedflag=0;
+     }
+     sub remember_parms {
+         my ($idx,$parameter,$action,$value)=@_;
+         $parmidx=$idx;
+         $parmaction{$parameter}=$action;
+         $parmvalue{$parameter}=$value;
+         $changedflag=1;
+     }
+     sub log_differences {
+         my ($plain)=@_;
+         my %storehash=('folder' => $plain,
+                        'currentfolder' => $env{'form.folder'});
+         if ($parmidx) {
+            $storehash{'parameter_res'}=$oldresources[$parmidx];
+            foreach my $parm (keys(%parmaction)) {
+               $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
+               $storehash{'parameter_value_'.$parm}=$parmvalue{$parm};
+            }
+         }
+         my $maxidx=$#oldresources;
+         if ($#LONCAPA::map::resources>$#oldresources) {
+            $maxidx=$#LONCAPA::map::resources;
+         }
+         for (my $idx=0; $idx<=$maxidx; $idx++) {
+            if ($LONCAPA::map::resources[$idx] ne $oldresources[$idx]) {
+               $storehash{'before_resources_'.$idx}=$oldresources[$idx];
+               $storehash{'after_resources_'.$idx}=$LONCAPA::map::resources[$idx];
+               $changedflag=1;
+            }
+            if ($LONCAPA::map::order[$idx] ne $oldorder[$idx]) {
+               $storehash{'before_order_res_'.$idx}=$oldresources[$oldorder[$idx]];
+               $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
+               $changedflag=1;
+            }
+         }
+ 	$storehash{'maxidx'}=$maxidx;
+         if ($changedflag) { &log_docs(\%storehash); }
      }
-     return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
- 					       'LC_docs_path');
  }
- sub editor {
-     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
-     my $errtext='';
-     my $fatal=0;
-     my $container='sequence';
+ sub docs_change_log {
-     if ($env{'form.pagepath'}) {
+     my ($r)=@_;
-         $container='page';
+     my $folder=$env{'form.folder'};
+     $r->print(&Apache::loncommon::start_page('Course Document Change Log'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
+     my %docslog=&Apache::lonnet::dump('nohist_docslog',
+                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
+                                       $env{'course.'.$env{'request.course.id'}.'.num'});
+     if ((keys(%docslog))[0]=~/^error\:/) { undef(%docslog); }
+     $r->print('<form action="/adm/coursedocs" method="post" name="docslog">'.
+               '<input type="hidden" name="docslog" value="1" />');
+     my %saveable_parameters = ('show' => 'scalar',);
+     &Apache::loncommon::store_course_settings('docs_log',
+                                               \%saveable_parameters);
+     &Apache::loncommon::restore_course_settings('docs_log',
+                                                 \%saveable_parameters);
+     if (!$env{'form.show'}) { $env{'form.show'}=10; }
+     my %lt=('hiddenresource' => 'Resources hidden',
+ 	    'encrypturl'     => 'URL hidden',
+ 	    'randompick'     => 'Randomly pick',
+ 	    'randomorder'    => 'Randomly ordered',
+ 	    'set'            => 'set to',
+ 	    'del'            => 'deleted');
+     $r->print(&Apache::loncommon::display_filter().
+               '<input type="hidden" name="folder" value="'.$folder.'" />'.
+               '<input type="submit" value="'.&mt('Display').'" /></form>');
+     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
+               '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Folder').'</th><th>'.&mt('Before').'</th><th>'.
+               &mt('After').'</th>'.
+               &Apache::loncommon::end_data_table_header_row());
+     my $shown=0;
+     foreach my $id (sort { $docslog{$b}{'exe_time'}<=>$docslog{$a}{'exe_time'} } (keys(%docslog))) {
+ 	if ($env{'form.displayfilter'} eq 'currentfolder') {
+ 	    if ($docslog{$id}{'logentry'}{'currentfolder'} ne $folder) { next; }
+ 	}
+         my @changes=keys(%{$docslog{$id}{'logentry'}});
+         if ($env{'form.displayfilter'} eq 'containing') {
+ 	    my $wholeentry=$docslog{$id}{'exe_uname'}.':'.$docslog{$id}{'exe_udom'}.':'.
+ 		&Apache::loncommon::plainname($docslog{$id}{'exe_uname'},$docslog{$id}{'exe_udom'});
+ 	    foreach my $key (@changes) {
+ 		$wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
+ 	    }
+ 	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
+ 	}
+         my $count = 0;
+         my $time =
+             &Apache::lonlocal::locallocaltime($docslog{$id}{'exe_time'});
+         my $plainname =
+             &Apache::loncommon::plainname($docslog{$id}{'exe_uname'},
+                                           $docslog{$id}{'exe_udom'});
+         my $about_me_link =
+             &Apache::loncommon::aboutmewrapper($plainname,
+                                                $docslog{$id}{'exe_uname'},
+                                                $docslog{$id}{'exe_udom'});
+         my $send_msg_link='';
+         if ((($docslog{$id}{'exe_uname'} ne $env{'user.name'})
+              || ($docslog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
+             $send_msg_link ='<br />'.
+                 &Apache::loncommon::messagewrapper(&mt('Send message'),
+                                                    $docslog{$id}{'exe_uname'},
+                                                    $docslog{$id}{'exe_udom'});
+         }
+         $r->print(&Apache::loncommon::start_data_table_row());
+         $r->print('<td>'.$time.'</td>
+                        <td>'.$about_me_link.
+                   '<br /><tt>'.$docslog{$id}{'exe_uname'}.
+                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
+                   $send_msg_link.'</td><td>'.
+                   $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
+ # Before
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+ 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
+ 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
+ 	    if ($oldname ne $newname) {
+ 		$r->print(&LONCAPA::map::qtescape($oldname));
+ 	    }
+ 	}
+ 	$r->print('<ul>');
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+             if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
+ 		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+ 	    }
+ 	}
+ 	$r->print('</ul>');
+ # After
+         $r->print('</td><td>');
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+ 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
+ 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
+ 	    if ($oldname ne '' && $oldname ne $newname) {
+ 		$r->print(&LONCAPA::map::qtescape($newname));
+ 	    }
+ 	}
+ 	$r->print('<ul>');
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+             if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
+ 		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+ 	    }
+ 	}
+ 	$r->print('</ul>');
+ 	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
+ 	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
+ 	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
+ 		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
+ 		    $r->print('<li>'.
+ 			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
+ 				  $docslog{$id}{'logentry'}{'parameter_value_'.$parameter})
+ 			      .'</li>');
+ 		}
+ 	    }
+ 	    $r->print('</ul>');
+ 	}
+ # End
+         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
+         $shown++;
+         if (!($env{'form.show'} eq &mt('all')
+               || $shown<=$env{'form.show'})) { last; }
      }
-     ($errtext,$fatal)=
+     $r->print(&Apache::loncommon::end_data_table());
-               &mapread($coursenum,$coursedom,$folder.'.'.$container);
+ }
-     if ($#Apache::lonratedt::order<1) {
- 	my $idx=&Apache::lonratedt::getresidx();
+ sub update_paste_buffer {
+     my ($coursenum,$coursedom) = @_;
+     return if (!defined($env{'form.markcopy'}));
+     return if (!defined($env{'form.copyfolder'}));
+     return if ($env{'form.markcopy'} < 0);
+     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+ 				    $env{'form.copyfolder'});
+     return if ($fatal);
+ # Mark for copying
+     my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
+     if (&is_supplemental_title($title)) {
+         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
+ 	($title) = &parse_supplemental_title($title);
+     } elsif ($env{'docs.markedcopy_supplemental'}) {
+         &Apache::lonnet::delenv('docs.markedcopy_supplemental');
+     }
+     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
+     &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
+ 			    'docs.markedcopy_url'   => $url});
+     delete($env{'form.markcopy'});
+ }
+ sub print_paste_buffer {
+     my ($r,$container) = @_;
+     return if (!defined($env{'docs.markedcopy_url'}));
+     $r->print('<fieldset>'
+              .'<legend>'.&mt('Clipboard').'</legend>'
+              .'<form name="pasteform" action="/adm/coursedocs" method="post">'
+              .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '
+     );
+     my $type;
+     if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+ 	$type = &mt('External Resource');
+ 	$r->print($type.': '.
+ 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
+ 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
+     }  else {
+ 	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
+ 	my $icon = &Apache::loncommon::icon($extension);
+ 	if ($extension eq 'sequence' &&
+ 	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
+ 	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+ 	    $icon .= '/navmap.folder.closed.gif';
+ 	}
+ 	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
+ 	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
+     }
+     if ($container eq 'page') {
+ 	$r->print('
+ 	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
+ 	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
+ ');
+     } else {
+ 	$r->print('
+         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
+ ');
+     }
+     $r->print('</form></fieldset>');
+ }
+ sub do_paste_from_buffer {
+     my ($coursenum,$coursedom,$folder) = @_;
+     if (!$env{'form.pastemarked'}) {
+         return;
+     }
+ # paste resource to end of list
+     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
+     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
+ # Maps need to be copied first
+     if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
+ 	$title=&mt('Copy of').' '.$title;
+ 	my $newid=$$.int(rand(100)).time;
+ 	my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
+         if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
+             my $path = $1;
+             my $prefix = $2;
+             my $ancestor = $3;
+             if (length($ancestor) > 10) {
+                 $ancestor = substr($ancestor,-10,10);
+             }
+             $oldid = $path.$prefix.$ancestor;
+         }
+         my $counter = 0;
+         my $newurl=$oldid.$newid.'.'.$ext;
+         my $is_unique = &uniqueness_check($newurl);
+         while (!$is_unique && $counter < 100) {
+             $counter ++;
+             $newid ++;
+             $newurl = $oldid.$newid;
+             $is_unique = &uniqueness_check($newurl);
+         }
+         if (!$is_unique) {
+             if ($url=~/\.page$/) {
+                 return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
+             } else {
+                 return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+             }
+         }
+ 	my $storefn=$newurl;
+ 	$storefn=~s{^/\w+/$match_domain/$match_username/}{};
+ 	my $paste_map_result =
+             &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+ 					       &Apache::lonnet::getfile($url));
+         if ($paste_map_result eq '/adm/notfound.html') {
+             if ($url=~/\.page$/) {
+                 return &mt('Paste failed: an error occurred saving the composite page');
+             } else {
+                 return &mt('Paste failed: an error occurred saving the folder');
+             }
+         }
+ 	$url = $newurl;
+     }
+ # published maps can only exists once, so remove it from paste buffer when done
+     if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
+ 	&Apache::lonnet::delenv('docs.markedcopy');
+     }
+     if ($url=~ m{/smppg$}) {
+ 	my $db_name = &Apache::lonsimplepage::get_db_name($url);
+ 	if ($db_name =~ /^smppage_/) {
+ 	    #simple pages, need to copy the db contents to a new one.
+ 	    my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
+ 	    my $now = time();
+ 	    $db_name =~ s{_\d*$ }{_$now}x;
+ 	    my $result=&Apache::lonnet::put($db_name,\%contents,
+ 					    $coursedom,$coursenum);
+ 	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
+ 	    $title=&mt('Copy of').' '.$title;
+ 	}
+     }
+     $title = &LONCAPA::map::qtunescape($title);
+     my $ext='false';
+     if ($url=~m{^http(|s)://}) { $ext='true'; }
+     $url       = &LONCAPA::map::qtunescape($url);
+ # Now insert the URL at the bottom
+     my $newidx = &LONCAPA::map::getresidx($url);
+     if ($env{'docs.markedcopy_supplemental'}) {
+         if ($folder =~ /^supplemental/) {
+             $title = $env{'docs.markedcopy_supplemental'};
+         } else {
+             (undef,undef,$title) =
+                 &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+         }
+     } else {
+         if ($folder=~/^supplemental/) {
+            $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                   $env{'user.domain'}.'___&&&___'.$title;
+         }
+     }
+     $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
+     push(@LONCAPA::map::order, $newidx);
+     return 'ok';
+ # Store the result
+ }
+ sub uniqueness_check {
+     my ($newurl) = @_;
+     my $unique = 1;
+     foreach my $res (@LONCAPA::map::order) {
+         my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+         $url=&LONCAPA::map::qtescape($url);
+         if ($newurl eq $url) {
+             $unique = 0;
+             last;
+         }
+     }
+     return $unique;
+ }
+ my %parameter_type = ( 'randompick'     => 'int_pos',
+ 		       'hiddenresource' => 'string_yesno',
+ 		       'encrypturl'     => 'string_yesno',
+ 		       'randomorder'    => 'string_yesno',);
+ my $valid_parameters_re = join('|',keys(%parameter_type));
+ # set parameters
+ sub update_parameter {
+     return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
+     my $which = $env{'form.changeparms'};
+     my $idx = $env{'form.setparms'};
+     if ($env{'form.'.$which.'_'.$idx}) {
+ 	my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx}
+ 	                                     : 'yes';
+ 	&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
+ 				      $parameter_type{$which});
+ 	&remember_parms($idx,$which,'set',$value);
+     } else {
+ 	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
+ 	&remember_parms($idx,$which,'del');
+     }
+     return 1;
+ }
+ sub handle_edit_cmd {
+     my ($coursenum,$coursedom) =@_;
+     my ($cmd,$idx)=split('_',$env{'form.cmd'});
+     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
+     my ($title, $url, @rrest) = split(':', $ratstr);
+     if ($cmd eq 'del') {
+ 	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+ 	    ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+ 	    &Apache::lonnet::removeuploadedurl($url);
+ 	} else {
+ 	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+ 	}
+ 	splice(@LONCAPA::map::order, $idx, 1);
+     } elsif ($cmd eq 'cut') {
+ 	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+ 	splice(@LONCAPA::map::order, $idx, 1);
+     } elsif ($cmd eq 'up'
+ 	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
+ 	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
+     } elsif ($cmd eq 'down'
+ 	     && defined($LONCAPA::map::order[$idx+1])) {
+ 	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
+     } elsif ($cmd eq 'rename') {
+ 	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
+ 	if ($comment=~/\S/) {
+ 	    $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
+ 		$comment.':'.join(':', $url, @rrest);
+ 	}
+ # Devalidate title cache
+ 	my $renamed_url=&LONCAPA::map::qtescape($url);
+ 	&Apache::lonnet::devalidate_title_cache($renamed_url);
+     } else {
+ 	return 0;
+     }
+     return 1;
+ }
+ sub editor {
+     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype)=@_;
+     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; }
-        	$Apache::lonratedt::order[0]=$idx;
+        	$LONCAPA::map::order[0]=$idx;
-         $Apache::lonratedt::resources[$idx]='';
+         $LONCAPA::map::resources[$idx]='';
      }
-     if (defined($env{'form.markcopy'})) {
- # Mark for copying
+     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
- 	my ($title,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$env{'form.markcopy'}]]);
+     if ($allowed) {
- 	$env{'form.markedcopy_title'}=$title;
+         ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
- 	$env{'form.markedcopy_url'}=$url;
+ 	    &breadcrumbs($allowed,$crstype);
-     }
+         $r->print($breadcrumbtrail);
-     $r->print(&breadcrumbs($folder));
-     if ($fatal) {
- 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
      } else {
+         $randompick = -1;
+     }
  # ------------------------------------------------------------ Process commands
  # ---------------- if they are for this folder and user allowed to make changes
- 	if (($allowed) && ($env{'form.folder'} eq $folder)) {
+     if (($allowed) && ($env{'form.folder'} eq $folder)) {
  # set parameters and change order
- 	    if (defined($env{'form.setparms'})) {
+ 	&snapshotbefore();
- 		my $idx=$env{'form.setparms'};
- # set parameters
+ 	if (&update_parameter()) {
- 		if ($env{'form.randpick_'.$idx}) {
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
+ 	    return $errtext if ($fatal);
- 		} else {
+ 	}
- 		    &Apache::lonratedt::delparameter($idx,'parameter_randompick');
- 		}
- 		if ($env{'form.hidprs_'.$idx}) {
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
- 		} else {
- 		    &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
- 		}
- 		if ($env{'form.encprs_'.$idx}) {
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
- 		} else {
- 		    &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
- 		}
- 		if ($env{'form.newpos'}) {
+ 	if ($env{'form.newpos'} && $env{'form.currentpos'}) {
  # change order
+ 	    my $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1);
+ 	    splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res);
- 		    my $newpos=$env{'form.newpos'}-1;
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		    my $currentpos=$env{'form.currentpos'}-1;
+ 	    return $errtext if ($fatal);
- 		    my $i;
+ 	}
- 		    my @neworder=();
- 		    if ($newpos>$currentpos) {
- # moving stuff up
- 			for ($i=0;$i<$currentpos;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 			for ($i=$currentpos;$i<$newpos;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i+1];
- 			}
-                         $neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
- 			for ($i=$newpos+1;$i<=$#Apache::lonratedt::order;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 		    } else {
- # moving stuff down
- 			for ($i=0;$i<$newpos;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 			$neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
- 			for ($i=$newpos+1;$i<$currentpos+1;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i-1];
- 			}
- 			for ($i=$currentpos+1;$i<=$#Apache::lonratedt::order;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 		    }
- 		    @Apache::lonratedt::order=@neworder;
- 		}
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	if ($env{'form.pastemarked'}) {
- 		if ($fatal) {
+             my $paste_res =
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+                 &do_paste_from_buffer($coursenum,$coursedom,$folder);
- 		    return;
+             if ($paste_res eq 'ok') {
+                 ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
+                 return $errtext if ($fatal);
+             } elsif ($paste_res ne '') {
+                 $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
+             }
+ 	}
+ 	$r->print($upload_output);
+ 	if (&handle_edit_cmd()) {
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	    return $errtext if ($fatal);
+ 	}
+ # Group import/search
+ 	if ($env{'form.importdetail'}) {
+ 	    my @imports;
+ 	    foreach my $item (split(/\&/,$env{'form.importdetail'})) {
+ 		if (defined($item)) {
+ 		    my ($name,$url,$residx)=
+ 			map {&unescape($_)} split(/\=/,$item);
+ 		    push(@imports, [$name, $url, $residx]);
  		}
  	    }
- 	    if ($env{'form.pastemarked'}) {
+ 	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
- # paste resource to end of list
+ 					    $container,'londocs',@imports);
-                 my $url=$env{'form.markedcopy_url'};
+ 	    return $errtext if ($fatal);
- 		my $title=$env{'form.markedcopy_title'};
+ 	}
- # Maps need to be copied first
+ # Loading a complete map
- 		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
+ 	if ($env{'form.loadmap'}) {
- 		    $title=&mt('Copy of').' '.$title;
+ 	    if ($env{'form.importmap'}=~/\w/) {
-                     my $newid=$$.time;
+ 		foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
- 		    $url=~/^(.+)\.(\w+)$/;
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$res);
- 		    my $newurl=$1.$newid.'.'.$2;
+ 		    my $idx=&LONCAPA::map::getresidx($url);
- 		    my $storefn=$newurl;
+ 		    $LONCAPA::map::resources[$idx]=$res;
-                     $storefn=~s/^\/\w+\/\w+\/\w+\///;
+ 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
- 		    &Apache::loncreatecourse::writefile
- 			($env{'request.course.id'},$storefn,
- 			 &Apache::lonnet::getfile($url));
- 		    $url=$newurl;
- 		}
- 		$title=~s/\</\&lt\;/g;
- 		$title=~s/\>/\&gt\;/g;
- 		$title=~s/\:/\&colon;/g;
- 		my $ext='false';
- 		if ($url=~/^http\:\/\//) { $ext='true'; }
- 		$url=~s/\:/\&colon;/g;
- # Now insert the URL at the bottom
-                 my $newidx=&Apache::lonratedt::getresidx($url);
- 		$Apache::lonratedt::resources[$newidx]=
- 		    $title.':'.$url.':'.$ext.':normal:res';
- 		$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
- # Store the result
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
  		}
- 	    }
-             $r->print($upload_output);
- 	    if ($env{'form.cmd'}) {
-                 my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
-                 if ($cmd eq 'del') {
- 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
- 		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
- 			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
- 			&Apache::lonnet::removeuploadedurl($url);
- 		    } else {
- 			&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
- 		    }
- 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
-                         $Apache::lonratedt::order[$i]=
-                           $Apache::lonratedt::order[$i+1];
-                     }
-                     $#Apache::lonratedt::order--;
-                 } elsif ($cmd eq 'cut') {
- 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
- 		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
- 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
-                         $Apache::lonratedt::order[$i]=
-                           $Apache::lonratedt::order[$i+1];
-                     }
-                     $#Apache::lonratedt::order--;
-                 } elsif ($cmd eq 'up') {
- 		  if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) {
-                     my $i=$Apache::lonratedt::order[$idx-1];
-                     $Apache::lonratedt::order[$idx-1]=
- 			$Apache::lonratedt::order[$idx];
-                     $Apache::lonratedt::order[$idx]=$i;
- 		   }
-                 } elsif ($cmd eq 'down') {
- 		   if (defined($Apache::lonratedt::order[$idx+1])) {
-                     my $i=$Apache::lonratedt::order[$idx+1];
-                     $Apache::lonratedt::order[$idx+1]=
- 			$Apache::lonratedt::order[$idx];
-                     $Apache::lonratedt::order[$idx]=$i;
- 		   }
-                 } elsif ($cmd eq 'rename') {
-                     my $ratstr = $Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]];
-                     my ($rtitle,@rrest)=split(/\:/,
-                        $Apache::lonratedt::resources[
- 				       $Apache::lonratedt::order[$idx]]);
-                     my $comment=
-                      &HTML::Entities::decode($env{'form.title'});
-                     $comment=~s/\</\&lt\;/g;
-                     $comment=~s/\>/\&gt\;/g;
-                     $comment=~s/\:/\&colon;/g;
- 		    if ($comment=~/\S/) {
- 			$Apache::lonratedt::resources[
- 				       $Apache::lonratedt::order[$idx]]=
- 				            $comment.':'.join(':',@rrest);
- 		    }
-                 }
- # Store the changed version
  		($errtext,$fatal)=&storemap($coursenum,$coursedom,
  					    $folder.'.'.$container);
- 		if ($fatal) {
+ 		return $errtext if ($fatal);
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ 	    } else {
- 		    return;
+ 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
- 		}
-             }
- # Group import/search
- 	    if ($env{'form.importdetail'}) {
- 		my @imports;
- 		&Apache::lonnet::logthis("imp detail ".$env{'form.importdetail'});
- 		foreach (split(/\&/,$env{'form.importdetail'})) {
- 		    if (defined($_)) {
- 			my ($name,$url)=split(/\=/,$_);
- 			$name=&unescape($name);
- 			$url=&unescape($url);
- 			push @imports, $name, $url;
- 		    }
- 		}
- # Store the changed version
- 		($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
- 					       $container,'londocs',@imports);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
- 		}
-             }
- # Loading a complete map
- 	   if ($env{'form.loadmap'}) {
-                if ($env{'form.importmap'}=~/\w/) {
- 	          foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
- 		      my ($title,$url,$ext,$type)=split(/\:/,$_);
-                       my $idx=&Apache::lonratedt::getresidx($url);
-                       $Apache::lonratedt::resources[$idx]=$_;
-                       $Apache::lonratedt::order
- 		          [$#Apache::lonratedt::order+1]=$idx;
- 	          }
- # Store the changed version
-   	          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
- 					   $folder.'.'.$container);
- 	          if ($fatal) {
- 		      $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		      return;
- 	          }
-                } else {
-                    $r->print('<p><font color="red">'.&mt('No map selected.').'</font></p>');
-                }
-            }
-        }
- # ---------------------------------------------------------------- End commands
- # ---------------------------------------------------------------- Print screen
-         my $idx=0;
- 	my $shown=0;
-         $r->print('<table>');
-         foreach (@Apache::lonratedt::order) {
-            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
- 	   $name=&Apache::lonratsrv::qtescape($name);
- 	   $url=&Apache::lonratsrv::qtescape($url);
-            unless ($name) {  $name=(split(/\//,$url))[-1]; }
-            unless ($name) { $idx++; next; }
-            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
-            $idx++;
- 	   $shown++;
-         }
- 	unless ($shown) {
- 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
- 	}
-         $r->print("\n</table>\n");
- 	if ($env{'form.markedcopy_url'}) {
- 	    $r->print(<<ENDPASTE);
- <p><form name="pasteform" action="/adm/coursedocs" method="post">
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
- ENDPASTE
-             $r->print(
- 	   '<input type="submit" name="pastemarked" value="'.&mt('Paste').
- 		      '" /> '.&Apache::loncommon::filedescription(
- 		(split(/\./,$env{'form.markedcopy_url'}))[-1]).': '.
- 		      $env{'form.markedcopy_title'});
-             if ($container eq 'page') {
- 		$r->print(<<PAGEINFO);
- <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
- <input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
- PAGEINFO
-             } else {
- 		$r->print(<<FOLDERINFO);
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- FOLDERINFO
  	    }
- 	    $r->print('</form></p>');
  	}
+ 	&log_differences($plain);
      }
+ # ---------------------------------------------------------------- End commands
+ # ---------------------------------------------------------------- Print screen
+     my $idx=0;
+     my $shown=0;
+     if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
+ 	$r->print('<div class="LC_Box">'.
+           '<ol class="LC_docs_parameters"><li class="LC_docs_parameters_title">'.&mt('Parameters:').'</li>'.
+ 		  ($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').
+ 		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
+ 		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
+ 		  ($is_random_order?'<li>'.&mt('random order').'</li>':'').
+ 		  '</ol>');
+         if ($randompick>=0) {
+             $r->print('<p class="LC_warning">'
+                  .&mt('Caution: this folder is set to randomly pick a subset'
+                      .' of resources. Adding or removing resources from this'
+                      .' folder will change the set of resources that the'
+                      .' students see, resulting in spurious or missing credit'
+                      .' for completed problems, not limited to ones you'
+                      .' modify. Do not modify the contents of this folder if'
+                      .' it is in active student use.')
+                  .'</p>'
+             );
+         }
+         if ($is_random_order) {
+             $r->print('<p class="LC_warning">'
+                  .&mt('Caution: this folder is set to randomly order its'
+                      .' contents. Adding or removing resources from this folder'
+                      .' will change the order of resources shown.')
+                  .'</p>'
+             );
+         }
+         $r->print('</div>');
+     }
+     my $output;
+     &Apache::loncommon::start_data_table_count(); #setup a row counter
+     foreach my $res (@LONCAPA::map::order) {
+         my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+         $name=&LONCAPA::map::qtescape($name);
+         $url=&LONCAPA::map::qtescape($url);
+         unless ($name) {  $name=(split(/\//,$url))[-1]; }
+         unless ($name) { $idx++; next; }
+         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
+                               $coursenum,$crstype);
+         $idx++;
+         $shown++;
+     }
+     &Apache::loncommon::end_data_table_count();
+     if ($shown) {
+         $r->print(&Apache::loncommon::start_data_table());
+         if ($allowed) {
+             $r->print(&Apache::loncommon::start_data_table_header_row()
+                      .'<th colspan="2">'.&mt('Move').'</th>'
+                      .'<th>'.&mt('Actions').'</th>'
+                      .'<th colspan="2">'.&mt('Document').'</th>');
+             if ($folder !~ /^supplemental/) {
+                 $->print('<th colspan="4">'.&mt('Settings').'</th>');
+             }
+             $r->print(&Apache::loncommon::end_data_table_header_row());
+         }
+         $r->print($output
+                  .&Apache::loncommon::end_data_table()
+         );
+     } else {
+         $r->print('<p class="LC_info">'
+                  .&mt('Currently no documents.')
+                  .'</p>'
+         );
+     }
+     if ($allowed) {
+         &print_paste_buffer($r,$container);
+     }
+     return;
  }
  sub process_file_upload {
- Line 1280  sub process_file_upload {
+ Line 1700  sub process_file_upload {
          }
          ($errtext,$fatal)=
                &mapread($coursenum,$coursedom,$folder.'.'.$container);
-         if ($#Apache::lonratedt::order<1) {
+         if ($#LONCAPA::map::order<1) {
-             $Apache::lonratedt::order[0]=1;
+             $LONCAPA::map::order[0]=1;
-             $Apache::lonratedt::resources[1]='';
+             $LONCAPA::map::resources[1]='';
          }
          if ($fatal) {
              return 'failed';
- Line 1298  sub process_file_upload {
+ Line 1718  sub process_file_upload {
          }
  # this is for a course, not a user, so set coursedoc flag
  # probably the only place in the system where this should be "1"
-         my $newidx=&Apache::lonratedt::getresidx();
+         my $newidx=&LONCAPA::map::getresidx();
          $destination .= $newidx;
-         my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination,
+         my $url=&Apache::lonnet::userfileupload('uploaddoc','coursedoc',$destination,
  						$parseaction,$allfiles,
  						$codebase);
          my $ext='false';
-         if ($url=~/^http\:\/\//) { $ext='true'; }
+         if ($url=~m{^http://}) { $ext='true'; }
-         $url=~s/\:/\&colon;/g;
+ 	$url     = &LONCAPA::map::qtunescape($url);
          my $comment=$env{'form.comment'};
-         $comment=~s/\</\&lt\;/g;
+ 	$comment = &LONCAPA::map::qtunescape($comment);
-         $comment=~s/\>/\&gt\;/g;
-         $comment=~s/\:/\&colon;/g;
          if ($folder=~/^supplemental/) {
                $comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
                    $env{'user.domain'}.'___&&&___'.$comment;
          }
-         $Apache::lonratedt::resources[$newidx]=
+         $LONCAPA::map::resources[$newidx]=
-                   $comment.':'.$url.':'.$ext.':normal:res';
+ 	    $comment.':'.$url.':'.$ext.':normal:res';
-         $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= $newidx;
+         $LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx;
          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
  				    $folder.'.'.$container);
          if ($fatal) {
-             $$upload_output .= '<p><font color="red">'.$errtext.'</font></p>';
+             $$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';
              return 'failed';
          } else {
              if ($parseaction eq 'parse') {
-                 my $total_embedded = keys(%{$allfiles});
+                 my $total_embedded = scalar(keys(%{$allfiles}));
                  if ($total_embedded > 0) {
                      my $num = 0;
-                     $$upload_output .= 'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />
+ 		    my $state = '
-    <form name="upload_embedded" action="/adm/coursedocs"
+    <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
-                   method="post" enctype="multipart/form-data">
+    <input type="hidden" name="cmd" value="upload_embedded" />
-    <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" />   <input type="hidden" name="cmd" value="upload_embedded" />
     <input type="hidden" name="newidx" value="'.$newidx.'" />
     <input type="hidden" name="primaryurl" value="'.&escape($url).'" />
     <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
-                     $$upload_output .= '<b>Upload embedded files</b>:<br />
+ 		    $phase_status = 'phasetwo';
-    <table>';
-                     foreach my $embed_file (keys(%{$allfiles})) {
+                     $$upload_output .=
-                         $$upload_output .= '<tr><td>'.$embed_file.
+ 			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
-           '<input name="embedded_item_'.$num.'" type="file" />
+ 			&Apache::loncommon::ask_for_embedded_content(
-            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+                             '/adm/coursedocs',$state,$allfiles,$codebase);
-                         my $attrib;
-                         if (@{$$allfiles{$embed_file}} > 1) {
-                             $attrib = join(':',@{$$allfiles{$embed_file}});
-                         } else {
-                             $attrib = $$allfiles{$embed_file}[0];
-                         }
-                         $$upload_output .=
-            '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />';
-                         if (exists($$codebase{$embed_file})) {
-                             $$upload_output .=
-           '<input name="codebase_'.$num.'" type="hidden" value="'.&escape($$codebase{$embed_file}).'" />';
-                         }
-                         $$upload_output .= '</td></tr>';
-                         $num ++;
-                     }
-                     $phase_status = 'phasetwo';
-                     $$upload_output .= '</table><br />
-    <input type ="submit" value="Complete upload" />
-    </form>';
                  } else {
                      $$upload_output .= 'No embedded items identified<br />';
                  }
- Line 1383  sub process_secondary_uploads {
+ Line 1781  sub process_secondary_uploads {
      }
      $destination .= $newidx;
      my ($url,$filename);
-     $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination);
+     $url=&Apache::lonnet::userfileupload($formname.$num,'coursedoc',$destination);
-     ($filename) = ($url =~ m-^/uploaded/$coursedom/$coursenum/$destination/(.+)$-);
+     ($filename) = ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/\Q$destination\E/(.+)$});
      return $filename;
  }
+ sub is_supplemental_title {
+     my ($title) = @_;
+     return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
+ }
+ sub parse_supplemental_title {
+     my ($title) = @_;
+     my ($foldertitle,$renametitle);
+     if ($title =~ /&amp;&amp;&amp;/) {
+ 	$title = &HTML::Entites::decode($title);
+     }
+  if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
+ 	$renametitle=$4;
+ 	my ($time,$uname,$udom) = ($1,$2,$3);
+ 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ 	my $name =  &Apache::loncommon::plainname($uname,$udom);
+ 	$name = &HTML::Entities::encode($name,'"<>&\'');
+         $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
+ 	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
+ 	    $name.': <br />'.$foldertitle;
+     }
+     if (wantarray) {
+ 	return ($title,$foldertitle,$renametitle);
+     }
+     return $title;
+ }
  # --------------------------------------------------------------- An entry line
  sub entryline {
-     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
+     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
-     $title=~s/\&colon\;/\:/g;
+     my ($foldertitle,$pagetitle,$renametitle);
-     $title=&HTML::Entities::encode(&HTML::Entities::decode(
+     if (&is_supplemental_title($title)) {
-      &unescape($title)),'"<>&\'');
+ 	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
-     my $renametitle=$title;
+ 	$pagetitle = $foldertitle;
-     my $foldertitle=$title;
+     } else {
-     my $pagetitle=$title;
+ 	$title=&HTML::Entities::encode($title,'"<>&\'');
-     my $orderidx=$Apache::lonratedt::order[$index];
+ 	$renametitle=$title;
-     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/	) {
+ 	$foldertitle=$title;
- 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ 	$pagetitle=$title;
- 	$renametitle=$4;
- 	$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
- 	    &Apache::loncommon::plainname($2,$3).': <br />'.
- 	    $foldertitle;
      }
+     my $orderidx=$LONCAPA::map::order[$index];
      $renametitle=~s/\\/\\\\/g;
      $renametitle=~s/\&quot\;/\\\"/g;
-     my $line='<tr>';
+     $renametitle=~s/ /%20/g;
+     my $line=&Apache::loncommon::start_data_table_row();
+     my ($form_start,$form_end);
  # Edit commands
-     my $container;
+     my ($container, $type, $esc_path, $path, $symb);
-     my $folderpath;
      if ($env{'form.folderpath'}) {
+ 	$type = 'folder';
          $container = 'sequence';
- 	$folderpath=&escape($env{'form.folderpath'});
+ 	$esc_path=&escape($env{'form.folderpath'});
+ 	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
  	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
      }
-     my ($pagepath,$pagesymb);
      if ($env{'form.pagepath'}) {
-         $container = 'page';
+         $type = $container = 'page';
-         $pagepath=&escape($env{'form.pagepath'});
+         $esc_path=&escape($path = $env{'form.pagepath'});
-         $pagesymb=&escape($env{'form.pagesymb'});
+ 	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
+         $symb=&escape($env{'form.pagesymb'});
      }
      my $cpinfo='';
-     if ($env{'form.markedcopy_url'}) {
-        $cpinfo='&markedcopy_url='.
-                &escape($env{'form.markedcopy_url'}).
-                '&markedcopy_title='.
-                &escape($env{'form.markedcopy_title'});
-     }
      if ($allowed) {
  	my $incindex=$index+1;
  	my $selectbox='';
  	if (($folder!~/^supplemental/) &&
- 	    ($#Apache::lonratedt::order>0) &&
+ 	    ($#LONCAPA::map::order>0) &&
  	    ((split(/\:/,
- 	     $Apache::lonratedt::resources[$Apache::lonratedt::order[0]]))[1]
+ 	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
  	     ne '') &&
  	    ((split(/\:/,
- 	     $Apache::lonratedt::resources[$Apache::lonratedt::order[1]]))[1]
+ 	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]
  	     ne '')) {
  	    $selectbox=
  		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
- 		'<select name="newpos" onChange="this.form.submit()">';
+ 		'<select name="newpos" onchange="this.form.submit()">';
- 	    for (my $i=1;$i<=$#Apache::lonratedt::order+1;$i++) {
+ 	    for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
  		if ($i==$incindex) {
- 		    $selectbox.='<option value="" selected="1">('.$i.')</option>';
+ 		    $selectbox.='<option value="" selected="selected">('.$i.')</option>';
  		} else {
  		    $selectbox.='<option value="'.$i.'">'.$i.'</option>';
  		}
- Line 1461  sub entryline {
+ Line 1884  sub entryline {
  		'rn' => 'Rename',
  		'cp' => 'Copy');
  	my $nocopy=0;
+         my $nocut=0;
          if ($url=~/\.(page|sequence)$/) {
- 	    foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
+ 	    if ($url =~ m{/res/}) {
- 		my ($title,$url,$ext,$type)=split(/\:/,$_);
+ 		# no copy for published maps
- 		if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
+ 		$nocopy = 1;
- 		    $nocopy=1;
+ 	    } else {
- 		    last;
+ 		foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$item);
+ 		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
+ 			$nocopy=1;
+ 			last;
+ 		    }
  		}
  	    }
  	}
+         if ($url=~/^\/res\/lib\/templates\//) {
+            $nocopy=1;
+            $nocut=1;
+         }
          my $copylink='&nbsp;';
-         if ($env{'form.pagepath'}) {
+         my $cutlink='&nbsp;';
-            unless ($nocopy) {
-                $copylink=(<<ENDCOPY);
+ 	my $skip_confirm = 0;
- <a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
+ 	if ( $folder =~ /^supplemental/
- <font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+ 	     || ($url =~ m{( /smppg$
+ 			    |/syllabus$
+ 			    |/aboutme$
+ 			    |/navmaps$
+ 			    |/bulletinboard$
+ 			    |\.html$
+ 			    |^/adm/wrapper/ext)}x)) {
+ 	    $skip_confirm = 1;
+ 	}
+ 	if (!$nocopy) {
+ 	    $copylink=(<<ENDCOPY);
+ <a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a>
  ENDCOPY
-             }
+         }
-             $line.=(<<END);
+ 	if (!$nocut) {
- <form name="entry_$index" action="/adm/coursedocs" method="post">
+ 	    $cutlink=(<<ENDCUT);
- <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
+ <a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
- <input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
+ ENDCUT
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+         }
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+ 	$form_start = (<<END);
- <input type="hidden" name="setparms" value="$orderidx" />
+    <form  action="/adm/coursedocs" method="post">
- <td><table border='0' cellspacing='2' cellpadding='0'>
+    <input type="hidden" name="${type}path" value="$path" />
- <tr><td bgcolor="#DDDDDD">
+    <input type="hidden" name="${type}symb" value="$symb" />
- <a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
+    <input type="hidden" name="setparms" value="$orderidx" />
- <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
+    <input type="hidden" name="changeparms" value="0" />
- <tr><td bgcolor="#DDDDDD">
- <a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
- <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
- </table></td>
- <td>$selectbox
- </td><td bgcolor="#DDDDDD">
- <a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
- <font size="-2" color="#990000">$lt{'rm'}</font></a>
- <a href='javascript:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'>
- <font size="-2" color="#550044">$lt{'ct'}</font></a>
- <a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
- <font size="-2" color="#009900">$lt{'rn'}</font></a>
- $copylink
  END
-         } else {
+         $form_end = '</form>';
-            unless ($nocopy) {
+ 	$line.=(<<END);
-                $copylink=(<<ENDCOPY);
+ <td>
- <a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
+ <div class="LC_docs_entry_move">
- <font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+   <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
- ENDCOPY
+     <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
-             }
+   </a>
-             $line.=(<<END);
+ </div>
- <form name="entry_$index" action="/adm/coursedocs" method="post">
+ <div class="LC_docs_entry_move">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+   <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+     <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+   </a>
- <input type="hidden" name="setparms" value="$orderidx" />
+ </div>
- <td><table border='0' cellspacing='2' cellpadding='0'>
+ </td>
- <tr><td bgcolor="#DDDDDD">
+ <td>
- <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'>
+    $form_start
- <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
+    $selectbox
- <tr><td bgcolor="#DDDDDD">
+    $form_end
- <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'>
+ </td>
- <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
+ <td class="LC_docs_entry_commands">
- </table></td>
+    <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
- <td>$selectbox
+ $cutlink
- </td><td bgcolor="#DDDDDD">
+    <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
- <a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
- <font size="-2" color="#990000">$lt{'rm'}</font></a>
- <a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'>
- <font size="-2" color="#550044">$lt{'ct'}</font></a>
- <a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
- <font size="-2" color="#009900">$lt{'rn'}</font></a>
  $copylink
+ </td>
  END
-         }
      }
  # Figure out what kind of a resource this is
      my ($extension)=($url=~/\.(\w+)$/);
- Line 1547  END
+ Line 1974  END
      my $pagefile;
      if ($uploaded) {
  	if ($extension eq 'sequence') {
- 	    $icon=$iconpath.'/folder_closed.gif';
+ 	    $icon=$iconpath.'/navmap.folder.closed.gif';
- 	    $url=~/$coursenum\/([\/\w]+)\.sequence$/;
+ 	    $url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/;
  	    $url='/adm/coursedocs?';
  	    $folderarg=$1;
  	    $isfolder=1;
          } elsif ($extension eq 'page') {
              $icon=$iconpath.'/page.gif';
-             $url=~/$coursenum\/([\/\w]+)\.page$/;
+             $url=~/\Q$coursenum\E\/([\/\w]+)\.page$/;
              $pagearg=$1;
              $url='/adm/coursedocs?';
              $ispage=1;
- Line 1562  END
+ Line 1989  END
  	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
  	}
      }
-     $url=~s-^http(\&colon\;|:)//-/adm/wrapper/ext/-;
+     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(
            &Apache::lonnet::declutter('uploaded/'.
- Line 1583  END
+ Line 2013  END
  	    } elsif ($url!~/\.(sequence|page)$/) {
  		$url='/adm/coursedocs/showdoc'.$url;
  	    }
  	} elsif ($url=~m|^/ext/|) {
  	    $url='/adm/wrapper'.$url;
+ 	    $external = 1;
  	}
- 	$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+         if (&Apache::lonnet::symbverify($symb,$url)) {
+ 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+         } else {
+             $url='';
+         }
  	if ($container eq 'page') {
  	    my $symb=$env{'form.pagesymb'};
  	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
  	    $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.='&' };
- 	$folderpath.=$folderarg.'&'.$foldername;
+ # 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)
+                                                .':'.((&LONCAPA::map::getparameter($orderidx,
+                                               'parameter_randomorder'))[0]=~/^yes$/i);
  	$url.='folderpath='.&escape($folderpath).$cpinfo;
  	$parameterset='<label>'.&mt('Randomly Pick: ').
- 	    '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'.
+ 	    '<input type="text" size="4" onchange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
- 	    (&Apache::lonratedt::getparameter($orderidx,
+ 	    (&LONCAPA::map::getparameter($orderidx,
                                                'parameter_randompick'))[0].
                                                '" />'.
- '<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></label>';
+ '<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
+     	my $ro_set=
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+ 	$rand_order_text ='
+ <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 1625  END
+ Line 2072  END
  					       $path.$pagearg.'.page');
  	}
  	$url.='pagepath='.&escape($pagepath).
- 	    '&pagesymb='.&escape($symb).$cpinfo;
+ 	    '&amp;pagesymb='.&escape($symb).$cpinfo;
+     }
+     if (($external) && ($allowed)) {
+ 	my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
+ 	$external = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>';
+     } else {
+ 	undef($external);
      }
-     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
+     my $reinit;
- 	'" border="0"></a></td>'.
+     if ($crstype eq 'Community') {
-         "<td bgcolor='#FFFFBB'><a href=\"$url\">$title</a></td>";
+         $reinit = &mt('(re-initialize community to access)');
+     } else {
+         $reinit = &mt('(re-initialize course to access)');
+     }
+     $line.='
+   <td>
+     '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
+   </td>
+   <td>
+     '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.$reinit.'</span>').$external."
+   </td>";
      if (($allowed) && ($folder!~/^supplemental/)) {
   	my %lt=&Apache::lonlocal::texthash(
   			      'hd' => 'Hidden',
   			      'ec' => 'URL hidden');
  	my $enctext=
- 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
  	my $hidtext=
- 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
  	$line.=(<<ENDPARMS);
- <td bgcolor="#BBBBFF"><font size='-2'>
+   <td class="LC_docs_entry_parameter">
- <nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
+     $form_start
- <td bgcolor="#BBBBFF"><font size='-2'>
+     <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
- <nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
+     $form_end
- <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+   </td>
+   <td class="LC_docs_entry_parameter">
+     $form_start
+     <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+     $form_end
+   </td>
+   <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
+   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
  ENDPARMS
      }
-     $line.="</form></tr>";
+     $line.=&Apache::loncommon::end_data_table_row();
      return $line;
  }
- # ---------------------------------------------------------------- tie the hash
+ =pod
+ =item tiehash()
+ tie the hash
+ =cut
  sub tiehash {
      my ($mode)=@_;
- Line 1667  sub tiehash {
+ Line 2143  sub tiehash {
                  $hashtied=1;
  	    }
  	}
      }
  }
  sub untiehash {
- Line 1676  sub untiehash {
+ Line 2152  sub untiehash {
      return OK;
  }
- # --------------------------------------------------------------- check on this
  sub checkonthis {
      my ($r,$url,$level,$title)=@_;
- Line 1685  sub checkonthis {
+ Line 2162  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 1694  sub checkonthis {
+ Line 2174  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 1704  sub checkonthis {
+ Line 2184  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 1712  sub checkonthis {
+ Line 2192  sub checkonthis {
                   if (($errorcount) ||
                       ($warningcount)) {
  		     if ($errorcount) {
-                         $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
+                         $r->print('<img src="/adm/lonMisc/bomb.gif" alt="'.&mt('bomb').'" /><span class="LC_error">'.
- 			  $errorcount.' '.
+                           &mt('[quant,_1,error]',$errorcount).'</span>');
- 				  &mt('error(s)').'</b></font> ');
                       }
  		     if ($warningcount) {
-                         $r->print('<font color="blue">'.
+                         $r->print('<span class="LC_warning">'.
- 			  $warningcount.' '.
+                           &mt('[quant,_1,warning]',$warningcount).'</span>');
- 				  &mt('warning(s)').'</font>');
                       }
                   } else {
-                      $r->print('<font color="green">'.&mt('ok').'</font>');
+                      $r->print('<span class="LC_success">'.&mt('ok').'</span>');
                   }
                   $r->rflush();
               }
  	     my $dependencies=
                  &Apache::lonnet::metadata($url,'dependencies');
-              foreach (split(/\,/,$dependencies)) {
+              foreach my $dep (split(/\,/,$dependencies)) {
- 		 if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {
+ 		 if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) {
-                     &checkonthis($r,$_,$level+1);
+                     &checkonthis($r,$dep,$level+1);
                   }
               }
            } elsif ($result eq 'unavailable') {
-              $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
+              $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
            } elsif ($result eq 'not_found') {
  	      unless ($url=~/\$/) {
- 		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+ 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
  	      } else {
- 		  $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
+ 		  $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
  	      }
            } else {
-              $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
+              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
            }
-       }
+        }
-    }
+     }
  }
- #
- # ----------------------------------------------------------------- List Symbs
+ =pod
- #
+ =item list_symbs()
+ List Symbs
+ =cut
  sub list_symbs {
      my ($r) = @_;
+     my $crstype = &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($crstype).':'.$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('<hr /><a href="/adm/coursedocs">'.&mt('Back to Course Editor').'</a>');
-     $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
  }
- #
- # -------------------------------------------------------------- Verify Content
- #
  sub verifycontent {
      my ($r) = @_;
-     my $type = &Apache::loncommon::course_type();
+     my $crstype = &Apache::loncommon::course_type();
-    my $loaderror=&Apache::lonnet::overloaderror($r);
+    $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
-    if ($loaderror) { return $loaderror; }
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
-    $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
     $hashtied=0;
     undef %alreadyseen;
     %alreadyseen=();
     &tiehash();
-    foreach (keys %hash) {
+    foreach my $key (keys(%hash)) {
-        if ($hash{$_}=~/\.(page|sequence)$/) {
+        if ($hash{$key}=~/\.(page|sequence)$/) {
- 	   if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {
+ 	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
- 	       $r->print('<hr /><font color="red">'.
+ 	       $r->print('<hr /><span class="LC_error">'.
- 			 &mt('The following sequence or page is included more than once in your '.$type.': ').
+ 			 &mt('The following sequence or page is included more than once in your '.$crstype.':').' '.
- 			 &unescape($hash{$_}).'</font><br />'.
+ 			 &unescape($hash{$key}).'</span><br />'.
- 			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
+ 			 &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();
-    $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
+    $r->print(
- 	     &mt('Return to DOCS').'</a>');
+        '<p class="LC_success">'.&mt('Done').'</p>'
+       .'<hr />'
+       .'<p><a href="/adm/coursedocs">'
+ 	  .&mt('Back to Course Editor')
+       .'</a></p>'
+    );
  }
- # -------------------------------------------------------------- Check Versions
  sub devalidateversioncache {
      my $src=shift;
      &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
- Line 1808  sub devalidateversioncache {
+ Line 2301  sub devalidateversioncache {
  sub checkversions {
      my ($r) = @_;
-     my $type = &Apache::loncommon::course_type();
+     my $crstype = &Apache::loncommon::course_type();
-     $r->print(&Apache::loncommon::start_page("Check $type Document Versions"));
+     $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
      my $header='';
      my $startsel='';
      my $monthsel='';
- Line 1828  sub checkversions {
+ Line 2322  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 1847  sub checkversions {
+ Line 2341  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 1860  sub checkversions {
+ Line 2354  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 Stored').'</h1>');
+ 	    $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
  	} else {
- 	    $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
+ 	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
  	}
  	&mark_hash_old();
      }
      &changewarning($r,'');
      if ($env{'form.timerange'} eq 'all') {
  # show all documents
- 	$header=&mt('All Documents in '.$type);
+ 	$header=&mt('All Documents in '.$crstype);
  	$allsel=1;
- 	foreach (keys %hash) {
+ 	foreach my $key (keys(%hash)) {
- 	    if ($_=~/^ids\_(\/res\/.+)$/) {
+ 	    if ($key=~/^ids\_(\/res\/.+)$/) {
  		my $src=$1;
  		$changes{$src}=1;
  	    }
- Line 1883  sub checkversions {
+ Line 2377  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 1915  sub checkversions {
+ Line 2409  sub checkversions {
  			  $env{'course.'.$env{'request.course.id'}.'.domain'},
  			  $env{'course.'.$env{'request.course.id'}.'.num'});
      my %lt=&Apache::lonlocal::texthash
- 	      ('st' => 'Version changes since start of '.$type,
+ 	      ('st' => 'Version changes since start of '.$crstype,
  	       'lm' => 'Version changes since last Month',
  	       'lw' => 'Version changes since last Week',
  	       'sy' => 'Version changes since Yesterday',
- Line 1924  sub checkversions {
+ Line 2418  sub checkversions {
  	       'fi' => 'File',
  	       'md' => 'Modification Date',
                 'mr' => 'Most recently published Version',
- 	       've' => 'Version used in '.$type,
+ 	       've' => 'Version used in '.$crstype,
-                'vu' => 'Set Version to be used in '.$type,
+                'vu' => 'Set Version to be used in '.$crstype,
- 'sv' => 'Set Versions to be used in '.$type.' according to Selections below',
+ 'sv' => 'Set Versions to be used in '.$crstype.' according to Selections below',
  'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
  'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
  	       'di' => 'Differences');
- Line 1947  sub checkversions {
+ Line 2441  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 1970  ENDHEADERS
+ Line 2464  ENDHEADERS
                                                       'lastrevisiondate')
                                                          ).
                        '</td>'.
-                       '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
+                       '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
                        '<font size="+1">'.$currentversion.'</font>'.
-                       '</nobr></td>'.
+                       '</span></td>'.
-                       '<td title="'.$lt{'ve'}.'"><nobr>In '.$type.': '.
+                       '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$crstype.': '.
                        '<font size="+1">');
  # Used in course
  	    my $usedversion=$hash{'version_'.$linkurl};
- Line 1982  ENDHEADERS
+ Line 2476  ENDHEADERS
  	    } else {
  		$r->print($currentversion);
  	    }
- 	    $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
+ 	    $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'.
-                       '<nobr>Use: ');
+                       '<span class="LC_nobreak">Use: ');
  # Set version
  	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
  						      'set_version_'.$linkurl,
- 						      ('select_form_order' =>
+ 						      {'select_form_order' =>
  						       ['',1..$currentversion,'mostrecent'],
  						       '' => '',
- 						       'mostrecent' => 'most recent',
+ 						       'mostrecent' => &mt('most recent'),
- 						       map {$_,$_} (1..$currentversion))));
+ 						       map {$_,$_} (1..$currentversion)}));
- 	    $r->print('</nobr></td></tr><tr><td></td>');
+ 	    $r->print('</span></td></tr><tr><td></td>');
  	    my $lastold=1;
  	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
  		my $url=$root.'.'.$prevvers.'.'.$extension;
- Line 2001  ENDHEADERS
+ Line 2495  ENDHEADERS
  		    $lastold=$prevvers;
  		}
  	    }
              #
              # Code to figure out how many version entries should go in
              # each of the four columns
              my $entries_per_col = 0;
- Line 2012  ENDHEADERS
+ Line 2506  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;
- 		$r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
+ 		$r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url).
  			  '">'.&mt('Version').' '.$prevvers.'</a> ('.
  			  &Apache::lonlocal::locallocaltime(
                                  &Apache::lonnet::metadata($url,
- Line 2029  ENDHEADERS
+ Line 2523  ENDHEADERS
  			      '&versionone='.$prevvers.
  			      '">'.&mt('Diffs').'</a>');
  		}
- 		$r->print('</nobr><br />');
+ 		$r->print('</span><br />');
                  if (++$entries_count % $entries_per_col == 0) {
                      $r->print('</font></td>');
                      if ($cols_output != 4) {
- Line 2045  ENDHEADERS
+ Line 2539  ENDHEADERS
  	}
      }
      $r->print('</table></form>');
-     $r->print('<h1>'.&mt('Done').'.</h1>');
+     $r->print('<p class="LC_success">'.&mt('Done').'</p>');
      &untiehash();
  }
- Line 2091  sub changewarning {
+ Line 2585  sub changewarning {
  	$message='Changes will become active for your current session after [_1], or the next time you log in.';
      }
      $r->print("\n\n".
- '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
+ '<script type="text/javascript">'."\n".
+ '// <![CDATA['."\n".
+ 'function reinit(tf) { tf.submit();'.$postexec.' }'."\n".
+ '// ]]>'."\n".
+ '</script>'."\n".
  '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
  '<input type="hidden" name="orgurl" value="'.$url.
- '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+ '" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'.
  &mt($message,' <input type="hidden" name="'.
      $env{'request.role'}.'" value="1" /><input type="button" value="'.
-     &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
+     &mt('re-initializing '.$course_type).'" onclick="reinit(this.form)" />').
- $help{'Caching'}.'</font></h3></form>'."\n\n");
+ $help{'Caching'}.'</p></form>'."\n\n");
+ }
+ sub init_breadcrumbs {
+     my ($form,$text)=@_;
+     &Apache::lonhtmlcommon::clear_breadcrumbs();
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
+ 					    text=>&Apache::loncommon::course_type().' Editor',
+ 					    faq=>273,
+ 					    bug=>'Instructor Interface',
+                                             help => 'Docs_Adding_Course_Doc'});
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1',
+ 					    text=>$text,
+ 					    faq=>273,
+ 					    bug=>'Instructor Interface'});
  }
- # ================================================================ Main Handler
  sub handler {
      my $r = shift;
      &Apache::loncommon::content_type($r,'text/html');
      $r->send_http_header;
      return OK if $r->header_only;
-     my $type = &Apache::loncommon::course_type();
+     my $crstype = &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 2127  sub handler {
+ Line 2643  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 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
      my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
    if ($allowed && $env{'form.verify'}) {
+       &init_breadcrumbs('verify','Verify Content');
        &verifycontent($r);
    } elsif ($allowed && $env{'form.listsymbs'}) {
+       &init_breadcrumbs('listsymbs','List Symbs');
        &list_symbs($r);
+   } elsif ($allowed && $env{'form.docslog'}) {
+       &init_breadcrumbs('docslog','Show Log');
+       &docs_change_log($r);
    } elsif ($allowed && $env{'form.versions'}) {
+       &init_breadcrumbs('versions','Check/Set Resource Versions');
        &checkversions($r);
    } elsif ($allowed && $env{'form.dumpcourse'}) {
+       &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Documents to Construction Space');
        &dumpcourse($r);
    } elsif ($allowed && $env{'form.exportcourse'}) {
+       &init_breadcrumbs('exportcourse','IMS Export');
        &exportcourse($r);
    } else {
  # is this a standard course?
- Line 2154  sub handler {
+ Line 2678  sub handler {
      my $showdoc=0;
      my $containertag;
      my $uploadtag;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  					    ['folderpath','pagepath',
- 					     'pagesymb','markedcopy_url',
+ 					     'pagesymb']);
- 					     'markedcopy_title']);
+ # No folderpath, no pagepath, see if we have something stored
+     if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
+         &Apache::loncommon::restore_course_settings('docs_folderpath',
+                                               {'folderpath' => 'scalar'});
+     }
+     if (!$allowed) {
+         unless($env{'form.folderpath'} =~ /^supplemental/) {
+             $env{'form.folderpath'} = '';
+         }
+     }
+     if (!$env{'form.folderpath'} && $allowed) {
+         &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 '.$crstype.' 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 2168  sub handler {
+ Line 2718  sub handler {
          $env{'form.pagename'}=&unescape(pop(@pagepath));
          $env{'form.folder'}=pop(@pagepath);
          $containertag = '<input type="hidden" name="pagepath" value="" />'.
- 	    '<input type="hidden" name="pagesymb" value="" />';
+ 	                '<input type="hidden" name="pagesymb" value="" />';
-         $uploadtag = '<input type="hidden" name="pagepath" value="'.$env{'form.pagepath'}.'" />'.
+         $uploadtag =
- 	    '<input type="hidden" name="pagesymb" value="'.$env{'form.pagesymb'}.'" />';
+             '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
+ 	    '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
+             '<input type="hidden" name="folderpath" value="" />';
+     } else {
+         my $folderpath=$env{'form.folderpath'};
+         if (!$folderpath) {
+             if ($env{'form.folder'} eq '' ||
+                 $env{'form.folder'} eq 'supplemental') {
+                 $folderpath='default&'.
+                     &escape(&mt('Main '.$crstype.' Documents'));
+             }
+         }
+         $containertag = '<input type="hidden" name="folderpath" value="" />';
+         $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
      }
      if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
         $showdoc='/'.$1;
      }
-     unless ($showdoc) { # got called from remote
+     if ($showdoc) { # got called in sequence from course
-        if (($env{'form.folder'}=~/^(?:group|default)_/) ||
+ 	$allowed=0;
+     } else {
+        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;
      }
+ # subroutine to list form elements
+ sub create_list_elements {
+    my @formarr = @_;
+    my $list = '';
+    for my $button (@formarr){
+ 	for my $picture(keys %$button) {
+ 		#my $link = Apache::lonhtmlcommon::htmltag('a' ,$button->{$picture}, {href => "test"});
+ 		$list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});
+ 	}
+    }
+    return $list;
+ }
+ # subroutine to create ul from list elements
+ sub create_form_ul {
+    my $list = shift;
+    my $ul = Apache::lonhtmlcommon::htmltag('ul',$list, {class => 'LC_ListStyleNormal'});
+    return $ul;
+ }
  # get course data
      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(
+     my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
-                      &Apache::loncommon::plainname($uname,$udom));
  # graphics settings
- Line 2208  sub handler {
+ Line 2790  sub handler {
  	$script .= &editing_js($udom,$uname);
      }
  # -------------------------------------------------------------------- Body tag
-     $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';
+     $script = '<script type="text/javascript">'."\n"
-     $r->print(&Apache::loncommon::start_page("$type Documents", $script,
+               .'// <![CDATA['."\n"
- 					     {'force_register' => $showdoc,}).
+               .$script."\n"
- 	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
+               .'// ]]>'."\n"
+               .'</script>'."\n";
+     # Breadcrumbs
+     &Apache::lonhtmlcommon::clear_breadcrumbs();
+     if ($allowed) {
+         &Apache::lonhtmlcommon::add_breadcrumb({
+             href=>"/adm/coursedocs",text=>"$crstype Editor"});
+         $r->print(&Apache::loncommon::start_page("$crstype Editor", $script,
+                                                  {'force_register' => $showdoc,})
+                  .&Apache::loncommon::help_open_menu('','',273,'RAT')
+                  .&Apache::lonhtmlcommon::breadcrumbs(
+                      'Editing the Table of Contents for your '.$crstype,
+                      'Docs_Adding_Course_Doc')
+         );
+     } elsif ($showdoc) {
+         $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
+                                                 {'force_register' => $showdoc,}));
+     } else {
+         my $folder=$env{'form.folder'};
+         if ($folder eq '' || $folder eq 'supplemental') {
+             $env{'form.folderpath'} = 'supplemental&'.
+                                       &escape(&mt('Supplemental '.$crstype.' Documents'));
+         }
+         my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);
+         $r->print(&Apache::loncommon::start_page("Supplemental documents").
+                   $breadcrumbtrail);
+     }
    my %allfiles = ();
    my %codebase = ();
    my ($upload_result,$upload_output);
    if ($allowed) {
-       if (($env{'form.uploaddoc.filename'}) &&                                               ($env{'form.cmd'}=~/^upload_(\w+)/)) {
+       if (($env{'form.uploaddoc.filename'}) &&
- # Process file upload - phase one - upload and parse primary file.
+ 	  ($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 2239  sub handler {
+ Line 2854  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 2267  sub handler {
+ Line 2882  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 2276  sub handler {
+ Line 2891  sub handler {
                                $attrib_regexp = $attribs{$item}[0];
                            }
                            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 2289  sub handler {
+ Line 2904  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 2298  sub handler {
+ Line 2913  sub handler {
    unless ($showdoc ||  $upload_result eq 'phasetwo') {
  # -----------------------------------------------------------------------------
         my %lt=&Apache::lonlocal::texthash(
-                 'uplm' => 'Upload a new main '.lc($type).' document',
+                 'uplm' => 'Upload a new main '.lc($crstype).' document',
-                 'upls' => 'Upload a new supplemental '.lc($type).' document',
+                 'upls' => 'Upload a new supplemental '.lc($crstype).' document',
                  'impp' => 'Import a document',
-                 'pubd' => 'Published documents',
  		'copm' => 'All documents out of a published map into this folder',
-                 'spec' => 'Special documents',
+                 'upld' => 'Import Document',
-                 'upld' => 'Upload Document',
                  'srch' => 'Search',
                  'impo' => 'Import',
- 		'book' => 'Import Bookmarks',
+ 		'wish' => 'Import from Wishlist',
                  'selm' => 'Select Map',
                  'load' => 'Load Map',
-                 'reco' => 'Recover Deleted Resources',
+                 'reco' => 'Recover Deleted Documents',
                  'newf' => 'New Folder',
                  'newp' => 'New Composite Page',
                  'extr' => 'External Resource',
                  'syll' => 'Syllabus',
-                 'navc' => 'Navigate Contents',
+                 'navc' => 'Table of 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',
- 		'abou' => 'About User',
+                 'grpo' => 'Group Portfolio',
-                 'imsf' => 'Import IMS package',
+                 'rost' => 'Course Roster',
+ 				'abou' => 'Personal Information Page for a User',
+                 'imsf' => 'IMS Import',
+                 'imsl' => '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' => 'Upload Document',
+ 		'pm' => 'Published Map',
+ 		'sd' => 'Special Document',
+ 		'mo' => 'More 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 $fileuploada = "<input type='submit' value='".$lt{'upld'}."' /> $help{'Uploading_From_Harddrive'}";
+ 	my $fileuploadform=(<<FUFORM);
+ 	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	<input type="hidden" name="active" value="aa" />
+ 	$fileupload
+ 	<br />
+ 	$lt{'title'}:<br />
+ 	<input type="text" size="80" name="comment" />
+ 	$uploadtag
+ 	<input type="hidden" name="cmd" value="upload_default" />
+ 	<br />
+ 	<span class="LC_nobreak">
+ 	$checkbox
+ 	</span>
+ FUFORM
+     #$list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});
+     #$fileuploadform .= create_form_ul(create_list_elements(@fileuploada));
+     $fileuploadform .= create_form_ul(Apache::lonhtmlcommon::htmltag('li',$fileuploada,{class => 'LC_menubuttons_inline_text'}));
+ 	$fileuploadform .= (<<FUFORM);
+ 	</form>
+ FUFORM
+ 	my $simpleeditdefaultform=(<<SEDFFORM);
+ 	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+ 	<input type="hidden" name="active" value="bb" />
+ SEDFFORM
+ 	my @simpleeditdefaultforma = (
+ 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
+ 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
+ 	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" },
+ 	);
+ 	$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
+ 	$simpleeditdefaultform .=(<<SEDFFORM);
+ 	<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="" />
+ 	<a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
+ 	</form>
+ ERFORM
      if ($allowed) {
-        my $dumpbut=&dumpbutton();
+ 	&update_paste_buffer($coursenum,$coursedom);
-        my $exportbut=&exportbutton();
         my %lt=&Apache::lonlocal::texthash(
  					 'vc' => 'Verify Content',
  					 'cv' => 'Check/Set Resource Versions',
  					 'ls' => 'List Symbs',
+                                          'sl' => 'Show Log'
  					  );
-        my $folderpath=$env{'form.folderpath'};
+ 	$r->print(<<HIDDENFORM);
-        if (!$folderpath) {
+ 	<form name="renameform" method="post" action="/adm/coursedocs">
- 	   if ($env{'form.folder'} eq '' ||
+    <input type="hidden" name="title" />
- 	       $env{'form.folder'} eq 'supplemental') {
+    <input type="hidden" name="cmd" />
- 	       $folderpath='default&'.
+    <input type="hidden" name="markcopy" />
- 		   &escape(&mt('Main '.$type.' Documents'));
+    <input type="hidden" name="copyfolder" />
- 	   }
+    $containertag
-        }
+  </form>
-        unless ($env{'form.pagepath'}) {
+  <form name="simpleedit" method="post" action="/adm/coursedocs">
-            $containertag = '<input type="hidden" name="folderpath" value="" />';
+    <input type="hidden" name="importdetail" value="" />
-            $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
+    $uploadtag
-        }
+  </form>
+ HIDDENFORM
-        $r->print(<<ENDCOURSEVERIFY);
+     }
- <form name="renameform" method="post" action="/adm/coursedocs">
+ # --------------------------------------------------------- Main tab structure
- <input type="hidden" name="title" />
- <input type="hidden" name="cmd" />
+     my $activeClass = 1;
- <input type="hidden" name="markcopy" />
+     my $active = '';
- $containertag
+     my %tabtitles = (
- </form>
+                        main => {
- <form name="simpleedit" method="post" action="/adm/coursedocs">
+                                  Course => &mt('Main Course Documents'),
- <input type=hidden name="importdetail" value="">
+                                  Community => &mt('Main Community Documents'),
- $uploadtag
+                                },
- </form>
+                        supplemental => {
- <form action="/adm/coursedocs" method="post" name="courseverify">
+                                  Course => &mt('Supplemental Course Documents'),
- <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
+                                  Community => &mt('Supplemental Community Documents'),
- <tr><td bgcolor="#DDDDCC">
+                                },
- <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
+                     );
- </td><td bgcolor="#DDDDCC">
+     if ($allowed) {
-     <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
+         $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
- $dumpbut
+         if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'}eq"" || ($env{'form.pagepath'}))) {
- $exportbut
+             if($activeClass == 1){
- </td><td bgcolor="#DDDDCC">
+                 $active = 'class="active"';
-     <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+ 	        $activeClass = 0;
- </td></tr></table>
+ 	    }
- </form>
+         }
- ENDCOURSEVERIFY
+         $r->print('<li '.$active
-        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
+                . ' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'main'}{$crstype}.'</b></a></li>');
- 		     &mt('Editing the Table of Contents for your '.$type)));
+         $active = '';
+         if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
+             if($activeClass == 1){
+                 $active = 'class="active"';
+             }
+         }
+         $r->print('<li '.$active
+             .' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'supplemental'}{$crstype}.'</b></a></li>');
+         $r->print('</ul>');
+     } else {
+         $r->print('<br />');
      }
+     $r->print('<div class="LC_Box" style="clear:both;margin:0;">'
+              .'<div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
  # --------------------------------------------------------- Standard documents
-     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
+        my $savefolderpath;
-     if (($standard) && ($allowed) && (!$forcesupplement)) {
+        $active = 'style="display: none;"';
- 	$r->print('<tr><td bgcolor="#BBBBBB">');
+        if($activeClass == 0){
- #  '<h2>'.&mt('Main Course Documents').
+           $active = 'style="display: block;"';
- #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
+        }
+        if ($allowed) {
+        $r->print('<div class="LC_ContentBox" id="mainCourseDocuments" '.$active.'>');
         my $folder=$env{'form.folder'};
-        if ($folder eq '' || $folder eq 'supplemental') {
+        if ($folder eq '' || $folder=~/^supplemental/) {
             $folder='default';
- 	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
+ 	   $savefolderpath = $env{'form.folderpath'};
+ 	   $env{'form.folderpath'}='default&'.&escape($tabtitles{'main'}{$crstype});
+            $uploadtag = '<input type="hidden" name="folderpath" value="'.
+ 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
         }
         my $postexec='';
         if ($folder eq 'default') {
- 	   $r->print('<script>this.window.name="loncapaclient";</script>');
+            $r->print('<script type="text/javascript">'."\n"
+                     .'// <![CDATA['."\n"
+                     .'this.window.name="loncapaclient";'."\n"
+                     .'// ]]>'."\n"
+                     .'</script>'."\n"
+        );
         } 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 2411  ENDCOURSEVERIFY
+ Line 3114  ENDCOURSEVERIFY
  	    $container='page';
  	}
  	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
-        $r->print(<<ENDFORM);
- <table cellspacing=4 cellpadding=4><tr>
- <th bgcolor="#DDDDDD">$lt{'uplm'}</th>
- <th bgcolor="#DDDDDD">$lt{'impp'}</th>
+ 	my $recoverform=(<<RFORM);
- <th bgcolor="#DDDDDD">$lt{'spec'}</th>
+ 	<form action="/adm/groupsort" method="post" name="recover">
- </tr>
+ 	<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
- <tr><td bgcolor="#DDDDDD">
+ 	</form>
- $lt{'file'}:<br />
+ RFORM
- <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
- <input type="file" name="uploaddoc" size="40">
+ 	my $imspform=(<<IMSPFORM);
- <br />
+ 	<form action="/adm/imsimportdocs" method="post" name="ims">
- $lt{'title'}:<br />
+ 	<input type="hidden" name="folder" value="$folder" />
- <input type="text" size="50" name="comment">
+ 	<a class="LC_menubuttons_link" href="javascript:makeims();">$lt{'imsf'}</a>
- $uploadtag
+ 	</form>
- <input type="hidden" name="cmd" value="upload_default">
+ IMSPFORM
- <br />
- <nobr>
+ 	my $newnavform=(<<NNFORM);
- <label>$lt{'parse'}?
+ 	<form action="/adm/coursedocs" method="post" name="newnav">
- <input type="checkbox" name="parserflag" />
+ 	<input type="hidden" name="active" value="cc" />
- </label>
+ 	$uploadtag
- </nobr>
+ 	<input type="hidden" name="importdetail"
- <br />
+ 	value="$lt{'navc'}=/adm/navmaps" />
- <br />
+ 	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
- <nobr>
+ 	$help{'Navigate_Content'}
- <input type="submit" value="$lt{'upld'}">
+ 	</form>
-  $help{'Uploading_From_Harddrive'}
+ NNFORM
- </nobr>
+ 	my $newsmppageform=(<<NSPFORM);
- </form>
+ 	<form action="/adm/coursedocs" method="post" name="newsmppg">
- </td>
+ 	<input type="hidden" name="active" value="cc" />
- <td bgcolor="#DDDDDD">
+ 	$uploadtag
- <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+ 	<input type="hidden" name="importdetail" value="" />
- $lt{'pubd'}<br />
+ 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
- $uploadtag
+ 	$help{'Simple Page'}
- <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}" />
+ 	</form>
- <br />
+ NSPFORM
- <nobr>
- <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">
- </nobr>
+ 	<input type="hidden" name="active" value="cc" />
- <br />
+ 	$uploadtag
- <input type=button onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
+ 	<input type="hidden" name="importdetail" value="" />
- <p>
+ 	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
- <hr />
+ 	$help{'Simple Problem'}
- $lt{'copm'}<br />
+ 	</form>
- <input type="text" size="40" name="importmap"><br />
- <nobr><input type=button
+ NSPROBFORM
- onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
- value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
+ 	my $newdropboxform=(<<NDBFORM);
- $help{'Load_Map'}</nobr>
+ 	<form action="/adm/coursedocs" method="post" name="newdropbox">
- </p>
+ 	<input type="hidden" name="active" value="cc" />
- </form>
+ 	$uploadtag
- <hr />
+ 	<input type="hidden" name="importdetail" value="" />
- <form action="/adm/groupsort" method="post" name="recover">
+ 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
- <input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
+ 	</form>
- </form>
+ NDBFORM
- ENDFORM
-        unless ($env{'form.pagepath'}) {
+ 	my $newexuploadform=(<<NEXUFORM);
- 	   $r->print(<<ENDFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newexamupload">
- <hr />
+ 	<input type="hidden" name="active" value="cc" />
- <form action="/adm/coursedocs" method="post" name="newext">
+ 	$uploadtag
- $uploadtag
+ 	<input type="hidden" name="importdetail" value="" />
- <input type=hidden name="importdetail" value="">
+ 	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
- <nobr>
+ 	$help{'Score_Upload_Form'}
- <input name="newext" type="button" onClick="javascript:makenewext('newext');"
+ 	</form>
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ NEXUFORM
- </nobr>
- </form>
+ 	my $newbulform=(<<NBFORM);
- <br /><form action="/adm/imsimportdocs" method="post" name="ims">
+ 	<form action="/adm/coursedocs" method="post" name="newbul">
- <input type="hidden" name="folder" value="$folder" />
+ 	<input type="hidden" name="active" value="cc" />
- <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+ 	$uploadtag
- </nobr>
+ 	<input type="hidden" name="importdetail" value="" />
- </form>
+ 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
- ENDFORM
+ 	$help{'Bulletin Board'}
-        }
+ 	</form>
-        $r->print('</td><td bgcolor="#DDDDDD">');
+ NBFORM
+ 	my $newaboutmeform=(<<NAMFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newaboutme">
+ 	<input type="hidden" name="active" value="cc" />
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail"
+ 	value="$plainname=/adm/$udom/$uname/aboutme" />
+ 	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
+ 	$help{'My Personal Information Page'}
+ 	</form>
+ NAMFORM
+ 	my $newaboutsomeoneform=(<<NASOFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+ 	<input type="hidden" name="active" value="cc" />
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
+ 	</form>
+ NASOFORM
+ 	my $newrosterform=(<<NROSTFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newroster">
+ 	<input type="hidden" name="active" value="cc" />
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail"
+ 	value="$lt{'rost'}=/adm/viewclasslist" />
+ 	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
+ 	$help{'Course Roster'}
+ 	</form>
+ NROSTFORM
+ my $specialdocumentsform;
+ my @specialdocumentsforma;
+ my $newfolderform;
+ my $newfolderb;
         unless ($env{'form.pagepath'}) {
-            $r->print(<<ENDFORM);
+ 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- <br /><form action="/adm/coursedocs" method="post" name="newfolder">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ 	my $newpageform=(<<NPFORM);
- <input type=hidden name="importdetail" value="">
+ 	<form action="/adm/coursedocs" method="post" name="newpage">
- <nobr>
+ 	<input type="hidden" name="folderpath" value="$path" />
- <input name="newfolder" type="button"
+ 	<input type="hidden" name="importdetail" value="" />
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	<input type="hidden" name="active" value="cc" />
- value="$lt{'newf'}" />$help{'Adding_Folders'}
+ 	<a class="LC_menubuttons_link" href="javascript:makenewpage(document.newpage,'$pageseq');">$lt{'newp'}</a>
- </nobr>
+ 	$help{'Adding_Pages'}
- </form>
+ 	</form>
- <br /><form action="/adm/coursedocs" method="post" name="newpage">
+ NPFORM
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type=hidden name="importdetail" value="">
- <nobr>
+ 	$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="" />
- </nobr>
+ 	<input type="hidden" name="active" value="aa" />
- </form>
+ 	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
- <br /><form action="/adm/coursedocs" method="post" name="newsyl">
+ 	</form>
- $uploadtag
+ NFFORM
- <input type=hidden name="importdetail"
- value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+ 	my $newsylform=(<<NSYLFORM);
- <nobr>
+ 	<form action="/adm/coursedocs" method="post" name="newsyl">
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
+ 	<input type="hidden" name="active" value="cc" />
-  $help{'Syllabus'}
+ 	$uploadtag
- </nobr>
+ 	<input type="hidden" name="importdetail"
- </form>
+ 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
- <br /><form action="/adm/coursedocs" method="post" name="newnav">
+ 	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
- $uploadtag
+ 	$help{'Syllabus'}
- <input type=hidden name="importdetail"
- value="Navigate Content=/adm/navmaps">
+ 	</form>
- <nobr>
+ NSYLFORM
- <input name="newnav" type="submit" value="$lt{'navc'}" />
- $help{'Navigate_Content'}
+ 	my $newgroupfileform=(<<NGFFORM);
- </nobr>
+ 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
- </form>
+ 	<input type="hidden" name="active" value="cc" />
- <br /><form action="/adm/coursedocs" method="post" name="newsmppg">
+ 	$uploadtag
- $uploadtag
+ 	<input type="hidden" name="importdetail"
- <input type=hidden name="importdetail" value="">
+ 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
- <nobr>
+ 	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
- <input name="newsmppg" type="button" value="$lt{'sipa'}"
+ 	$help{'Group Portfolio'}
- onClick="javascript:makesmppage();" /> $help{'Simple Page'}
+ 	</form>
- </nobr>
+ NGFFORM
- </form>
+ 	@specialdocumentsforma=(
- <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'"  onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
- $uploadtag
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
- <input type=hidden name="importdetail" value="">
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
- <nobr>
+ 	);
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+         my @importdoc = (
- </nobr>
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
- </form>
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
- <br /><form action="/adm/coursedocs" method="post" name="newdropbox">
+         $fileuploadform =  create_form_ul(create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;
- $uploadtag
- <input type=hidden name="importdetail" value="">
+ 	push @specialdocumentsforma, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
- <nobr>
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
- <input name="newdropbox" type="button" value="$lt{'drbx'}"
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
- onClick="javascript:makedropbox();" />
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
- </nobr>
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},
- </form>
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
- $uploadtag
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
- <input type=hidden name="importdetail" value="">
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},);
- <nobr>
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
+ 	$specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
- onClick="javascript:makeexamupload();" />
+       }
- $help{'Score_Upload_Form'}
- </nobr>
+ if($env{'form.pagepath'}) {
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newbul">
+ 	@specialdocumentsforma=(
- $uploadtag
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.&mt('Simple Problem').'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
- <input type=hidden name="importdetail" value="">
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.&mt('Score Upload Form').'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}
- <nobr>
+ 	);
- <input name="newbulletin" type="button" value="$lt{'bull'}"
+ 	$specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
- onClick="javascript:makebulboard();" />
+ }
- $help{'Bulletin Board'}
- </nobr>
+ my @tools = (
- </form>
+ #	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
- <br /><form action="/adm/coursedocs" method="post" name="newaboutme">
+ #	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
- $uploadtag
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
- <input type=hidden name="importdetail"
+ 	);
- value="$plainname=/adm/$udom/$uname/aboutme">
- <nobr>
+ my %orderhash = (
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+                 'aa' => ['Import Documents',$fileuploadform],
- $help{'My Personal Info'}
+                 'bb' => ['Published Resources',$simpleeditdefaultform],
- </nobr>
+                 'cc' => ['Special Documents',$specialdocumentsform],
- </form>
+ 		'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
- <br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+                 );
- $uploadtag
+ unless($env{'form.pagepath'}) {
- <input type=hidden name="importdetail" value="">
+     $orderhash{'00'} = ['Newfolder',$newfolderform];
- <nobr>
+ }
- <input name="newaboutsomeone" type="button" value="$lt{'abou'}"
- onClick="javascript:makeabout();" />
+ my $tid='1';
- </nobr>
+  $hadchanges=0;
- </form>
+         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
- ENDFORM
+        if ($error) {
+            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
-        if ($env{'form.pagepath'}) {
+        if ($hadchanges) {
-            $r->print(<<ENDBLOCK);
+            &mark_hash_old();
- <form action="/adm/coursedocs" method="post" name="newsmpproblem">
- $uploadtag
- <input type=hidden name="importdetail" value="">
- <nobr>
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- </nobr>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
- $uploadtag
- <input type=hidden name="importdetail" value="">
- <nobr>
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
- onClick="javascript:makeexamupload();" />
- $help{'Score_Upload_Form'}
- </nobr>
- </form>
- ENDBLOCK
         }
-        $r->print('</td></tr>'."\n".
- '</table>');
+        &changewarning($r,'');
-        $r->print('</td></tr>');
+ $r->print(&generate_edit_table($tid,\%orderhash));
-     }
+ $r->print('</div>');
+ 	}
  # ----------------------------------------------------- Supplemental documents
-     if (!$forcestandard) {
+        $active = 'style="display: none;"';
-        $r->print('<tr><td bgcolor="#BBBBBB">');
+        if($activeClass == 1){
- # '<h2>'.&mt('Supplemental Course Documents').
+           $active = 'style="display: block;"';
- #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
+        }
+        $r->print('<div class="LC_ContentBox" id="supplCourseDocuments" '.$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 '.$crstype.' Documents'));
+        } elsif ($allowed) {
+ 	  $env{'form.folderpath'} = $savefolderpath;
         }
-        &editor($r,$coursenum,$coursedom,$folder,$allowed);
+        $env{'form.pagepath'} = '';
         if ($allowed) {
-        my $folderseq=
+ 	   my $folderseq=
-                   '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+ 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
-                      '.sequence';
+ 	       '.sequence';
-           $r->print(<<ENDSUPFORM);
+ 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- <table cellspacing=4 cellpadding=4><tr>
- <th bgcolor="#DDDDDD">$lt{'upls'}</th>
+ 	my $supupdocformbtn = "<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}";
- <th bgcolor="#DDDDDD">$lt{'spec'}</th>
+ 	my $supupdocform=(<<SUPDOCFORM);
- </tr>
+ 	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
- <tr><td bgcolor="#DDDDDD">
+ 	<input type="hidden" name="active" value="ee" />
- <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	$fileupload
- <input type="file" name="uploaddoc" size="40">
+ 	<br />
- <br />
+ 	<br />
- <br />
+ 	<span class="LC_nobreak">
- <nobr>
+ 	$checkbox
- <label>$lt{'parse'}?
+ 	</span>
- <input type="checkbox" name="parserflag" />
+ 	<br /><br />
- </label>
+ 	$lt{'comment'}:<br />
- </nobr>
+ 	<textarea cols="50" rows="4" name="comment"></textarea>
- <br /><br />
+ 	<br />
- $lt{'comment'}:<br />
+ 	<input type="hidden" name="folderpath" value="$path" />
- <textarea cols=50 rows=4 name='comment'>
+ 	<input type="hidden" name="cmd" value="upload_supplemental" />
- </textarea>
+ SUPDOCFORM
- <br />
+ 	$supupdocform .=  create_form_ul(Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type="hidden" name="cmd" value="upload_supplemental">
+ 	my $supnewfolderform=(<<SNFFORM);
- <nobr>
+ 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
- <input type="submit" value="$lt{'upld'}">
+ 	<input type="hidden" name="active" value="ee" />
-  $help{'Uploading_From_Harddrive'}
+ 	<input type="hidden" name="folderpath" value="$path" />
- </nobr>
+ 	<input type="hidden" name="importdetail" value="" />
- </form>
+ 	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a>
- </td>
+ 	$help{'Adding_Folders'}
- <td bgcolor="#DDDDDD">
+ 	</form>
- <form action="/adm/coursedocs" method="post" name="supnewfolder">
+ SNFFORM
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type=hidden name="importdetail" value="">
- <nobr>
+ 	my $supnewextform=(<<SNEFORM);
- <input name="newfolder" type="button"
+ 	<form action="/adm/coursedocs" method="post" name="supnewext">
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	<input type="hidden" name="active" value="ff" />
- value="$lt{'newf'}" /> $help{'Adding_Folders'}
+ 	<input type="hidden" name="folderpath" value="$path" />
- </nobr>
+ 	<input type="hidden" name="importdetail" value="" />
- </form>
+ 	<a class="LC_menubuttons_link" href="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'}
- <br /><form action="/adm/coursedocs" method="post" name="supnewext">
+ 	</form>
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ SNEFORM
- <input type=hidden name="importdetail" value="">
- <nobr>
+ 	my $supnewsylform=(<<SNSFORM);
- <input name="newext" type="button"
+ 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
- onClick="javascript:makenewext('supnewext');"
+ 	<input type="hidden" name="active" value="ff" />
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	<input type="hidden" name="folderpath" value="$path" />
- </nobr>
+ 	<input type="hidden" name="importdetail"
- </form>
+ 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
- <br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
+ 	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ 	$help{'Syllabus'}
- <input type=hidden name="importdetail"
+ 	</form>
- value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+ SNSFORM
- <nobr>
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
+ 	my $supnewaboutmeform=(<<SNAMFORM);
- $help{'Syllabus'}
+ 	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
- </nobr>
+ 	<input type="hidden" name="active" value="ff" />
- </form>
+ 	<input type="hidden" name="folderpath" value="$path" />
- <br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
+ 	<input type="hidden" name="importdetail"
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ 	value="$plainname=/adm/$udom/$uname/aboutme" />
- <input type=hidden name="importdetail"
+ 	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
- value="$plainname=/adm/$udom/$uname/aboutme">
+ 	$help{'My Personal Information Page'}
- <nobr>
+ 	</form>
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+ SNAMFORM
- $help{'My Personal Info'}
- </nobr>
- </form>
+ my @specialdocs = (
- </td></tr>
+ 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />'
- </table></td></tr>
+             =>$supnewsylform},
- ENDSUPFORM
+ 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />'
-        }
+             =>$supnewaboutmeform},
+ 		);
+ my @supimportdoc = (
+ 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
+             =>$supnewextform},
+         );
+ $supupdocform =  create_form_ul(create_list_elements(@supimportdoc)) . '<hr/>' . $supupdocform;
+ my %suporderhash = (
+ 		'00' => ['Supnewfolder', $supnewfolderform],
+                 'ee' => ['Import Documents',$supupdocform],
+                 'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))]
+                 );
+         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+         if ($error) {
+             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+         }
+         my $tid='2';
+         $r->print(&generate_edit_table($tid,\%suporderhash));
+     } else {
+         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+         if ($error) {
+             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+         }
      }
+ $r->print('</div>');
+ $r->print('</div></div>');
      if ($allowed) {
- 	$r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>');
+ 	$r->print('
+ <form method="post" name="extimport" action="/adm/coursedocs">
+   <input type="hidden" name="title" />
+   <input type="hidden" name="url" />
+   <input type="hidden" name="useform" />
+   <input type="hidden" name="residx" />
+ </form>');
      }
-     $r->print('</table>');
    } else {
        unless ($upload_result eq 'phasetwo') {
  # -------------------------------------------------------- This is showdoc mode
            $r->print("<h1>".&mt('Uploaded Document').' - '.
  		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
- &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
+ &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
-           &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
+           &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
        }
    }
   }
   $r->print(&Apache::loncommon::end_page());
   return OK;
  }
+ sub generate_admin_options {
+   my ($help_ref,$env_ref) = @_;
+   my %lt=&Apache::lonlocal::texthash(
+                                          'vc' => 'Verify Content',
+                                          'cv' => 'Check/Set Resource Versions',
+                                          'ls' => 'List Symbs',
+                                          'sl' => 'Show Log',
+                                          'imse' => 'IMS Export',
+                                          'dcd' => 'Dump Course Documents to Construction Space: available on other servers'
+                                           );
+   my %help = %{$help_ref};
+   my %env = %{$env_ref};
+   my $dumpbut=&dumpbutton();
+   my $exportbut=&exportbutton();
+   my @list = (
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/verify.png" alt="'.$lt{vc}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "verify", "'.$lt{'vc'}.'")\' />'
+         => "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"verify\", \"$lt{'vc'}\")'>$lt{'vc'}</a>$help{'Verify_Content'}"},
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/resversion.png" alt="'.$lt{cv}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "versions", "'.$lt{'cv'}.'")\' />'
+         =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"versions\", \"$lt{'cv'}\")'>$lt{'cv'}</a>$help{'Check_Resource_Versions'}"},
+ 	);
+   if($dumpbut ne ''){
+   push @list, {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dump.png" alt="'.$lt{dcd}.'" />'=>$dumpbut};
+   }
+   push @list, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/imsexport.png" alt="'.$lt{imse}.'" onclick="javascript:injectData(document.courseverify, \'dummy\', \'exportcourse\', \''.&mt('IMS Export').'\');" />'
+           =>$exportbut},
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/symbs.png" alt="'.$lt{ls}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "listsymbs", "'.$lt{'ls'}.'")\'  />'
+         =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"listsymbs\", \"$lt{'ls'}\")'>$lt{'ls'}</a><input type='hidden' name='folder' value='$env{'form.folder'}' />"},
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/document-properties.png" alt="'.$lt{sl}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "docslog", "'.$lt{'sl'}.'")\'  />'
+         =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"},
+ 	);
+   return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.create_form_ul(create_list_elements(@list)).'</form>';
+ }
+ sub generate_edit_table {
+     my ($tid,$orderhash_ref) = @_;
+     return unless(ref($orderhash_ref) eq 'HASH');
+     my %orderhash = %{$orderhash_ref};
+     my $form;
+     my $activetab;
+     my $active;
+     if($env{'form.active'} ne ''){
+         $activetab = $env{'form.active'};
+     }
+     $form = '<div class="LC_Box" style="margin-right:0">';
+     $form .= '<ul id="navigation'.$tid.'" class="LC_TabContent">';
+     foreach my $name (sort(keys(%orderhash))){
+         if($name ne '00'){
+             if($activetab eq '' || $activetab ne $name){
+                $active = '';
+             }elsif($activetab eq $name){
+                $active = 'class="active"';
+             }
+             $form .= '<li '.$active
+                 .' onmouseover="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"'
+                 .' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>';
+         } else {
+ 	    $form .= '<li '.$active.'>'.${$orderhash{$name}}[1].'</li>';
+ 	}
+     }
+     $form .= '</ul>';
+     $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0; clear: both;">';
+     foreach my $field (keys(%orderhash)){
+ 	if($field ne '00'){
+             if($activetab eq '' || $activetab ne $field){
+                 $active = 'style="display: none;"';
+             }elsif($activetab eq $field){
+                 $active = 'style="display:block;"';
+             }
+             $form .= '<div id="'.$field.$tid.'"'
+                     .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1]
+                     .'</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]'
+                                         );
+     my $crstype = &Apache::loncommon::course_type();
+     my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
+     my $docs_pagepath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.pagepath'},'<>&"');
+     my $main_container_page;
+     if ($docs_folderpath eq '') {
+         if ($docs_pagepath ne '') {
+             $main_container_page = 1;
+         }
+     }
+     my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents';
+     my $toplevelsupp = 'supplemental&Supplemental%20'.$crstype.'%20Documents';
      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 2733  function makenewfolder(targetform,folder
+ Line 3611  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 2742  function makenewpage(targetform,folderse
+ Line 3620  function makenewpage(targetform,folderse
  function makenewext(targetname) {
      this.document.forms.extimport.useform.value=targetname;
+     this.document.forms.extimport.title.value='';
+     this.document.forms.extimport.url.value='';
+     this.document.forms.extimport.residx.value='';
+     window.open('/adm/rat/extpickframe.html');
+ }
+ function edittext(targetname,residx,title,url) {
+     this.document.forms.extimport.useform.value=targetname;
+     this.document.forms.extimport.residx.value=residx;
+     this.document.forms.extimport.url.value=url;
+     this.document.forms.extimport.title.value=title;
      window.open('/adm/rat/extpickframe.html');
  }
  function makeexamupload() {
-    var title=prompt('Listed Title for the Uploaded Score');
+    var title=prompt('$lt{"p_mxu"}');
     if (title) {
      this.document.forms.newexamupload.importdetail.value=
  	escape(title)+'=/res/lib/templates/examupload.problem';
      this.document.forms.newexamupload.submit();
- Line 2755  function makeexamupload() {
+ Line 3644  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 2764  function makesmppage() {
+ Line 3653  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 2773  function makesmpproblem() {
+ Line 3662  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 2782  function makedropbox() {
+ Line 3671  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 2791  function makebulboard() {
+ Line 3680  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;
-     eval
+ var residx=this.document.forms.extimport.residx.value;
-      ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
+ eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
-     '";this.document.forms.'+form+'.submit();');
  }
  function changename(folderpath,index,oldtitle,container,pagesymb) {
-     var title=prompt('New Title',oldtitle);
+ var title=prompt('$lt{"p_chn"}',oldtitle);
-     if (title) {
+ if (title) {
- 	this.document.forms.renameform.title.value=title;
+ this.document.forms.renameform.markcopy.value=-1;
- 	this.document.forms.renameform.cmd.value='rename_'+index;
+ this.document.forms.renameform.title.value=title;
-         if (container == 'sequence') {
+ this.document.forms.renameform.cmd.value='rename_'+index;
- 	    this.document.forms.renameform.folderpath.value=folderpath;
+ if (container == 'sequence') {
-         }
+     this.document.forms.renameform.folderpath.value=folderpath;
-         if (container == 'page') {
+ }
-             this.document.forms.renameform.pagepath.value=folderpath;
+ if (container == 'page') {
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagepath.value=folderpath;
-         }
+     this.document.forms.renameform.pagesymb.value=pagesymb;
-         this.document.forms.renameform.submit();
+ }
-     }
+ this.document.forms.renameform.submit();
+ }
  }
- function removeres(folderpath,index,oldtitle,container,pagesymb) {
+ function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-     if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
+ if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
- 	this.document.forms.renameform.cmd.value='del_'+index;
+ this.document.forms.renameform.markcopy.value=-1;
-         if (container == 'sequence') {
+ this.document.forms.renameform.cmd.value='del_'+index;
-             this.document.forms.renameform.folderpath.value=folderpath;
+ if (container == 'sequence') {
-         }
+     this.document.forms.renameform.folderpath.value=folderpath;
-         if (container == 'page') {
+ }
-             this.document.forms.renameform.pagepath.value=folderpath;
+ if (container == 'page') {
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagepath.value=folderpath;
-         }
+     this.document.forms.renameform.pagesymb.value=pagesymb;
-         this.document.forms.renameform.submit();
+ }
-     }
+ this.document.forms.renameform.submit();
+ }
  }
- function cutres(folderpath,index,oldtitle,container,pagesymb) {
+ function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-     if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
+ if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
- 	this.document.forms.renameform.cmd.value='cut_'+index;
+ this.document.forms.renameform.cmd.value='cut_'+index;
- 	this.document.forms.renameform.markcopy.value=index;
+ this.document.forms.renameform.markcopy.value=index;
-         if (container == 'sequence') {
+ this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-             this.document.forms.renameform.folderpath.value=folderpath;
+ if (container == 'sequence') {
-         }
+     this.document.forms.renameform.folderpath.value=folderpath;
-         if (container == 'page') {
+ }
-             this.document.forms.renameform.pagepath.value=folderpath;
+ if (container == 'page') {
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
+ }
+ this.document.forms.renameform.submit();
+ }
+ }
+ function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
+ this.document.forms.renameform.markcopy.value=index;
+ this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+ if (container == 'sequence') {
+ this.document.forms.renameform.folderpath.value=folderpath;
+ }
+ if (container == 'page') {
+ this.document.forms.renameform.pagepath.value=folderpath;
+ this.document.forms.renameform.pagesymb.value=pagesymb;
+ }
+ this.document.forms.renameform.submit();
+ }
+ function unselectInactive(nav) {
+ currentNav = document.getElementById(nav);
+ currentLis = currentNav.getElementsByTagName('LI');
+ for (i = 0; i < currentLis.length; i++) {
+ 	if(currentLis[i].className == 'right active' || currentLis[i].className == 'right'){
+ 		currentLis[i].className = 'right';
+ 	}else{
+ 		currentLis[i].className = 'i';
+ 	}
+ }
+ }
+ function hideAll(current, nav, data) {
+ unselectInactive(nav);
+ if(current.className == 'right'){
+ 	current.className = 'right active'
+ 	}else{
+ 	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 openTabs(pageId) {
+ 	tabnav = document.getElementById(pageId).getElementsByTagName('UL');
+ 	if(tabnav.length > 2 ){
+ 		currentNav = document.getElementById(tabnav[1].id);
+ 		currentLis = currentNav.getElementsByTagName('LI');
+ 		for(i = 0; i< currentLis.length; i++){
+ 			if(currentLis[i].className == 'active') {
+ 				funcString = currentLis[i].onclick.toString();
+ 				tab = funcString.split('"');
+                                 if(tab.length < 2) {
+                                    tab = funcString.split("'");
+                                 }
+ 				currentData = document.getElementById(tab[1]);
+         			currentData.style.display = 'block';
+ 			}
+ 		}
+ 	}
+ }
+ function showPage(current, pageId, nav, data) {
+ 	hideAll(current, nav, data);
+ 	openTabs(pageId);
+ 	unselectInactive(nav);
+ 	current.className = 'active';
+ 	currentData = document.getElementById(pageId);
+ 	currentData.style.display = 'block';
+         if (nav == 'mainnav') {
+             var storedpath = "$docs_folderpath";
+             if (storedpath == '') {
+                 storedpath = "$docs_pagepath";
+             }
+             var storedpage = "$main_container_page";
+             var reg = new RegExp("^supplemental");
+             if (pageId == 'mainCourseDocuments') {
+                 if (storedpage == 1) {
+                     document.simpleedit.folderpath.value = '';
+                     document.uploaddocument.folderpath.value = '';
+                 } else {
+                     if (reg.test(storedpath)) {
+                         document.simpleedit.folderpath.value = '$toplevelmain';
+                         document.uploaddocument.folderpath.value = '$toplevelmain';
+                         document.newext.folderpath.value = '$toplevelmain';
+                     } else {
+                         document.simpleedit.folderpath.value = storedpath;
+                         document.uploaddocument.folderpath.value = storedpath;
+                         document.newext.folderpath.value = storedpath;
+                     }
+                 }
+             } else {
+                 if (reg.test(storedpath)) {
+                     document.simpleedit.folderpath.value = storedpath;
+                     document.supuploaddocument.folderpath.value = storedpath;
+                     document.supnewext.folderpath.value = storedpath;
+                 } else {
+                     document.simpleedit.folderpath.value = '$toplevelsupp';
+                     document.supuploaddocument.folderpath.value = '$toplevelsupp';
+                     document.supnewext.folderpath.value = '$toplevelsupp';
+                 }
+             }
          }
-         this.document.forms.renameform.submit();
+ 	return false;
-     }
  }
- function markcopy(folderpath,index,oldtitle,container,pagesymb) {
+ function injectData(current, hiddenField, name, value) {
-     this.document.forms.renameform.markcopy.value=index;
+ 	currentElement = document.getElementById(hiddenField);
-     if (container == 'sequence') {
+ 	currentElement.name = name;
- 	this.document.forms.renameform.folderpath.value=folderpath;
+ 	currentElement.value = value;
-     }
+ 	current.submit();
-     if (container == 'page') {
- 	this.document.forms.renameform.pagepath.value=folderpath;
- 	this.document.forms.renameform.pagesymb.value=pagesymb;
-     }
-     this.document.forms.renameform.submit();
  }
  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.237
changed lines
	Added in v.1.439