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.288 and 1.469

-version 1.288, 2007/07/12 01:04:36
+version 1.469, 2011/12/21 23:23:08
  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::lonhtmlcommon;
  use LONCAPA::map();
  use Apache::lonratedt();
  use Apache::lonxml;
- Line 53  my %alreadyseen=();
+ Line 56  my %alreadyseen=();
  my $hadchanges;
- # Available help topics
  my %help=();
- # Mapread read maps into LONCAPA::map:: global arrays
- # @order and @resources, determines status
- # sets @order - pointer to resources in right order
- # sets @resources - array with the resources with correct idx
- #
  sub mapread {
      my ($coursenum,$coursedom,$map)=@_;
- Line 76  sub storemap {
+ Line 73  sub storemap {
        &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
  			      $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'};
- Line 116  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 ''; }
      if ($home) {
- 	return '<div>'.
+         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').
+            ."\")'>"
- 	    '</div>';
+            .&mt('Dump '.$crstype.' Documents to Construction Space')
-     } else {
+            .'</a>';
- 	return '<div>'.
+         return
-      &mt('Dump '.$type.
+             $link.' '
- 	 ' DOCS to Construction Space: available on other servers').
+            .&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs')
- 	 '</div>';
+            .'<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 '.$type.' DOCS to Construction Space'));
+     $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 161  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);
  	    $newfilename.='.'.$ext;
  	    my @dirs=split(/\//,$newfilename);
- 	    my $path='/home/'.$ca.'/public_html';
+ 	    my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
  	    my $makepath=$path;
  	    my $fail=0;
  	    for (my $i=0;$i<$#dirs;$i++) {
  		$makepath.='/'.$dirs[$i];
  		unless (-e $makepath) {
  		    unless(mkdir($makepath,0777)) { $fail=1; }
  		}
  	    }
- 	    $r->print('<br /><tt>'.$_.'</tt> => <tt>'.$newfilename.'</tt>: ');
+ 	    $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
  	    if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
- 		if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+ 		if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
  		    print $fh &Apache::lonclonecourse::rewritefile(
-          &Apache::lonclonecourse::readfile($env{'request.course.id'},$_),
+          &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
  				     (%replacehash,$crs => '')
  								    );
  		} else {
  		    print $fh
-          &Apache::lonclonecourse::readfile($env{'request.course.id'},$_);
+          &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
  		       }
  		$fh->close();
  	    } else {
- Line 211  sub dumpcourse {
+ Line 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 228  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::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+                  .&Apache::loncommon::start_data_table()
- 	    $r->print('<tr><td>'.$_.'</td>');
+                  .&Apache::loncommon::start_data_table_header_row()
- 	    my ($ext)=($_=~/\.(\w+)$/);
+                  .'<th>'.&mt('Internal Filename').'</th>'
+                  .'<th>'.&mt('Title').'</th>'
+                  .'<th>'.&mt('Save as ...').'</th>'
+                  .&Apache::loncommon::end_data_table_header_row());
+ 	foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+ 	    $r->print(&Apache::loncommon::start_data_table_row()
+                      .'<td>'.$file.'</td>');
+ 	    my ($ext)=($file=~/\.(\w+)$/);
  	    my $title=$hash{'title_'.$hash{
- 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+ 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
  	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
  	    if (!$title) {
- 		$title=$_;
+ 		$title=$file;
  	    } else {
  		$title=~s|/|_|g;
  	    }
  	    $title=~s/\.(\w+)$//;
  	    $title=&clean($title);
  	    $title.='.'.$ext;
- 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
+ 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
+                      .&Apache::loncommon::end_data_table_row());
  	}
- 	$r->print("</table>\n");
+ 	$r->print(&Apache::loncommon::end_data_table());
  	&untiehash();
  	$r->print(
-   '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump [_1] DOCS',$type).'" /></p></form>');
+   '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Documents").'" /></p></form>');
      }
  }
- # ------------------------------------------------------ Generate "export" button
  sub exportbutton {
-     my $type = &Apache::loncommon::course_type();
+     my $crstype = &Apache::loncommon::course_type();
-     return '<div>'.
+     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').'</div>';
  }
  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 $numprobs = 0;
      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 281  sub exportcourse {
+ Line 311  sub exportcourse {
          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                              ['archive','discussion']);
+         my $format = $env{'form.format'};
          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 292  sub exportcourse {
+ Line 333  sub exportcourse {
              my $imsresources;
              my $tempexport;
              my $copyresult;
-             my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport);
+             my $testbank;
+             my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport,$format,\$testbank);
              if ($manifestok) {
-                 &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,$tempexport,\$copyresult,$ims_manifest);
+                 &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,$tempexport,\$copyresult,$ims_manifest,$format,$testbank);
                  close($ims_manifest);
  #Create zip file in prtspool
- Line 307  sub exportcourse {
+ Line 349  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('Export '.lc($type).' to IMS content 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 344  sub exportcourse {
+ Line 404  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 371  sub exportcourse {
+ Line 431  sub exportcourse {
                          $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'".')"';
+                 } elsif ($curRes->is_problem()) {
+                     $numprobs ++;
                  }
                  $display .= ' />'."\n";
                  for (my $i=0; $i<$depth; $i++) {
-                     $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\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 413  function checkAll(field) {
+ Line 478  function checkAll(field) {
          field.checked = true
      }
  }
  function uncheckAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
- Line 428  function propagateCheck(item) {
+ Line 493  function propagateCheck(item) {
      if (document.exportdoc.elements[item].checked == true) {
          containerCheck(item)
      }
  }
  function containerCheck(item) {
      document.exportdoc.elements[item].checked = true
- Line 439  function containerCheck(item) {
+ Line 504  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 451  function containerCheck(item) {
+ Line 516  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(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
- 	$r->print($display.'</table>'.
+         if ($numprobs > 0) {
-                   '<p><input type="hidden" name="finishexport" value="1">'.
+             $display .= '<p><span class="LC_nobreak">'.
+                         &mt('Export format for LON-CAPA problems:').
+                         '<label><input type="radio" name="format" value="xml" checked="checked" />'.
+                         '&nbsp;'.&mt('XML').'</label>'.('&nbsp;' x3).
+                         '<label><input type="radio" name="format" value="html" />'.
+                         '&nbsp;'.&mt('HTML').'</label>'.('&nbsp;' x3).
+                         '<label><input type="radio" name="format" value="plaintext" />'.
+                         '&nbsp;'.&mt('Text').'</label></span></p>';
+         }
+ 	$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());
      }
  }
  sub create_ims_store {
-     my ($now,$manifestok,$outcome,$tempexport) = @_;
+     my ($now,$manifestok,$outcome,$tempexport,$format,$testbank) = @_;
      $$tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
      my $ims_manifest;
      if (!-e $$tempexport) {
- Line 512  sub create_ims_store {
+ Line 586  sub create_ims_store {
  '  <organizations default="ORG-'.$env{'request.course.id'}.'-'.$now.'">'."\n".
  '    <organization identifier="ORG-'.$env{'request.course.id'}.'-'.$now.'"'.
  ' structure="hierarchical">'."\n".
- '      <title>'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</title>'
+ '      <title>'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</title>';
+         if ($format eq 'plaintext') {
+             my $testbankfilename = $$tempexport.'/testbank.txt';
+             $$testbank = Apache::File->new('>'.$testbankfilename);
+         }
      } else {
          $$outcome .= 'An error occurred opening the IMS manifest file.<br />'
  ;
- Line 521  sub create_ims_store {
+ Line 599  sub create_ims_store {
  }
  sub build_package {
-     my ($now,$navmap,$exportitems,$discussions,$outcome,$tempexport,$copyresult,$ims_manifest) = @_;
+     my ($now,$navmap,$exportitems,$discussions,$outcome,$tempexport,$copyresult,
+         $ims_manifest,$format,$testbank) = @_;
  # first iterator to look for dependencies
      my $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
      my $curRes;
- Line 548  sub build_package {
+ Line 627  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 560  sub build_package {
+ Line 639  sub build_package {
      $count = 0;
      my $imsresources;
      my $pkgdepth;
+     my $currdirpath = 'Top';
      while ($curRes = $it->next()) {
          if ($curRes == $it->BEGIN_MAP()) {
              $prevdepth = $depth;
- Line 572  sub build_package {
+ Line 652  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 597  sub build_package {
+ Line 677  sub build_package {
                '<title>'.$curRes->title().'</title>';
                  print $ims_manifest "\n".$itementry;
-                 unless ($curRes->is_sequence()) {
+                 if ($curRes->is_sequence()) {
+                     $currdirpath = 'Top';
+                     my $pcslist = $curRes->map_hierarchy();
+                     if ($pcslist ne '') {
+                         foreach my $pc (split(/,/,$pcslist),$curRes->map_pc()) {
+                             next if ($pc <= 1);
+                             my $res = $navmap->getByMapPc($pc);
+                             if (ref($res)) {
+                                 my $encloser = $res->title();
+                                 if ($encloser) {
+                                     if ($currdirpath) {
+                                         $currdirpath .= ' -> ';
+                                     }
+                                     $currdirpath .= $encloser;
+                                 }
+                             }
+                         }
+                     }
+                 } else {
                      my $content_file;
                      my @hrefs = ();
-                     &process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport);
+                     &process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport,$format,$currdirpath,$testbank);
                      if ($content_file) {
                          $imsresources .= "\n".
                       '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
                       '" type="webcontent" href="'.$content_file.'">'."\n".
                       '       <file href="'.$content_file.'" />'."\n";
-                         foreach (@hrefs) {
+                         foreach my $item (@hrefs) {
                              $imsresources .=
-                      '        <file href="'.$_.'" />'."\n";
+                      '        <file href="'.$item.'" />'."\n";
                          }
-                         if (grep/^$count$/,@$discussions) {
+                         if (grep(/^$count$/,@$discussions)) {
                              my $ressymb = $symb;
                              my $mode;
                              if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
- Line 651  sub build_package {
+ Line 749  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 661  sub get_dependencies {
+ Line 759  sub get_dependencies {
  }
  sub process_content {
-     my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport) = @_;
+     my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport,$format,$currdirpath,$testbank) = @_;
      my $content_type;
      my $message;
      my @uploads = ();
- Line 718  sub process_content {
+ Line 816  sub process_content {
              $canedit= 1;
          }
  # only include problem code where current user is author
-         if ($canedit) {
+         if (($format eq 'html') || ($format eq 'plaintext')) {
-             $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
+             my $title = $curRes->title;
-         } else {
+             $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,$format,$currdirpath,$title,$testbank);
-             $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit');
+         } elsif ($format eq 'xml') {
+             if ($canedit) {
+                 $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
+             } else {
+                 $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit');
+             }
          }
      } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
          $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
- Line 741  sub process_content {
+ Line 844  sub process_content {
  }
  sub replicate_content {
-     my ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller) = @_;
+     my ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller,$currdirpath,
+         $title,$testbank) = @_;
      my ($map,$ind,$url);
      if ($caller eq 'templateupload') {
          $url = $symb;
          $url =~ s#//#/#g;
      } else {
          ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
      }
      my $content;
- Line 785  sub replicate_content {
+ Line 889  sub replicate_content {
                  } else {
                      $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
                  }
-             } elsif ($caller eq 'noedit') {
+             } elsif (($caller eq 'noedit') || ($caller eq 'html') ||
- # Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this.
+                      ($caller eq 'plaintext')) {
+ # Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this.
+                 my %form = (
+                              grade_symb     => $symb,
+                              grade_courseid => $cdom.'_'.$cnum,
+                              grade_domain   => $env{'user.domain'},
+                              grade_username => $env{'user.name'},
+                              grade_imsexport => 1,
+                              instructor_comments => 'hide',
+                            );
+                 my $feedurl=&Apache::lonnet::clutter($url);
+                 my ($userview,$response)=&Apache::lonnet::ssi_body($feedurl,%form);
+                 if (ref($response)) {
+                     if ($response->is_success) {
+                         $content = $userview;
+                         $content =~ s/\Qonchange="javascript:setSubmittedPart('\E[^\']+\Q');"\E//g;
+                         $content =~ s/^\s*[\n\r]+$//;
+                         if ($caller eq 'plaintext') {
+                             my @lines = split(/[\n\r]+/,$content);
+                             my @tosave;
+                             my $foilcounter = 0;
+                             my @alphabet = ('a'..'z');
+                             my $mc_answer;
+                             foreach my $line (@lines) {
+                                 next if ($line =~ /^\s*$/);
+                                 if ($line =~ m{(|\Q<\label>\E)\Q<br />Incorrect:<label>\E}) {
+                                     $foilcounter ++;
+                                 } elsif ($line =~ m{(|\Q</label>\E)\Q<br />Correct:<b><label>\E}) {
+                                     $foilcounter ++;
+                                     $mc_answer = $alphabet[$foilcounter-1];
+                                 } elsif ($line !~ m{\Q</label>\E(|\Q</b>\E)\Q<br />\E}) {
+                                     $line =~ s/^(\s+|\s+)$//g;
+                                     $line =~ s{^\Q<b>\E([^<]+)\Q</b>\E$}{1};
+                                     $tosave[$foilcounter] .= $line.' ';
+                                 }
+                                 $content = join("\t",@tosave);
+                                 if ($mc_answer) {
+                                     $content .= "\t".$mc_answer."\n";
+                                 }
+                             }
+                             if (@tosave) {
+                                 my $qtype;
+                                 if ($mc_answer) {
+                                     $qtype = 'MC';
+                                 }
+                                 $content = $currdirpath."\t".$title."\t$qtype\t".join("\t",@tosave);
+                                 if ($mc_answer) {
+                                     $content .= "\t".$mc_answer;
+                                 }
+                                 $content .= "\n";
+                             }
+                         } else {
+                             $content = '<html><body>'.$content.'</body></html>';
+                         }
+                         if (($caller eq 'plaintext') && ($testbank)) {
+                             print $testbank $content;
+                         }
+                     } else {
+                         $content = 'Not the owner of this resource';
+                     }
+                 } else {
+                     $content = 'Not the owner of this resource';
+                 }
                  $repstatus = 'ok';
-                 $content = 'Not the owner of this resource';
              }
              if ($repstatus eq 'ok') {
                  print $copiedfile $content;
- Line 818  sub extract_media {
+ Line 983  sub extract_media {
          $dirpath = $url;
          $container = '';
      }
-     &Apache::lonnet::extract_embedded_items(undef,undef,\%allfiles,\%codebase,$content);
+     &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,$content);
      foreach my $embed_file (keys(%allfiles)) {
          my $filename;
          if ($embed_file =~ m#([^/]+)$#) {
- Line 839  sub extract_media {
+ Line 1004  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 858  sub extract_media {
+ Line 1022  sub extract_media {
              my $copiedfile;
              if ($copiedfile = Apache::File->new('>'.$destination)) {
                  print $copiedfile $embed_content;
-                 push @{$href}, 'resources/'.$count.'/res/'.$filename;
+                 push(@{$href},'resources/'.$count.'/res/'.$filename);
                  my $attrib_regexp = '';
                  if (@{$allfiles{$embed_file}} > 1) {
                      $attrib_regexp = join('|',@{$allfiles{$embed_file}});
- Line 902  sub store_template {
+ Line 1066  sub store_template {
      }
  }
- # Imports the given (name, url) resources into the course
- # coursenum, coursedom, and folder must precede the list
  sub group_import {
      my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
      while (@files) {
  	my ($name, $url, $residx) = @{ shift(@files) };
          if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
  	     && ($caller eq 'londocs')
  	     && (!&Apache::lonnet::stat_file($url))) {
              my $errtext = '';
              my $fatal = 0;
              my $newmapstr = '<map>'."\n".
- Line 924  sub group_import {
+ Line 1087  sub group_import {
              my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                  'output',$1.$2);
              if ($result != m|^/uploaded/|) {
-                 $errtext.='Map not saved: A network error occured when trying to save the new map. ';
+                 $errtext.='Map not saved: A network error occurred when trying to save the new map. ';
                  $fatal = 2;
              }
              if ($fatal) {
- Line 932  sub group_import {
+ Line 1095  sub group_import {
              }
          }
  	if ($url) {
  	    if (!$residx
  		|| defined($LONCAPA::map::zombies[$residx])) {
  		$residx = &LONCAPA::map::getresidx($url,$residx);
  		push(@LONCAPA::map::order, $residx);
- Line 941  sub group_import {
+ Line 1104  sub group_import {
  	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
  	    $url  = &LONCAPA::map::qtunescape($url);
  	    $name = &LONCAPA::map::qtunescape($name);
  	    $LONCAPA::map::resources[$residx] =
  		join(':', ($name, $url, $ext, 'normal', 'res'));
  	}
      }
- Line 949  sub group_import {
+ Line 1112  sub group_import {
  }
  sub breadcrumbs {
-     my ($where)=@_;
+     my ($allowed,$crstype)=@_;
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      my (@folders);
      if ($env{'form.pagepath'}) {
- Line 963  sub breadcrumbs {
+ Line 1126  sub breadcrumbs {
      my $randompick=-1;
      my $isencrypted=0;
      my $ishidden=0;
+     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);
+ 	    my $name=&unescape($foldername);
- # randompick number, hidden, encrypted is appended with ":"s to the foldername
+ # randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
-             $name=~s/\:(\d*)\:(\w*)\:(\w*)$//;
+  	    $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
-             if ($1 ne '') {
+ 	    if ($1 ne '') {
                 $randompick=$1;
              } else {
                 $randompick=-1;
              }
              if ($2) { $ishidden=1; }
              if ($3) { $isencrypted=1; }
+ 	    if ($4 ne '') { $is_random_order = 1; }
+             if ($folder eq 'supplemental') {
+                 $name = &mt('Supplemental '.$crstype.' Documents');
+             }
  	    &Apache::lonhtmlcommon::add_breadcrumb(
  		      {'href'=>$url.$cpinfo,
  		       'title'=>$name,
- 		       'text'=>'<font size="+1">'.
+ 		       'text'=>$name,
- 			   $name.'</font>',
  		       'no_mt'=>1,
  		       });
  	$plain.=$name.' &gt; ';
      }
      $plain=~s/\&gt\;\s*$//;
      return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
- 					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain);
+ 					       undef, undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
  }
  sub log_docs {
- Line 1029  sub log_docs {
+ Line 1205  sub log_docs {
                         'currentfolder' => $env{'form.folder'});
          if ($parmidx) {
             $storehash{'parameter_res'}=$oldresources[$parmidx];
-            foreach my $parm (keys %parmaction) {
+            foreach my $parm (keys(%parmaction)) {
                $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
                $storehash{'parameter_value_'.$parm}=$parmvalue{$parm};
             }
- Line 1056  sub log_docs {
+ Line 1232  sub log_docs {
  }
- #
- # Docs Change Log
- #
  sub docs_change_log {
      my ($r)=@_;
      my $folder=$env{'form.folder'};
- Line 1079  sub docs_change_log {
+ Line 1255  sub docs_change_log {
      &Apache::loncommon::restore_course_settings('docs_log',
                                                  \%saveable_parameters);
      if (!$env{'form.show'}) { $env{'form.show'}=10; }
+ # FIXME: internationalization seems wrong here
      my %lt=('hiddenresource' => 'Resources hidden',
  	    'encrypturl'     => 'URL hidden',
  	    'randompick'     => 'Randomly pick',
+ 	    'randomorder'    => 'Randomly ordered',
  	    'set'            => 'set to',
  	    'del'            => 'deleted');
      $r->print(&Apache::loncommon::display_filter().
- Line 1103  sub docs_change_log {
+ Line 1281  sub docs_change_log {
  	    foreach my $key (@changes) {
  		$wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
  	    }
  	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
  	}
          my $count = 0;
          my $time =
- Line 1154  sub docs_change_log {
+ Line 1332  sub docs_change_log {
  	    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}) {
- Line 1164  sub docs_change_log {
+ Line 1342  sub docs_change_log {
  	$r->print('</ul>');
  	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
  	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
- 	    foreach my $parameter ('randompick','hiddenresource','encrypturl') {
+ 	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
  		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
+ # FIXME: internationalization seems wrong here
  		    $r->print('<li>'.
  			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
  				  $docslog{$id}{'logentry'}{'parameter_value_'.$parameter})
- Line 1192  sub update_paste_buffer {
+ Line 1371  sub update_paste_buffer {
      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,
+     &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
- 			    'docs.markedcopy_url'   => $url);
+ 			    'docs.markedcopy_url'   => $url});
      delete($env{'form.markcopy'});
  }
- Line 1211  sub print_paste_buffer {
+ Line 1393  sub print_paste_buffer {
      my ($r,$container) = @_;
      return if (!defined($env{'docs.markedcopy_url'}));
-     $r->print(<<ENDPASTE);
+     $r->print('<fieldset>'
- <form name="pasteform" action="/adm/coursedocs" method="post"><p>
+              .'<legend>'.&mt('Clipboard').'</legend>'
- ENDPASTE
+              .'<form name="pasteform" action="/adm/coursedocs" method="post">'
-     $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');
+              .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '
+     );
      my $type;
      if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
- Line 1224  ENDPASTE
+ Line 1407  ENDPASTE
  		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
      }  else {
  	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
- 	my $type = &Apache::loncommon::filedescription($extension);
+ 	my $icon = &Apache::loncommon::icon($extension);
- 	my $icon = '<img src="'.&Apache::loncommon::icon($extension).
+ 	if ($extension eq 'sequence' &&
- 	    '" alt="" class="LC_icon" />';
+ 	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
+ 	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+ 	    $icon .= '/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') {
- Line 1239  ENDPASTE
+ Line 1426  ENDPASTE
          <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
  ');
      }
-     $r->print('</p></form>');
+     $r->print('</form></fieldset>');
  }
- sub editor {
+ sub do_paste_from_buffer {
-     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;
+     my ($coursenum,$coursedom,$folder) = @_;
-     my $errtext='';
-     my $fatal=0;
+     if (!$env{'form.pastemarked'}) {
-     my $container='sequence';
+         return;
-     if ($env{'form.pagepath'}) {
+     }
-         $container='page';
+ # 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!~/$LONCAPA::assess_page_seq_re/)) {
+ 	    &Apache::lonnet::removeuploadedurl($url);
+ 	} else {
+ 	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+ 	}
+ 	splice(@LONCAPA::map::order, $idx, 1);
+     } elsif ($cmd eq 'cut') {
+ 	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+ 	splice(@LONCAPA::map::order, $idx, 1);
+     } elsif ($cmd eq 'up'
+ 	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
+ 	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
+     } elsif ($cmd eq 'down'
+ 	     && defined($LONCAPA::map::order[$idx+1])) {
+ 	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
+     } elsif ($cmd eq 'rename') {
+ 	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
+ 	if ($comment=~/\S/) {
+ 	    $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
+ 		$comment.':'.join(':', $url, @rrest);
+ 	}
+ # Devalidate title cache
+ 	my $renamed_url=&LONCAPA::map::qtescape($url);
+ 	&Apache::lonnet::devalidate_title_cache($renamed_url);
+     } else {
+ 	return 0;
      }
-     ($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container);
+     return 1;
+ }
+ sub editor {
+     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
+         $supplementalflag,$orderhash)=@_;
+     my $container= ($env{'form.pagepath'}) ? 'page'
+ 		                           : 'sequence';
+     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+ 				    $folder.'.'.$container);
+     return $errtext if ($fatal);
      if ($#LONCAPA::map::order<1) {
  	my $idx=&LONCAPA::map::getresidx();
  	if ($idx<=0) { $idx=1; }
         	$LONCAPA::map::order[0]=$idx;
          $LONCAPA::map::resources[$idx]='';
      }
-     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder);
+     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
-     $r->print($breadcrumbtrail);
+ 	    &breadcrumbs($allowed,$crstype);
-     if ($fatal) {
+         $r->print($breadcrumbtrail);
- 	   $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
-     } else {
+     unless ($allowed) {
+         $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
-             &snapshotbefore();
+ 	&snapshotbefore();
- 	    if ($env{'form.changeparms'}) {
- 		my $idx=$env{'form.setparms'};
+ 	if (&update_parameter()) {
- # set parameters
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($env{'form.changeparms'} eq 'randompick') {
+ 	    return $errtext if ($fatal);
- 		    if ($env{'form.randpick_'.$idx}) {
+ 	}
- 			&LONCAPA::map::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
- 			&remember_parms($idx,'randompick','set',$env{'form.randpick_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_randompick');
- 			&remember_parms($idx,'randompick','del');
- 		    }
- 		}
- 		if ($env{'form.changeparms'} eq 'hiddenresource') {
- 		    if ($env{'form.hidprs_'.$idx}) {
- 			&LONCAPA::map::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
- 			&remember_parms($idx,'hiddenresource','set',$env{'form.hidprs_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_hiddenresource');
- 			&remember_parms($idx,'hiddenresource','del');
- 		    }
- 		}
- 		if ($env{'form.changeparms'} eq 'encrypturl') {
- 		    if ($env{'form.encprs_'.$idx}) {
- 			&LONCAPA::map::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
- 			&remember_parms($idx,'encrypturl','set',$env{'form.encprs_'.$idx});
- 		    } else {
- 			&LONCAPA::map::delparameter($idx,'parameter_encrypturl');
- 			&remember_parms($idx,'encrypturl','del');
- 		    }
- 		}
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
- 		    return;
- 		}
- 	    }
- 	    if ($env{'form.newpos'}) {
+ 	if ($env{'form.newpos'} && $env{'form.currentpos'}) {
  # change order
- 		my $newpos=$env{'form.newpos'}-1;
+ 	    my $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1);
- 		my $currentpos=$env{'form.currentpos'}-1;
+ 	    splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res);
- 		my $i;
- 		my @neworder=();
- 		if ($newpos>$currentpos) {
- # moving stuff up
- 		    for ($i=0;$i<$currentpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		    for ($i=$currentpos;$i<$newpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i+1];
- 		    }
- 		    $neworder[$newpos]=$LONCAPA::map::order[$currentpos];
- 		    for ($i=$newpos+1;$i<=$#LONCAPA::map::order;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		} else {
- # moving stuff down
- 		    for ($i=0;$i<$newpos;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		    $neworder[$newpos]=$LONCAPA::map::order[$currentpos];
- 		    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i-1];
- 		    }
- 		    for ($i=$currentpos+1;$i<=$#LONCAPA::map::order;$i++) {
- 			$neworder[$i]=$LONCAPA::map::order[$i];
- 		    }
- 		}
- 		@LONCAPA::map::order=@neworder;
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
- 		    return;
- 		}
- 	    }
- 	    if ($env{'form.pastemarked'}) {
- # paste resource to end of list
-                 my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
- 		my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
- # Maps need to be copied first
- 		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
- 		    $title=&mt('Copy of').' '.$title;
-                     my $newid=$$.time;
- 		    $url=~/^(.+)\.(\w+)$/;
- 		    my $newurl=$1.$newid.'.'.$2;
- 		    my $storefn=$newurl;
-                     $storefn=~s{^/\w+/$match_domain/$match_username/}{};
- 		    &Apache::lonclonecourse::writefile
- 			($env{'request.course.id'},$storefn,
- 			 &Apache::lonnet::getfile($url));
- 		    $url=$newurl;
- 		}
- 		$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);
- 		$LONCAPA::map::resources[$newidx]=
- 		    $title.':'.$url.':'.$ext.':normal:res';
- 		$LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx;
- # Store the result
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
- 		    return;
- 		}
- 	    }
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
-             $r->print($upload_output);
+ 	    return $errtext if ($fatal);
- 	    if ($env{'form.cmd'}) {
+ 	}
-                 my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
-                 if ($cmd eq 'del') {
+ 	if ($env{'form.pastemarked'}) {
- 		    my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
+             my $paste_res =
- 		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+                 &do_paste_from_buffer($coursenum,$coursedom,$folder);
- 			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+             if ($paste_res eq 'ok') {
- 			&Apache::lonnet::removeuploadedurl($url);
+                 ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		    } else {
+                 return $errtext if ($fatal);
- 			&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+             } elsif ($paste_res ne '') {
- 		    }
+                 $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
- 		    for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {
-                         $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
-                     }
-                     $#LONCAPA::map::order--;
-                 } elsif ($cmd eq 'cut') {
- 		    my (undef,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
- 		    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
- 		    for (my $i=$idx;$i<$#LONCAPA::map::order;$i++) {
-                         $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
-                     }
-                     $#LONCAPA::map::order--;
-                 } elsif ($cmd eq 'up') {
- 		  if (($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
-                     my $i=$LONCAPA::map::order[$idx-1];
-                     $LONCAPA::map::order[$idx-1] = $LONCAPA::map::order[$idx];
-                     $LONCAPA::map::order[$idx] = $i;
- 		   }
-                 } elsif ($cmd eq 'down') {
- 		   if (defined($LONCAPA::map::order[$idx+1])) {
-                     my $i=$LONCAPA::map::order[$idx+1];
-                     $LONCAPA::map::order[$idx+1] = $LONCAPA::map::order[$idx];
-                     $LONCAPA::map::order[$idx] = $i;
- 		   }
-                 } elsif ($cmd eq 'rename') {
-                     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
-                     my ($rtitle,@rrest)=split(/\:/,
-                        $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);
-                     my $comment=$env{'form.title'};
-                     $comment = &LONCAPA::map::qtunescape($comment);
- 		    if ($comment=~/\S/) {
- 			$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
- 			    $comment.':'.join(':',@rrest);
- 		    }
- # Devalidate title cache
-                     my $renamed_url=&LONCAPA::map::qtescape($rrest[0]);
- 		    &Apache::lonnet::devalidate_title_cache($renamed_url);
-                 }
- # Store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
- 					    $folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
- 		    return;
- 		}
              }
+ 	}
+ 	$r->print($upload_output);
+ 	if (&handle_edit_cmd()) {
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	    return $errtext if ($fatal);
+ 	}
  # Group import/search
- 	    if ($env{'form.importdetail'}) {
+ 	if ($env{'form.importdetail'}) {
- 		my @imports;
+ 	    my @imports;
- 		foreach (split(/\&/,$env{'form.importdetail'})) {
+ 	    foreach my $item (split(/\&/,$env{'form.importdetail'})) {
- 		    if (defined($_)) {
+ 		if (defined($item)) {
- 			my ($name,$url,$residx)=
+ 		    my ($name,$url,$residx)=
- 			    map {&unescape($_)} split(/\=/,$_);
+ 			map {&unescape($_)} split(/\=/,$item);
- 			push(@imports, [$name, $url, $residx]);
+ 		    push(@imports, [$name, $url, $residx]);
- 		    }
  		}
- # Store the changed version
+ 	    }
- 		($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
+ 	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
- 					       $container,'londocs',@imports);
+ 					    $container,'londocs',@imports);
- 		if ($fatal) {
+ 	    return $errtext if ($fatal);
- 		    $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
+ 	}
- 		    return;
- 		}
-             }
  # Loading a complete map
- 	   if ($env{'form.loadmap'}) {
+ 	if ($env{'form.loadmap'}) {
-                if ($env{'form.importmap'}=~/\w/) {
+ 	    if ($env{'form.importmap'}=~/\w/) {
- 	          foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
+ 		foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
- 		      my ($title,$url,$ext,$type)=split(/\:/,$_);
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$res);
-                       my $idx=&LONCAPA::map::getresidx($url);
+ 		    my $idx=&LONCAPA::map::getresidx($url);
-                       $LONCAPA::map::resources[$idx]=$_;
+ 		    $LONCAPA::map::resources[$idx]=$res;
-                       $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
+ 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
- 	          }
+ 		}
- # Store the changed version
+ 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
-   	          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
+ 					    $folder.'.'.$container);
- 					   $folder.'.'.$container);
+ 		return $errtext if ($fatal);
- 	          if ($fatal) {
+ 	    } else {
- 		      $r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
+ 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
- 		      return;
- 	          }
-                } else {
- 		    $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
-                }
+ 	    }
-            }
-            &log_differences($plain);
  	}
+ 	&log_differences($plain);
+     }
  # ---------------------------------------------------------------- End commands
  # ---------------------------------------------------------------- Print screen
-         my $idx=0;
+     my $idx=0;
- 	my $shown=0;
+     my $shown=0;
-         if (($ishidden) || ($isencrypted) || ($randompick>=0)) {
+     if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
-            $r->print('<p>'.&mt('Parameters').':<ul>'.
+ 	$r->print('<div class="LC_Box">'.
-                      ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
+           '<ol class="LC_docs_parameters"><li class="LC_docs_parameters_title">'.&mt('Parameters:').'</li>'.
-                      ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
+ 		  ($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').
-                      ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
+ 		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
-                      '</ul></p>');
+ 		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
-         }
+ 		  ($is_random_order?'<li>'.&mt('random order').'</li>':'').
+ 		  '</ol>');
          if ($randompick>=0) {
-            $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
+             $r->print('<p class="LC_warning">'
-         }
+                  .&mt('Caution: this folder is set to randomly pick a subset'
-         $r->print('<table class="LC_docs_editor">');
+                      .' of resources. Adding or removing resources from this'
-         foreach my $res (@LONCAPA::map::order) {
+                      .' folder will change the set of resources that the'
-            my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+                      .' students see, resulting in spurious or missing credit'
- 	   $name=&LONCAPA::map::qtescape($name);
+                      .' for completed problems, not limited to ones you'
- 	   $url=&LONCAPA::map::qtescape($url);
+                      .' modify. Do not modify the contents of this folder if'
-            unless ($name) {  $name=(split(/\//,$url))[-1]; }
+                      .' it is in active student use.')
-            unless ($name) { $idx++; next; }
+                  .'</p>'
-            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
+             );
- 				$coursenum));
+         }
-            $idx++;
+         if ($is_random_order) {
- 	   $shown++;
+             $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 ($to_show,$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) {
+         $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
+                   .&Apache::loncommon::start_data_table(undef,'contentlist');
+         if ($allowed) {
+             $to_show .= &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/) {
+                 $to_show .= '<th colspan="4">'.&mt('Settings').'</th>';
+             }
+             $to_show .= &Apache::loncommon::end_data_table_header_row();
          }
- 	unless ($shown) {
+         $to_show .= $output.' '
- 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
+                  .&Apache::loncommon::end_data_table()
- 	}
+                  .'<br style="line-height:2px;" />'
-         $r->print("\n</table>\n");
+                  .&Apache::loncommon::end_scrollbox();
+     } else {
- 	&print_paste_buffer($r,$container);
+         $to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll')
+                  .'<div class="LC_info" id="contentlist">'
+                  .&mt('Currently no documents.')
+                  .'</div>'
+                  .&Apache::loncommon::end_scrollbox();
+     }
+     my $tid = 1;
+     if ($supplementalflag) {
+         $tid = 2;
      }
+     if ($allowed) {
+         $r->print(&generate_edit_table($tid,$orderhash,$to_show));
+         &print_paste_buffer($r,$container);
+     } else {
+         $r->print($to_show);
+     }
+     return;
  }
  sub process_file_upload {
      my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
  # upload a file, if present
-     my $parseaction;
+     my ($parseaction,$showupload,$nextphase,$mimetype);
-    if ($env{'form.parserflag'}) {
+     if ($env{'form.parserflag'}) {
          $parseaction = 'parse';
      }
-     my $phase_status;
      my $folder=$env{'form.folder'};
      if ($folder eq '') {
          $folder='default';
- Line 1540  sub process_file_upload {
+ Line 1821  sub process_file_upload {
              $LONCAPA::map::resources[1]='';
          }
          if ($fatal) {
-             return 'failed';
+             $$upload_output = '<div class="LC_error" id="uploadfileresult">'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'</div>';
+             return;
          }
          my $destination = 'docs/';
          if ($folder =~ /^supplemental/) {
- Line 1551  sub process_file_upload {
+ Line 1833  sub process_file_upload {
          } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
              $destination .=  $2.'/';
          }
- # this is for a course, not a user, so set coursedoc flag
+ # this is for a course, not a user, so set context to coursedoc.
- # probably the only place in the system where this should be "1"
          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);
+ 						$codebase,undef,undef,undef,undef,
+                                                 undef,undef,\$mimetype);
+         if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E.*/([^/]+)$}) {
+             my $stored = $1;
+             $showupload = '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.
+                           $stored.'</span>').'</p>';
+         } else {
+             my ($filename) = ($env{'form.uploaddoc.filename'} =~ m{([^/]+)$});
+             $$upload_output = '<div class="LC_error" id="uploadfileresult">'.&mt('Unable to save file [_1].','<span class="LC_filename">'.$filename.'</span>').'</div>';
+             return;
+         }
          my $ext='false';
          if ($url=~m{^http://}) { $ext='true'; }
  	$url     = &LONCAPA::map::qtunescape($url);
- Line 1574  sub process_file_upload {
+ Line 1866  sub process_file_upload {
          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
  				    $folder.'.'.$container);
          if ($fatal) {
-             $$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';
+             $$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>';
-             return 'failed';
+             return;
          } else {
-             if ($parseaction eq 'parse') {
+             if ($parseaction eq 'parse' && $mimetype eq 'text/html') {
-                 my $total_embedded = keys(%{$allfiles});
+                 $$upload_output = $showupload;
+                 my $total_embedded = scalar(keys(%{$allfiles}));
                  if ($total_embedded > 0) {
-                     my $num = 0;
+                     my $uploadphase = 'upload_embedded';
- 		    my $state = '
+                     my $primaryurl = &HTML::Entities::encode($url,'<>&"');
-    <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
+ 		    my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx);
-    <input type="hidden" name="cmd" value="upload_embedded" />
+                     my ($embedded,$num) =
-    <input type="hidden" name="newidx" value="'.$newidx.'" />
+                         &Apache::loncommon::ask_for_embedded_content(
-    <input type="hidden" name="primaryurl" value="'.&escape($url).'" />
+                             '/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url});
-    <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
+                     if ($embedded) {
- 		    $phase_status = 'phasetwo';
+                         if ($num) {
+                             $$upload_output .=
-                     $$upload_output .=
+ 			         '<p>'.&mt('This file contains embedded multimedia objects, which need to be uploaded.').'</p>'.$embedded;
- 			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
+                             $nextphase = $uploadphase;
- 			&ask_for_embedded_content('/adm/coursedocs',
+                         } else {
- 						  $state,$allfiles,$codebase);
+                             $$upload_output .= $embedded;
+                         }
+                     } else {
+                         $$upload_output .= &mt('Embedded item(s) already present, so no additional upload(s) required').'<br />';
+                     }
                  } else {
-                     $$upload_output .= 'No embedded items identified<br />';
+                     $$upload_output .= &mt('No embedded items identified').'<br />';
                  }
+                 $$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>';
              }
          }
      }
-     return $phase_status;
+     return $nextphase;
- }
- sub ask_for_embedded_content {
-     my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
-     my $upload_output = '
-    <form name="upload_embedded" action="'.$actionurl.'"
-                   method="post" enctype="multipart/form-data">';
-     $upload_output .= $state;
-     $upload_output .= '<b>Upload embedded files</b>:<br />'.
- 	&Apache::loncommon::start_data_table();
-     my $num = 0;
-     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
- 	$upload_output .= &Apache::loncommon::start_data_table_row().
- 	    '<td>'.$embed_file.'</td><td>';
- 	if ($args->{'ignore_remote_references'}
- 	    && $embed_file =~ m{^\w+://}) {
- 	    $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
- 	} elsif ($args->{'error_on_invalid_names'}
- 	    && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
- 	    $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
- 	} else {
- 	    $upload_output .='
-            <input name="embedded_item_'.$num.'" type="file" value="bob" />
-            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
- 	    my $attrib = join(':',@{$$allfiles{$embed_file}});
- 	    $upload_output .=
- 		"\n\t\t".
- 		'<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
- 		$attrib.'" />';
- 	    if (exists($$codebase{$embed_file})) {
- 		$upload_output .=
- 		    "\n\t\t".
- 		    '<input name="codebase_'.$num.'" type="hidden" value="'.
- 		    &escape($$codebase{$embed_file}).'" />';
- 	    }
- 	}
- 	$upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
- 	$num++;
-     }
-     $upload_output .= &Apache::loncommon::end_data_table().'<br />
-    <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
-    <input type ="submit" value="'.&mt('Upload Listed Files').'" />
-    '.&mt('(only files for which a location has been provided will be uploaded)').'
-    </form>';
-     return $upload_output;
- }
- sub process_secondary_uploads {
-     my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;
-     my $folder=$env{'form.folder'};
-     my $destination = 'docs/';
-     if ($folder =~ /^supplemental/) {
-         $destination = 'supplemental/';
-     }
-     if (($folder eq 'default') || ($folder eq 'supplemental')) {
-         $destination .= 'default/';
-     } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
-         $destination .=  $2.'/';
-     }
-     $destination .= $newidx;
-     my ($url,$filename);
-     $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination);
-     ($filename) = ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/\Q$destination\E/(.+)$});
-     return $filename;
  }
  sub is_supplemental_title {
- Line 1688  sub parse_supplemental_title {
+ Line 1918  sub parse_supplemental_title {
  	$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)=@_;
      my ($foldertitle,$pagetitle,$renametitle);
      if (&is_supplemental_title($title)) {
  	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
- Line 1714  sub entryline {
+ Line 1944  sub entryline {
      }
      my $orderidx=$LONCAPA::map::order[$index];
      $renametitle=~s/\\/\\\\/g;
      $renametitle=~s/\&quot\;/\\\"/g;
      $renametitle=~s/ /%20/g;
-     my $line='<tr>';
+     my $line=&Apache::loncommon::start_data_table_row();
      my ($form_start,$form_end);
  # Edit commands
-     my $container;
      my ($container, $type, $esc_path, $path, $symb);
      if ($env{'form.folderpath'}) {
  	$type = 'folder';
- Line 1733  sub entryline {
+ Line 1962  sub entryline {
      }
      if ($env{'form.pagepath'}) {
          $type = $container = 'page';
-         $esc_path=&escape($path = $env{'form.pagepath'});
+         $esc_path=&escape($env{'form.pagepath'});
  	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
          $symb=&escape($env{'form.pagesymb'});
      }
- Line 1742  sub entryline {
+ Line 1971  sub entryline {
  	my $incindex=$index+1;
  	my $selectbox='';
  	if (($folder!~/^supplemental/) &&
  	    ($#LONCAPA::map::order>0) &&
  	    ((split(/\:/,
  	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
  	     ne '') &&
  	    ((split(/\:/,
  	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]
  	     ne '')) {
  	    $selectbox=
  		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
- 		'<select name="newpos" onChange="this.form.submit()">';
+ 		'<select name="newpos" onchange="this.form.submit()">';
  	    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 1771  sub entryline {
+ Line 2000  sub entryline {
  	my $nocopy=0;
          my $nocut=0;
          if ($url=~/\.(page|sequence)$/) {
- 	    foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
+ 	    if ($url =~ m{/res/}) {
- 		my ($title,$url,$ext,$type)=split(/\:/,$_);
+ 		# no copy for published maps
- 		if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
+ 		$nocopy = 1;
- 		    $nocopy=1;
+ 	    } else {
- 		    last;
+ 		foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$item);
+ 		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
+ 			$nocopy=1;
+ 			last;
+ 		    }
  		}
  	    }
  	}
          if ($url=~/^\/res\/lib\/templates\//) {
             $nocopy=1;
             $nocut=1;
          }
          my $copylink='&nbsp;';
          my $cutlink='&nbsp;';
+ 	my $skip_confirm = 0;
+ 	if ( $folder =~ /^supplemental/
+ 	     || ($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>
- Line 1793  ENDCOPY
+ Line 2039  ENDCOPY
          }
  	if (!$nocut) {
  	    $cutlink=(<<ENDCUT);
- <a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_cut">$lt{'ct'}</a>
+ <a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
  ENDCUT
          }
  	$form_start = (<<END);
- Line 1806  END
+ Line 2052  END
          $form_end = '</form>';
  	$line.=(<<END);
  <td>
-    <table class="LC_docs_entry_move">
+ <div class="LC_docs_entry_move">
-       <tr>
+   <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
-          <td>
+     <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
-             <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
+   </a>
-          </td>
+ </div>
-       </tr>
+ <div class="LC_docs_entry_move">
-       <tr>
+   <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
-         <td>
+     <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
-            <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
+   </a>
-         </td>
+ </div>
-       </tr>
-     </table>
  </td>
  <td>
     $form_start
- Line 1825  END
+ Line 2069  END
     $form_end
  </td>
  <td class="LC_docs_entry_commands">
-    <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_remove">$lt{'rm'}</a>
+    <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
  $cutlink
     <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
  $copylink
- Line 1844  END
+ Line 2088  END
      my $pagefile;
      if ($uploaded) {
  	if ($extension eq 'sequence') {
- 	    $icon=$iconpath.'/folder_closed.gif';
+ 	    $icon=$iconpath.'/navmap.folder.closed.gif';
  	    $url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/;
  	    $url='/adm/coursedocs?';
  	    $folderarg=$1;
- Line 1859  END
+ Line 2103  END
  	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
  	}
      }
      my $orig_url = $url;
+     $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
      my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
  	my $symb=&Apache::lonnet::symbclean(
- Line 1882  END
+ Line 2127  END
  	    } elsif ($url!~/\.(sequence|page)$/) {
  		$url='/adm/coursedocs/showdoc'.$url;
  	    }
  	} elsif ($url=~m|^/ext/|) {
  	    $url='/adm/wrapper'.$url;
  	    $external = 1;
  	}
- Line 1893  END
+ Line 2138  END
          }
  	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.='&' };
  # Append randompick number, hidden, and encrypted with ":" to foldername,
  # so it gets transferred between levels
  	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
                                                'parameter_randompick'))[0]
                                                 .':'.((&LONCAPA::map::getparameter($orderidx,
                                                'parameter_hiddenresource'))[0]=~/^yes$/i)
                                                 .':'.((&LONCAPA::map::getparameter($orderidx,
-                                               'parameter_encrypturl'))[0]=~/^yes$/i);
+                                               'parameter_encrypturl'))[0]=~/^yes$/i)
+                                                .':'.((&LONCAPA::map::getparameter($orderidx,
+                                               'parameter_randomorder'))[0]=~/^yes$/i);
  	$url.='folderpath='.&escape($folderpath).$cpinfo;
  	$parameterset='<label>'.&mt('Randomly Pick: ').
- 	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randpick_'.$orderidx.'" value="'.
+ 	    '<input type="text" size="4" onchange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
  	    (&LONCAPA::map::getparameter($orderidx,
                                                'parameter_randompick'))[0].
                                                '" />'.
  '<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
+     	my $ro_set=
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+ 	$rand_order_text ='
+ <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';
      }
      if ($ispage) {
          my $pagename=&escape($pagetitle);
- Line 1938  END
+ Line 2188  END
  	$url.='pagepath='.&escape($pagepath).
  	    '&amp;pagesymb='.&escape($symb).$cpinfo;
      }
-     if ($external) {
+     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.='
+     my $reinit;
-   <td class="LC_docs_entry_icon">
+     if ($crstype eq 'Community') {
-     '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
+         $reinit = &mt('(re-initialize community to access)');
-   </td>
+     } else {
-   <td class="LC_docs_entry_title">
+         $reinit = &mt('(re-initialize course to access)');
-     '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external."
+     }
-   </td>";
+     $line.='<td>';
+     if ($url=~m{/adm/coursedocs}) {
+        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
+     } elsif ($url) {
+        $line.=&Apache::loncommon::modal_link($url.'&inhibitmenu=yes','<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+     } else {
+        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
+     }
+     $line.='</td><td>';
+     if ($url=~m{/adm/coursedocs}) {
+        $line.='<a href="'.$url.'">'.$title.'</a>';
+     } elsif ($url) {
+        $line.=&Apache::loncommon::modal_link($url.'&inhibitmenu=yes',$title,600,500);
+     } else {
+        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
+     }
+     $line.=$external."</td>";
      if (($allowed) && ($folder!~/^supplemental/)) {
   	my %lt=&Apache::lonlocal::texthash(
   			      'hd' => 'Hidden',
   			      'ec' => 'URL hidden');
  	my $enctext=
- 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
  	my $hidtext=
- 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
  	$line.=(<<ENDPARMS);
    <td class="LC_docs_entry_parameter">
      $form_start
-     <label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+     <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
      $form_end
-   </td>
+     <br />
-   <td class="LC_docs_entry_parameter">
      $form_start
-     <label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+     <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
      $form_end
    </td>
-   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
+   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end<br />
+                                       $form_start $rand_order_text $form_end</td>
  ENDPARMS
      }
-     $line.="</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 1994  sub tiehash {
+ Line 2266  sub tiehash {
                  $hashtied=1;
  	    }
  	}
      }
  }
  sub untiehash {
- Line 2003  sub untiehash {
+ Line 2275  sub untiehash {
      return OK;
  }
- # --------------------------------------------------------------- check on this
  sub checkonthis {
      my ($r,$url,$level,$title)=@_;
- Line 2012  sub checkonthis {
+ Line 2285  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 2021  sub checkonthis {
+ Line 2297  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 2031  sub checkonthis {
+ Line 2307  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 2039  sub checkonthis {
+ Line 2315  sub checkonthis {
                   if (($errorcount) ||
                       ($warningcount)) {
  		     if ($errorcount) {
-                         $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
+                         $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)').'</span> ');
                       }
  		     if ($warningcount) {
                          $r->print('<span class="LC_warning">'.
- 			  $warningcount.' '.
+                           &mt('[quant,_1,warning]',$warningcount).'</span>');
- 				  &mt('warning(s)').'</span>');
                       }
                   } else {
                       $r->print('<span class="LC_success">'.&mt('ok').'</span>');
- Line 2055  sub checkonthis {
+ Line 2329  sub checkonthis {
               }
  	     my $dependencies=
                  &Apache::lonnet::metadata($url,'dependencies');
-              foreach (split(/\,/,$dependencies)) {
+              foreach my $dep (split(/\,/,$dependencies)) {
- 		 if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {
+ 		 if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) {
-                     &checkonthis($r,$_,$level+1);
+                     &checkonthis($r,$dep,$level+1);
                   }
               }
            } elsif ($result eq 'unavailable') {
               $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
            } elsif ($result eq 'not_found') {
  	      unless ($url=~/\$/) {
- 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></font>');
+ 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
  	      } else {
- 		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
+ 		  $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
  	      }
            } else {
               $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
            }
-       }
+        }
-    }
+     }
  }
- #
- # ----------------------------------------------------------------- List Symbs
+ =pod
- #
+ =item list_symbs()
+ List Symbs
+ =cut
  sub list_symbs {
      my ($r) = @_;
+     my $crstype = &Apache::loncommon::course_type();
      $r->print(&Apache::loncommon::start_page('Symb List'));
      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
+     &startContentScreen($r,'tools');
      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('<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'));
+    &startContentScreen($r,'tools');
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('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 /><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{$_}).'</span><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('<p class="LC_success">'.&mt('Done').'</p>');
- 	     &mt('Return to DOCS').'</a>');
  }
- # -------------------------------------------------------------- Check Versions
  sub devalidateversioncache {
      my $src=shift;
      &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
- Line 2137  sub devalidateversioncache {
+ Line 2419  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 $type Document Versions"));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
+     &startContentScreen($r,'tools');
      my $header='';
      my $startsel='';
      my $monthsel='';
- Line 2158  sub checkversions {
+ Line 2442  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 2177  sub checkversions {
+ Line 2461  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 2190  sub checkversions {
+ Line 2474  sub checkversions {
      if ($haschanged) {
          if (&Apache::lonnet::put('resourceversions',\%newsetversions,
  			  $env{'course.'.$env{'request.course.id'}.'.domain'},
  			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
  	    $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
  	} else {
  	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
- Line 2200  sub checkversions {
+ Line 2484  sub checkversions {
      &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 2213  sub checkversions {
+ Line 2497  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 2245  sub checkversions {
+ Line 2529  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 2254  sub checkversions {
+ Line 2538  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 2277  sub checkversions {
+ Line 2561  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 2303  ENDHEADERS
+ Line 2587  ENDHEADERS
                        '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
                        '<font size="+1">'.$currentversion.'</font>'.
                        '</span></td>'.
-                       '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
+                       '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$crstype.': '.
                        '<font size="+1">');
  # Used in course
  	    my $usedversion=$hash{'version_'.$linkurl};
- Line 2317  ENDHEADERS
+ Line 2601  ENDHEADERS
  # 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('</span></td></tr><tr><td></td>');
  	    my $lastold=1;
  	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
- Line 2331  ENDHEADERS
+ Line 2615  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 2342  ENDHEADERS
+ Line 2626  ENDHEADERS
                  $entries_per_col = $num_entries/4 + 1;
              }
              my $entries_count = 0;
              $r->print('<td valign="top"><font size="-2">');
              my $cols_output = 1;
              for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
  		my $url=$root.'.'.$prevvers.'.'.$extension;
- Line 2357  ENDHEADERS
+ Line 2641  ENDHEADERS
                      $r->print(' <a href="/adm/diff?filename='.
  			      &Apache::lonnet::clutter($root.'.'.$extension).
  			      '&versionone='.$prevvers.
- 			      '">'.&mt('Diffs').'</a>');
+ 			      '" target="diffs">'.&mt('Diffs').'</a>');
  		}
  		$r->print('</span><br />');
                  if (++$entries_count % $entries_per_col == 0) {
- Line 2375  ENDHEADERS
+ Line 2659  ENDHEADERS
  	}
      }
      $r->print('</table></form>');
-     $r->print('<h1>'.&mt('Done').'.</h1>');
+     $r->print('<p class="LC_success">'.&mt('Done').'</p>');
      &untiehash();
  }
- Line 2421  sub changewarning {
+ Line 2705  sub changewarning {
  	$message='Changes will become active for your current session after [_1], or the next time you log in.';
      }
      $r->print("\n\n".
- '<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
+ '<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><span class="LC_warning">'.
+ '" /><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'}.'</span></h3></form>'."\n\n");
+ $help{'Caching'}.'</p></form>'."\n\n");
  }
- # =========================================== Breadcrumbs for special functions
  sub init_breadcrumbs {
      my ($form,$text)=@_;
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
- 					    text=>&Apache::loncommon::course_type()." Documents",
+ 					    text=>&Apache::loncommon::course_type().' Editor',
  					    faq=>273,
  					    bug=>'Instructor Interface',
                                              help => 'Docs_Adding_Course_Doc'});
- Line 2447  sub init_breadcrumbs {
+ Line 2734  sub init_breadcrumbs {
  					    bug=>'Instructor Interface'});
  }
- # ================================================================ Main Handler
+ # subroutine to list form elements
+ sub create_list_elements {
+    my @formarr = @_;
+    my $list = '';
+    for my $button (@formarr){
+         for my $picture(keys %$button) {
+             $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;
+ }
+ #
+ # Start tabs
+ #
+ sub startContentScreen {
+     my ($r,$mode)=@_;
+     $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
+     $r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Overview').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+     my $active = '';
+ # does this user have privileges to modify docs?
+     my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+     my $onclick;
+     my $href;
+     if ($allowed) {
+         $r->print('<li '.(($mode eq 'docs')?' class="active"':'').
+                ' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Editor').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+     }
+     $r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+     $r->print('<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
+     $r->print('<li '.(($mode eq 'supdocs')?' class="active"':'').
+            '><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Documents').'</b></a></li>');
+     $r->print('</ul>');
+     $r->print('<div class="LC_DocsBox" style="clear:both;margin:0;" id="contenteditor">'
+              .'<div id="maincoursedoc" style="margin:0 0;padding:0 0">');
+     $r->print('<div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+ }
+ #
+ # End tabs
+ #
+ sub endContentScreen {
+    my ($r)=@_;
+    $r->print('</div></div></div>');
+ }
+ sub supplemental_base {
+     return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Documents'));
+ }
  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 2473  sub handler {
+ Line 2822  sub handler {
  		    'Option_Response_Simple');
      $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
  		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
-     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
+     $help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic(
  		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
-     $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
+     $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
      $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
  # does this user have privileges to modify docs
- Line 2493  sub handler {
+ Line 2842  sub handler {
        &init_breadcrumbs('versions','Check/Set Resource Versions');
        &checkversions($r);
    } elsif ($allowed && $env{'form.dumpcourse'}) {
-       &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
+       &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Documents to Construction Space');
        &dumpcourse($r);
    } elsif ($allowed && $env{'form.exportcourse'}) {
-       &init_breadcrumbs('exportcourse','Export '.&Apache::loncommon::course_type().' to IMS');
+       &init_breadcrumbs('exportcourse','IMS Export');
        &exportcourse($r);
    } else {
- # is this a standard course?
+ #
+ # Done catching special calls
+ # The whole rest is for course and supplemental documents
+ # Get the parameters that may be needed
+ #
+     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                             ['folderpath','pagepath',
+                                              'pagesymb','forcesupplement','forcestandard',
+                                              'symb','command']);
+ # standard=1: this is a "new-style" course with an uploaded map as top level
+ # standard=2: this is a "old-style" course, and there is nothing we can do
      my $standard=($env{'request.course.uri'}=~/^\/uploaded\//);
-     my $forcestandard = 0;
-     my $forcesupplement;
+ # Decide whether this should display supplemental or main content
+ # supplementalflag=1: show supplemental documents
+ # supplementalflag=0: show standard documents
+     my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
+     if (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'} eq "" || ($env{'form.pagepath'})) {
+        $supplementalflag=0;
+     }
+     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
+     if ($env{'form.forcestandard'})   { $supplementalflag=0; }
+     unless ($allowed) { $supplementalflag=1; }
+     unless ($standard) { $supplementalflag=1; }
      my $script='';
      my $showdoc=0;
+     my $addentries = {};
      my $containertag;
      my $uploadtag;
-     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- 					    ['folderpath','pagepath',
+ # Do we directly jump somewhere?
- 					     'pagesymb']);
+    if ($env{'form.command'} eq 'direct') {
+        my ($mapurl,$id,$resurl);
+        if ($env{'form.symb'} eq '') {
+            $mapurl = $env{'course.'.$env{'request.course.id'}.'.url'};
+        } else {
+            ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
+            if ($resurl=~/\.(sequence|page)$/) {
+                $mapurl=$resurl;
+            } elsif ($resurl eq 'adm/navmaps') {
+                $mapurl=$env{'course.'.$env{'request.course.id'}.'.url'};
+            }
+        }
+        my $mapresobj;
+        my $navmap = Apache::lonnavmaps::navmap->new();
+        if (ref($navmap)) {
+            $mapresobj = $navmap->getResourceByUrl($mapurl);
+        }
+        $mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1};
+        my $type=$2;
+        my $path;
+        if (ref($mapresobj)) {
+            my $pcslist = $mapresobj->map_hierarchy();
+            if ($pcslist ne '') {
+                foreach my $pc (split(/,/,$pcslist)) {
+                    next if ($pc <= 1);
+                    my $res = $navmap->getByMapPc($pc);
+                    if (ref($res)) {
+                        my $thisurl = $res->src();
+                        $thisurl=~s{^.*/([^/]+)\.\w+$}{$1};
+                        my $thistitle = $res->title();
+                        $path .= '&'.
+                                 &Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
+                                 &Apache::lonhtmlcommon::entity_encode($thistitle).
+                                 ':'.$res->randompick().
+                                 ':'.$res->randomout().
+                                 ':'.$res->encrypted().
+                                 ':'.$res->randomorder();
+                    }
+                }
+            }
+            $path .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                     &Apache::lonhtmlcommon::entity_encode($mapresobj->title()).
+                     ':'.$mapresobj->randompick().
+                     ':'.$mapresobj->randomout().
+                     ':'.$mapresobj->encrypted().
+                     ':'.$mapresobj->randomorder();
+        } else {
+            my $maptitle = &Apache::lonnet::gettitle($mapurl);
+            $path = '&default&...::::'.
+                '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
+        }
+        $path = 'default&'.
+                &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
+                $path;
+        if ($type eq 'sequence') {
+            $env{'form.folderpath'}=$path;
+            $env{'form.pagepath'}='';
+        } else {
+            $env{'form.pagepath'}=$path;
+            $env{'form.folderpath'}='';
+        }
+    }
+ # Where do we store these for when we come back?
+     my $stored_folderpath='docs_folderpath';
+     if ($supplementalflag) {
+        $stored_folderpath='docs_sup_folderpath';
+     }
+ # No folderpath, no pagepath, see if we have something stored
+     if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
+         &Apache::loncommon::restore_course_settings($stored_folderpath,
+                                               {'folderpath' => 'scalar'});
+     }
+ # If we are not allowed to make changes, all we can see are supplemental docs
+     if (!$allowed) {
+         $env{'form.pagepath'}='';
+         unless ($env{'form.folderpath'} =~ /^supplemental/) {
+             $env{'form.folderpath'} = &supplemental_base();
+         }
+     }
+ # If we still not have a folderpath, see if we can resurrect at pagepath
+     if (!$env{'form.folderpath'} && $allowed) {
+         &Apache::loncommon::restore_course_settings($stored_folderpath,
+                                               {'pagepath' => 'scalar'});
+     }
+ # Make the zeroth entry in supplemental docs page paths, so we can get to top level
+     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
+         $env{'form.folderpath'} = &supplemental_base()
+                                   .'&'.
+                                   $env{'form.folderpath'};
+     }
+ # If after all of this, we still don't have any paths, make them
+     unless (($env{'form.pagepath'}) || ($env{'form.folderpath'})) {
+        if ($supplementalflag) {
+           $env{'form.folderpath'}=&supplemental_base();
+        } else {
+           $env{'form.folderpath'}='default';
+        }
+     }
+ # Store this
+     &Apache::loncommon::store_course_settings($stored_folderpath,
+                                                 {'pagepath' => 'scalar',
+                                                  'folderpath' => 'scalar'});
      if ($env{'form.folderpath'}) {
  	my (@folderpath)=split('&',$env{'form.folderpath'});
  	$env{'form.foldername'}=&unescape(pop(@folderpath));
- Line 2521  sub handler {
+ Line 3003  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="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
+         $uploadtag =
- 	    '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($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;
-           ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
+     } else {
-            $forcestandard = 1;
+        if ($allowed) {
-        }
-        $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;
      }
  # 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(&Apache::loncommon::plainname($uname,$udom));
- Line 2557  sub handler {
+ Line 3046  sub handler {
      $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
      if ($allowed) {
- 	$script .= &editing_js($udom,$uname);
+         my @tabids;
+         if ($supplementalflag) {
+             @tabids = ('002','ee2','ff2');
+         } else {
+             @tabids = ('aa1','bb1','cc1','ff1');
+             unless ($env{'form.pagepath'}) {
+                 unshift(@tabids,'001');
+                 push(@tabids,('dd1','ee1'));
+             }
+         }
+         my $tabidstr = join("','",@tabids);
+ 	$script .= &editing_js($udom,$uname).
+                    &resize_contentdiv_js($tabidstr);
+         $addentries = {
+                         onload   => "javascript:resize_contentdiv('contentscroll','1','1');",
+                       };
      }
  # -------------------------------------------------------------------- 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();
+     unless ($showdoc) {
+         &Apache::lonhtmlcommon::add_breadcrumb({
+             href=>"/adm/coursedocs",text=>"$crstype Contents"});
+         $r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
+                                                  {'force_register' => $showdoc,
+                                                   'add_entries'    => $addentries,
+                                                  })
+                  .&Apache::loncommon::help_open_menu('','',273,'RAT')
+                  .&Apache::lonhtmlcommon::breadcrumbs(
+                      'Editing the Table of Contents for your '.$crstype,
+                      'Docs_Adding_Course_Doc')
+         );
+     } else {
+         $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
+                                                 {'force_register' => $showdoc,}));
+     }
    my %allfiles = ();
    my %codebase = ();
-   my ($upload_result,$upload_output);
+   my ($upload_result,$upload_output,$uploadphase);
    if ($allowed) {
        if (($env{'form.uploaddoc.filename'}) &&
  	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
- # Process file upload - phase one - upload and parse primary file.
+           my $context = $1;
-           $upload_result = &process_file_upload(\$upload_output,$coursenum,
+           # Process file upload - phase one - upload and parse primary file.
- 						$coursedom,\%allfiles,
+ 	  undef($hadchanges);
- 						\%codebase,$1);
+           $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
-           if ($upload_result eq 'phasetwo') {
+                                               \%allfiles,\%codebase,$context);
-               $r->print($upload_output);
+ 	  if ($hadchanges) {
-           }
+ 	      &mark_hash_old();
-       } elsif ($env{'form.phasetwo'}) {
+ 	  }
-           my %newname = ();
+           $r->print($upload_output);
-           my %origname = ();
+       } elsif ($env{'form.phase'} eq 'upload_embedded') {
-           my %attribs = ();
+           # Process file upload - phase two - upload embedded objects
-           my $updateflag = 0;
+           $uploadphase = 'check_embedded';
-           my $residx = $env{'form.newidx'};
+           my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');
-           my $primary_url = &unescape($env{'form.primaryurl'});
+           my $state = &embedded_form_elems($uploadphase,$primaryurl,
- # Process file upload - phase two - gather secondary files.
+                                            $env{'form.newidx'});
-           for (my $i=0; $i<$env{'form.phasetwo'}; $i++) {
+           my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
-               if ($env{'form.embedded_item_'.$i.'.filename'}) {
+           my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-                   my $javacodebase;
+           my ($destination,$dir_root) = &embedded_destination();
-                   $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
+           my $url_root = '/uploaded/'.$docudom.'/'.$docuname;
-                   $origname{$i} = &unescape($env{'form.embedded_orig_'.$i});
+           my $actionurl = '/adm/coursedocs';
-                   if (exists($env{'form.embedded_codebase_'.$i})) {
+           my ($result,$flag) =
-                       $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});
+               &Apache::loncommon::upload_embedded('coursedoc',$destination,
-                       $origname{$i} =~ s#^\Q$javacodebase\E/##;
+                   $docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,
-                   }
+                   $actionurl);
-                   my @attributes = ();
+           $r->print($result.&return_to_editor());
-                   if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
+       } elsif ($env{'form.phase'} eq 'check_embedded') {
-                       @attributes = split/:/,$env{'form.embedded_attrib_'.$i};
+           # Process file upload - phase three - modify references in HTML file
-                   } else {
+           $uploadphase = 'modified_orightml';
-                       @attributes = ($env{'form.embedded_attrib_'.$i});
+           my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
-                   }
+           my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-                   foreach (@attributes) {
+           my ($destination,$dir_root) = &embedded_destination();
-                       push(@{$attribs{$i}},&unescape($_));
+           $r->print(&Apache::loncommon::modify_html_refs('coursedoc',$destination,
-                   }
+                                                          $docuname,$docudom,undef,
-                   if ($javacodebase) {
+                                                          $dir_root).
-                       $codebase{$i} = $javacodebase;
+                    &return_to_editor());
-                       $codebase{$i} =~ s#/$##;
-                       $updateflag = 1;
-                   }
-               }
-               unless ($newname{$i} eq $origname{$i}) {
-                   $updateflag = 1;
-               }
-           }
- # Process file upload - phase three - modify primary file
-           if ($updateflag) {
-               my ($content,$rtncode);
-               my $updateflag = 0;
-               my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);
-               if ($getstatus eq 'ok') {
-                   foreach my $item (keys %newname) {
-                       if ($newname{$item} ne $origname{$item}) {
-                           my $attrib_regexp = '';
-                           if (@{$attribs{$item}} > 1) {
-                               $attrib_regexp = join('|',@{$attribs{$item}});
-                           } else {
-                               $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
-                       }
-                   }
- # Save edited file.
-                   my $saveresult;
-                   my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
-                   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);
-               }
-           }
        }
    }
-   unless ($showdoc ||  $upload_result eq 'phasetwo') {
+   unless ($showdoc || $uploadphase) {
  # -----------------------------------------------------------------------------
         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',
+                 'scuf' => 'External Scores (handgrade, upload, clicker)',
-                 'bull' => 'Bulletin Board',
+                 'bull' => 'Discussion Board',
-                 'mypi' => 'My Personal Info',
+                 'mypi' => 'My Personal Information Page',
-                 'grpo' => 'Group Files',
+                 'grpo' => 'Group Portfolio',
- 		'abou' => 'About User',
+                 'rost' => 'Course Roster',
-                 'imsf' => 'Import IMS package',
+ 				'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 = "<br clear='all' /><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="60" name="comment" />
+ 	$uploadtag
+ 	<input type="hidden" name="cmd" value="upload_default" />
+ 	<br />
+ 	<span class="LC_nobreak" style="float:left">
+ 	$checkbox
+ 	</span>
+ FUFORM
+     $fileuploadform .= $fileuploada.'</form>';
+ 	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 id="bb_hrule" style="width:0px;text-align:left;margin-left:0" />
+ 	$lt{'copm'}<br />
+ 	<input type="text" size="40" name="importmap" /><br />
+ 	<span class="LC_nobreak" style="float:left"><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>
+ 	</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) {
  	&update_paste_buffer($coursenum,$coursedom);
-        my $dumpbut=&dumpbutton();
-        my $exportbut=&exportbutton();
         my %lt=&Apache::lonlocal::texthash(
  					 'vc' => 'Verify Content',
  					 'cv' => 'Check/Set Resource Versions',
- Line 2695  sub handler {
+ Line 3244  sub handler {
                                           '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="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+    $uploadtag
-        }
+  </form>
+ HIDDENFORM
+     }
-        $r->print(<<ENDCOURSEVERIFY);
+ # Generate the tabs
- <form name="renameform" method="post" action="/adm/coursedocs">
+     &startContentScreen($r,($supplementalflag?'supdocs':'docs'));
-   <input type="hidden" name="title" />
-   <input type="hidden" name="cmd" />
-   <input type="hidden" name="markcopy" />
+ #
-   <input type="hidden" name="copyfolder" />
-   $containertag
+     my $savefolderpath;
- </form>
- <form name="simpleedit" method="post" action="/adm/coursedocs">
+     if ($allowed) {
-   <input type="hidden" name="importdetail" value="" />
-   $uploadtag
- </form>
- <form action="/adm/coursedocs" method="post" name="courseverify">
-   <div class="LC_docs_course_commands">
-       <div>
-         <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
-       </div>
-       <div>
-         <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
-       </div>
-         $dumpbut
-         $exportbut
-       <div>
-         <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-       </div>
-       <div>
-         <input type="hidden" name="folder" value="$env{'form.folder'}" />
-         <input type="submit" name="docslog" value="$lt{'sl'}" />
-       </div>
-   </div>
- </form>
- <div style="clear: both; height: 0px;">&nbsp;</div>
- ENDCOURSEVERIFY
-        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
- 		     &mt('Editing the Table of Contents for your '.$type)));
-     }
- # --------------------------------------------------------- Standard documents
-     $r->print('<table class="LC_docs_documents">');#border=2 cellspacing=4 cellpadding=4>');
-     if (($standard) && ($allowed) && (!$forcesupplement)) {
- 	$r->print('<tr><td class="LC_docs_document">');
- #  '<h2>'.&mt('Main Course Documents').
- #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
         my $folder=$env{'form.folder'};
-        if ($folder eq '' || $folder eq 'supplemental') {
+        if ($folder eq '' || $supplementalflag) {
             $folder='default';
- 	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
+ 	   $savefolderpath = $env{'form.folderpath'};
+ 	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
+            $uploadtag = '<input type="hidden" name="folderpath" value="'.
+ 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
         }
         my $postexec='';
         if ($folder eq 'default') {
- 	   $r->print('<script type="text/javascript">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 2777  ENDCOURSEVERIFY
+ Line 3296  ENDCOURSEVERIFY
  	    $container='page';
  	}
  	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
-        $r->print(<<ENDFORM);
- <table class="LC_docs_adddocs">
- <tr>
- <th>$lt{'uplm'}</th>
+ 	my $recoverform=(<<RFORM);
- <th>$lt{'impp'}</th>
+ 	<form action="/adm/groupsort" method="post" name="recover">
- <th>$lt{'spec'}</th>
+ 	<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
- </tr>
+ 	</form>
- <tr>
+ RFORM
- <td>
- $lt{'file'}:<br />
+ 	my $imspform=(<<IMSPFORM);
- <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	<form action="/adm/imsimportdocs" method="post" name="ims">
- <input type="file" name="uploaddoc" size="40" />
+ 	<input type="hidden" name="folder" value="$folder" />
- <br />
+ 	<a class="LC_menubuttons_link" href="javascript:makeims();">$lt{'imsf'}</a>
- $lt{'title'}:<br />
+ 	</form>
- <input type="text" size="50" name="comment" />
+ IMSPFORM
- $uploadtag
- <input type="hidden" name="cmd" value="upload_default" />
+ 	my $newnavform=(<<NNFORM);
- <br />
+ 	<form action="/adm/coursedocs" method="post" name="newnav">
- <span class="LC_nobreak">
+ 	<input type="hidden" name="active" value="cc" />
- <label>$lt{'parse'}?
+ 	$uploadtag
- <input type="checkbox" name="parserflag" />
+ 	<input type="hidden" name="importdetail"
- </label>
+ 	value="$lt{'navc'}=/adm/navmaps" />
- </span>
+ 	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
- <br />
+ 	$help{'Navigate_Content'}
- <br />
+ 	</form>
- <span class="LC_nobreak">
+ NNFORM
- <input type="submit" value="$lt{'upld'}" />
+ 	my $newsmppageform=(<<NSPFORM);
-  $help{'Uploading_From_Harddrive'}
+ 	<form action="/adm/coursedocs" method="post" name="newsmppg">
- </span>
+ 	<input type="hidden" name="active" value="cc" />
- </form>
+ 	$uploadtag
- </td>
+ 	<input type="hidden" name="importdetail" value="" />
- <td>
+ 	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
- <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+ 	$help{'Simple Page'}
- $lt{'pubd'}<br />
+ 	</form>
- $uploadtag
+ NSPFORM
- <input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
- <br />
+ 	my $newsmpproblemform=(<<NSPROBFORM);
- <span class="LC_nobreak">
+ 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
- <input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
+ 	<input type="hidden" name="active" value="cc" />
- $help{'Importing_LON-CAPA_Resource'}
+ 	$uploadtag
- </span>
+ 	<input type="hidden" name="importdetail" value="" />
- <br />
+ 	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
- <input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
+ 	$help{'Simple Problem'}
- <hr />
+ 	</form>
- <p>
- $lt{'copm'}<br />
+ NSPROBFORM
- <input type="text" size="40" name="importmap" /><br />
- <span class="LC_nobreak"><input type="button"
+ 	my $newdropboxform=(<<NDBFORM);
- onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+ 	<form action="/adm/coursedocs" method="post" name="newdropbox">
- value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
+ 	<input type="hidden" name="active" value="cc" />
- $help{'Load_Map'}</span>
+ 	$uploadtag
- </p>
+ 	<input type="hidden" name="importdetail" value="" />
- </form>
+ 	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
- <hr />
+ 	</form>
- <form action="/adm/groupsort" method="post" name="recover">
+ NDBFORM
- <input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
- </form>
+ 	my $newexuploadform=(<<NEXUFORM);
- ENDFORM
+ 	<form action="/adm/coursedocs" method="post" name="newexamupload">
-        unless ($env{'form.pagepath'}) {
+ 	<input type="hidden" name="active" value="cc" />
- 	   $r->print(<<ENDFORM);
+ 	$uploadtag
- <hr />
+ 	<input type="hidden" name="importdetail" value="" />
- <form action="/adm/coursedocs" method="post" name="newext">
+ 	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
- $uploadtag
+ 	$help{'Score_Upload_Form'}
- <input type="hidden" name="importdetail" value="" />
+ 	</form>
- <span class="LC_nobreak">
+ NEXUFORM
- <input name="newext" type="button" onClick="javascript:makenewext('newext');"
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	my $newbulform=(<<NBFORM);
- </span>
+ 	<form action="/adm/coursedocs" method="post" name="newbul">
- </form>
+ 	<input type="hidden" name="active" value="cc" />
- <br /><form action="/adm/imsimportdocs" method="post" name="ims">
+ 	$uploadtag
- <input type="hidden" name="folder" value="$folder" />
+ 	<input type="hidden" name="importdetail" value="" />
- <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+ 	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
- </form>
+ 	$help{'Bulletin Board'}
- ENDFORM
+ 	</form>
-        }
+ NBFORM
-        $r->print('</td><td>');
-        unless ($env{'form.pagepath'}) {
+ 	my $newaboutmeform=(<<NAMFORM);
- 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+ 	<form action="/adm/coursedocs" method="post" name="newaboutme">
-            $r->print(<<ENDFORM);
+ 	<input type="hidden" name="active" value="cc" />
- <br /><form action="/adm/coursedocs" method="post" name="newfolder">
+ 	$uploadtag
- <input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail"
- <input type="hidden" name="importdetail" value="" />
+ 	value="$plainname=/adm/$udom/$uname/aboutme" />
- <span class="LC_nobreak">
+ 	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
- <input name="newfolder" type="button"
+ 	$help{'My Personal Information Page'}
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	</form>
- value="$lt{'newf'}" />$help{'Adding_Folders'}
+ NAMFORM
- </span>
- </form>
+ 	my $newaboutsomeoneform=(<<NASOFORM);
- <br /><form action="/adm/coursedocs" method="post" name="newpage">
+ 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
- <input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="active" value="cc" />
- <input type="hidden" name="importdetail" value="" />
+ 	$uploadtag
- <span class="LC_nobreak">
+ 	<input type="hidden" name="importdetail" value="" />
- <input name="newpage" type="button"
+ 	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
- onClick="javascript:makenewpage(this.form,'$pageseq');"
+ 	</form>
- value="$lt{'newp'}" />$help{'Adding_Pages'}
+ NASOFORM
- </span>
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newsyl">
+ 	my $newrosterform=(<<NROSTFORM);
- $uploadtag
+ 	<form action="/adm/coursedocs" method="post" name="newroster">
- <input type="hidden" name="importdetail"
+ 	<input type="hidden" name="active" value="cc" />
- value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+ 	$uploadtag
- <span class="LC_nobreak">
+ 	<input type="hidden" name="importdetail"
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
+ 	value="$lt{'rost'}=/adm/viewclasslist" />
-  $help{'Syllabus'}
+ 	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
- </span>
+ 	$help{'Course Roster'}
- </form>
+ 	</form>
- <br /><form action="/adm/coursedocs" method="post" name="newnav">
+ NROSTFORM
- $uploadtag
- <input type="hidden" name="importdetail"
+ my $specialdocumentsform;
- value="Navigate Content=/adm/navmaps" />
+ my @specialdocumentsforma;
- <span class="LC_nobreak">
+ my $gradingform;
- <input name="newnav" type="submit" value="$lt{'navc'}" />
+ my @gradingforma;
- $help{'Navigate_Content'}
+ my $communityform;
- </span>
+ my @communityforma;
- </form>
+ my $newfolderform;
- <br /><form action="/adm/coursedocs" method="post" name="newsmppg">
+ my $newfolderb;
- $uploadtag
- <input type="hidden" name="importdetail" value="" />
+ 	my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- <span class="LC_nobreak">
- <input name="newsmppg" type="button" value="$lt{'sipa'}"
+ 	my $newpageform=(<<NPFORM);
- onClick="javascript:makesmppage();" /> $help{'Simple Page'}
+ 	<form action="/adm/coursedocs" method="post" name="newpage">
- </span>
+ 	<input type="hidden" name="folderpath" value="$path" />
- </form>
+ 	<input type="hidden" name="importdetail" value="" />
- <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">
+ 	<input type="hidden" name="active" value="cc" />
- $uploadtag
+ 	<a class="LC_menubuttons_link" href="javascript:makenewpage(document.newpage,'$pageseq');">$lt{'newp'}</a>
- <input type="hidden" name="importdetail" value="" />
+ 	$help{'Adding_Pages'}
- <span class="LC_nobreak">
+ 	</form>
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
+ NPFORM
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- </span>
- </form>
+ 	$newfolderform=(<<NFFORM);
- <br /><form action="/adm/coursedocs" method="post" name="newdropbox">
+ 	<form action="/adm/coursedocs" method="post" name="newfolder">
- $uploadtag
+ 	<input type="hidden" name="folderpath" value="$path" />
- <input type="hidden" name="importdetail" value="" />
+ 	<input type="hidden" name="importdetail" value="" />
- <span class="LC_nobreak">
+ 	<input type="hidden" name="active" value="aa" />
- <input name="newdropbox" type="button" value="$lt{'drbx'}"
+ 	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
- onClick="javascript:makedropbox();" />
+ 	</form>
- </span>
+ NFFORM
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
+ 	my $newsylform=(<<NSYLFORM);
- $uploadtag
+ 	<form action="/adm/coursedocs" method="post" name="newsyl">
- <input type="hidden" name="importdetail" value="" />
+ 	<input type="hidden" name="active" value="cc" />
- <span class="LC_nobreak">
+ 	$uploadtag
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
+ 	<input type="hidden" name="importdetail"
- onClick="javascript:makeexamupload();" />
+ 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
- $help{'Score_Upload_Form'}
+ 	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
- </span>
+ 	$help{'Syllabus'}
- </form>
- <br /><form action="/adm/coursedocs" method="post" name="newbul">
+ 	</form>
- $uploadtag
+ NSYLFORM
- <input type="hidden" name="importdetail" value="" />
- <span class="LC_nobreak">
+ 	my $newgroupfileform=(<<NGFFORM);
- <input name="newbulletin" type="button" value="$lt{'bull'}"
+ 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
- onClick="javascript:makebulboard();" />
+ 	<input type="hidden" name="active" value="cc" />
- $help{'Bulletin Board'}
+ 	$uploadtag
- </span>
+ 	<input type="hidden" name="importdetail"
- </form>
+ 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
- <br /><form action="/adm/coursedocs" method="post" name="newaboutme">
+ 	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
- $uploadtag
+ 	$help{'Group Portfolio'}
- <input type="hidden" name="importdetail"
+ 	</form>
- value="$plainname=/adm/$udom/$uname/aboutme" />
+ NGFFORM
- <span class="LC_nobreak">
+ 	@specialdocumentsforma=(
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'"  onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
- $help{'My Personal Info'}
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
- </span>
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
- </form>
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
- <br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+         );
- $uploadtag
+         $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
- <input type="hidden" name="importdetail" value="" />
- <span class="LC_nobreak">
- <input name="newaboutsomeone" type="button" value="$lt{'abou'}"
+         my @importdoc = (
- onClick="javascript:makeabout();" />
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
- </span>
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
- </form>
+         $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc)) . '<hr id="cc_hrule" style="width:0px;text-align:left;margin-left:0" />' . $fileuploadform;
- <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
- $uploadtag
+         @gradingforma=(
- <input type="hidden" name="importdetail"
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
- value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
- <span class="LC_nobreak">
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},
- <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
- $help{'Group Files'}
+         );
- </span>
+         $gradingform = &create_form_ul(&create_list_elements(@gradingforma));
- </form>
- ENDFORM
+         @communityforma=(
-        }
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
-        if ($env{'form.pagepath'}) {
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
-            $r->print(<<ENDBLOCK);
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
- <form action="/adm/coursedocs" method="post" name="newsmpproblem">
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},
- $uploadtag
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
- <input type="hidden" name="importdetail" value="" />
+         );
- <span class="LC_nobreak">
+         $communityform = &create_form_ul(&create_list_elements(@communityforma));
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- </span>
- </form>
+ my @tools = (
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
+ #	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
- $uploadtag
+ #	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
- <input type="hidden" name="importdetail" value="" />
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
- <span class="LC_nobreak">
+ 	);
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
- onClick="javascript:makeexamupload();" />
+ my %orderhash = (
- $help{'Score_Upload_Form'}
+                 'aa' => ['Import Documents',$fileuploadform],
- </span>
+                 'bb' => ['Published Resources',$simpleeditdefaultform],
- </form>
+                 'cc' => ['Grading Resources',$gradingform],
- ENDBLOCK
+ 		'ff' => ['Tools', &create_form_ul(&create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
-        }
+                 );
-        $r->print('</td></tr>'."\n".
+ unless ($env{'form.pagepath'}) {
- '</table>');
+     $orderhash{'00'} = ['Newfolder',$newfolderform];
-        $r->print('</td></tr>');
+     $orderhash{'dd'} = ['Community Resources',$communityform];
-     }
+     $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
- # ----------------------------------------------------- Supplemental documents
+ }
-     if (!$forcestandard) {
-        $r->print('<tr><td class="LC_docs_document">');
+  $hadchanges=0;
- # '<h2>'.&mt('Supplemental Course Documents').
+        unless ($supplementalflag) {
- #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
+           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
+                               $supplementalflag,\%orderhash);
+           if ($error) {
+              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+           }
+           if ($hadchanges) {
+              &mark_hash_old();
+           }
+           &changewarning($r,'');
+         }
+     }
+ # Supplemental documents start here
         my $folder=$env{'form.folder'};
-        unless ($folder=~/^supplemental/) {
+        unless ($supplementalflag) {
  	   $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_base();
- 	       &escape(&mt('Supplemental '.$type.' Documents'));
+        } elsif ($allowed) {
+ 	  $env{'form.folderpath'} = $savefolderpath;
         }
-        &editor($r,$coursenum,$coursedom,$folder,$allowed);
+        $env{'form.pagepath'} = '';
         if ($allowed) {
  	   my $folderseq=
  	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
  	       '.sequence';
  	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- 	   $r->print(<<ENDSUPFORM);
- <table class="LC_docs_adddocs"><tr>
+ 	my $supupdocformbtn = "<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}";
- <th>$lt{'upls'}</th>
+ 	my $supupdocform=(<<SUPDOCFORM);
- <th>$lt{'spec'}</th>
+ 	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
- </tr>
+ 	<input type="hidden" name="active" value="ee" />
- <tr><td>
+ 	$fileupload
- <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	<br />
- <input type="file" name="uploaddoc" size="40" />
+ 	<br />
- <br />
+ 	<span class="LC_nobreak">
- <br />
+ 	$checkbox
- <span class="LC_nobreak">
+ 	</span>
- <label>$lt{'parse'}?
+ 	<br /><br />
- <input type="checkbox" name="parserflag" />
+ 	$lt{'comment'}:<br />
- </label>
+ 	<textarea cols="50" rows="4" name="comment"></textarea>
- </span>
+ 	<br />
- <br /><br />
+ 	<input type="hidden" name="folderpath" value="$path" />
- $lt{'comment'}:<br />
+ 	<input type="hidden" name="cmd" value="upload_supplemental" />
- <textarea cols=50 rows=4 name='comment'>
+ SUPDOCFORM
- </textarea>
+ 	$supupdocform .=  &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";
- <br />
- <input type="hidden" name="folderpath" value="$path" />
+ 	my $supnewfolderform=(<<SNFFORM);
- <input type="hidden" name="cmd" value="upload_supplemental" />
+ 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
- <span class="LC_nobreak">
+ 	<input type="hidden" name="active" value="ee" />
- <input type="submit" value="$lt{'upld'}" />
+ 	<input type="hidden" name="folderpath" value="$path" />
-  $help{'Uploading_From_Harddrive'}
+ 	<input type="hidden" name="importdetail" value="" />
- </span>
+ 	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a>
- </form>
+ 	$help{'Adding_Folders'}
- </td>
+ 	</form>
- <td>
+ SNFFORM
- <form action="/adm/coursedocs" method="post" name="supnewfolder">
- <input type="hidden" name="folderpath" value="$path" />
- <input type="hidden" name="importdetail" value="" />
+ 	my $supnewextform=(<<SNEFORM);
- <span class="LC_nobreak">
+ 	<form action="/adm/coursedocs" method="post" name="supnewext">
- <input name="newfolder" type="button"
+ 	<input type="hidden" name="active" value="ff" />
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	<input type="hidden" name="folderpath" value="$path" />
- value="$lt{'newf'}" /> $help{'Adding_Folders'}
+ 	<input type="hidden" name="importdetail" value="" />
- </span>
+ 	<a class="LC_menubuttons_link" href="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'}
- </form>
+ 	</form>
- <br /><form action="/adm/coursedocs" method="post" name="supnewext">
+ SNEFORM
- <input type="hidden" name="folderpath" value="$path" />
- <input type="hidden" name="importdetail" value="" />
+ 	my $supnewsylform=(<<SNSFORM);
- <span class="LC_nobreak">
+ 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
- <input name="newext" type="button"
+ 	<input type="hidden" name="active" value="ff" />
- onClick="javascript:makenewext('supnewext');"
+ 	<input type="hidden" name="folderpath" value="$path" />
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	<input type="hidden" name="importdetail"
- </span>
+ 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
- </form>
+ 	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
- <br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
+ 	$help{'Syllabus'}
- <input type="hidden" name="folderpath" value="$path" />
+ 	</form>
- <input type="hidden" name="importdetail"
+ SNSFORM
- value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
- <span class="LC_nobreak">
+ 	my $supnewaboutmeform=(<<SNAMFORM);
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
+ 	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
- $help{'Syllabus'}
+ 	<input type="hidden" name="active" value="ff" />
- </span>
+ 	<input type="hidden" name="folderpath" value="$path" />
- </form>
+ 	<input type="hidden" name="importdetail"
- <br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
+ 	value="$plainname=/adm/$udom/$uname/aboutme" />
- <input type="hidden" name="folderpath" value="$path" />
+ 	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
- <input type="hidden" name="importdetail"
+ 	$help{'My Personal Information Page'}
- value="$plainname=/adm/$udom/$uname/aboutme" />
+ 	</form>
- <span class="LC_nobreak">
+ SNAMFORM
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
- $help{'My Personal Info'}
- </span>
+ my @specialdocs = (
- </form>
+ 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />'
- </td></tr>
+             =>$supnewsylform},
- </table></td></tr>
+ 		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />'
- ENDSUPFORM
+             =>$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 id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
+ my %suporderhash = (
+ 		'00' => ['Supnewfolder', $supnewfolderform],
+                 'ee' => ['Import Documents',$supupdocform],
+                 'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
+                 );
+         if ($supplementalflag) {
+            my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
+                                $supplementalflag,\%suporderhash);
+            if ($error) {
+               $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+            }
+         }
+     } elsif ($supplementalflag) {
+         my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
+                             $supplementalflag);
+         if ($error) {
+             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+         }
      }
-     $r->print('</table>');
+     &endContentScreen($r);
      if ($allowed) {
  	$r->print('
  <form method="post" name="extimport" action="/adm/coursedocs">
- Line 3089  ENDSUPFORM
+ Line 3648  ENDSUPFORM
  </form>');
      }
    } else {
-       unless ($upload_result eq 'phasetwo') {
+       unless ($uploadphase) {
  # -------------------------------------------------------- This is showdoc mode
            $r->print("<h1>".&mt('Uploaded Document').' - '.
  		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
- Line 3100  ENDSUPFORM
+ Line 3659  ENDSUPFORM
   }
   $r->print(&Apache::loncommon::end_page());
   return OK;
  }
+ sub embedded_form_elems {
+     my ($phase,$primaryurl,$newidx) = @_;
+     my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+     return <<STATE;
+     <input type="hidden" name="folderpath" value="$folderpath" />
+     <input type="hidden" name="cmd" value="upload_embedded" />
+     <input type="hidden" name="newidx" value="$newidx" />
+     <input type="hidden" name="phase" value="$phase" />
+     <input type="hidden" name="primaryurl" value="$primaryurl" />
+ STATE
+ }
+ sub embedded_destination {
+     my $folder=$env{'form.folder'};
+     my $destination = 'docs/';
+     if ($folder =~ /^supplemental/) {
+         $destination = 'supplemental/';
+     }
+     if (($folder eq 'default') || ($folder eq 'supplemental')) {
+         $destination .= 'default/';
+     } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
+         $destination .=  $2.'/';
+     }
+     $destination .= $env{'form.newidx'};
+     my $dir_root = '/userfiles';
+     return ($destination,$dir_root);
+ }
+ sub return_to_editor {
+     my $actionurl = '/adm/coursedocs';
+     return '<p><form name="backtoeditor" method="post" action="'.$actionurl.'" />'."\n".
+            '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" /></form>'."\n".
+            '<a href="javascript:document.backtoeditor.submit();">'.&mt('Return to Editor').
+            '</a></p>';
+ }
+ 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,$to_show) = @_;
+     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:0;">'.
+              '<ul id="navigation'.$tid.'" class="LC_TabContent">';
+     foreach my $name (reverse(sort(keys(%orderhash)))) {
+         if($name ne '00'){
+             if($activetab eq '' || $activetab ne $name){
+                $active = '';
+             }elsif($activetab eq $name){
+                $active = 'class="active"';
+             }
+             $form .= '<li style="float:right" '.$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.' style="float:right">'.${$orderhash{$name}}[1].'</li>';
+ 	}
+     }
+     $form .= '</ul>';
+     $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0; overflow: hidden; clear:right">';
+     if ($to_show ne '') {
+         $form .= '<div style="padding:0;margin:0;float:left">'.$to_show.'</div>';
+     }
+     foreach my $field (keys(%orderhash)){
+ 	if($field ne '00'){
+             if($activetab eq '' || $activetab ne $field){
+                 $active = 'style="display: none;float:left"';
+             }elsif($activetab eq $field){
+                 $active = 'style="display:block;float:left"';
+             }
+             $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 External 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_base();
      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 3117  function makenewfolder(targetform,folder
+ Line 3831  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 3141  function edittext(targetname,residx,titl
+ Line 3855  function edittext(targetname,residx,titl
  }
  function makeexamupload() {
-    var title=prompt('Listed Title for the Uploaded Score');
+    var title=prompt('$lt{"p_mxu"}');
     if (title) {
      this.document.forms.newexamupload.importdetail.value=
  	escape(title)+'=/res/lib/templates/examupload.problem';
      this.document.forms.newexamupload.submit();
- Line 3150  function makeexamupload() {
+ Line 3864  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 3159  function makesmppage() {
+ Line 3873  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 3168  function makesmpproblem() {
+ Line 3882  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 3177  function makedropbox() {
+ Line 3891  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 3186  function makebulboard() {
+ Line 3900  function makebulboard() {
  }
  function makeabout() {
-    var user=prompt("Enter user:domain for User's 'About Me' Page");
+    var user=prompt("$lt{'p_mab'}");
     if (user) {
         var comp=new Array();
         comp=user.split(':');
         if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
  	   if ((comp[0]) && (comp[1])) {
  	       this.document.forms.newaboutsomeone.importdetail.value=
- 		   'About '+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+ 		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
- 	       this.document.forms.newaboutsomeone.submit();
+        this.document.forms.newaboutsomeone.submit();
- 	   } else {
+    } else {
-                alert("Not a valid user:domain");
+        alert("$lt{'p_mab_alrt1'}");
-            }
-        } else {
-            alert("Please enter both user and domain in the format user:domain");
-        }
     }
+ } else {
+    alert("$lt{'p_mab_alrt2'}");
+ }
+ }
  }
  function makeims() {
-     var caller = document.forms.ims.folder.value;
+ var caller = document.forms.ims.folder.value;
-     var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+ var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
-     newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+ newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
-     newWindow.location.href = newlocation;
+ newWindow.location.href = newlocation;
  }
  function finishpick() {
-     var title=this.document.forms.extimport.title.value;
+ var title=this.document.forms.extimport.title.value;
-     var url=this.document.forms.extimport.url.value;
+ var url=this.document.forms.extimport.url.value;
-     var form=this.document.forms.extimport.useform.value;
+ var form=this.document.forms.extimport.useform.value;
-     var residx=this.document.forms.extimport.residx.value;
+ var residx=this.document.forms.extimport.residx.value;
-     eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
+ eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
  }
  function changename(folderpath,index,oldtitle,container,pagesymb) {
-     var title=prompt('New Title',oldtitle);
+ var title=prompt('$lt{"p_chn"}',oldtitle);
-     if (title) {
+ if (title) {
- 	this.document.forms.renameform.markcopy.value=-1;
+ this.document.forms.renameform.markcopy.value=-1;
- 	this.document.forms.renameform.title.value=title;
+ this.document.forms.renameform.title.value=title;
- 	this.document.forms.renameform.cmd.value='rename_'+index;
+ this.document.forms.renameform.cmd.value='rename_'+index;
-         if (container == 'sequence') {
+ if (container == 'sequence') {
- 	    this.document.forms.renameform.folderpath.value=folderpath;
+     this.document.forms.renameform.folderpath.value=folderpath;
-         }
+ }
-         if (container == 'page') {
+ if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
+ }
+ this.document.forms.renameform.submit();
+ }
+ }
+ function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
+ if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+ this.document.forms.renameform.markcopy.value=-1;
+ this.document.forms.renameform.cmd.value='del_'+index;
+ if (container == 'sequence') {
+     this.document.forms.renameform.folderpath.value=folderpath;
+ }
+ if (container == 'page') {
+     this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
+ }
+ this.document.forms.renameform.submit();
+ }
+ }
+ function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
+ if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
+ this.document.forms.renameform.cmd.value='cut_'+index;
+ this.document.forms.renameform.markcopy.value=index;
+ this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+ if (container == 'sequence') {
+     this.document.forms.renameform.folderpath.value=folderpath;
+ }
+ if (container == 'page') {
+     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';
+         activeTab = pageId;
+         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();
+         resize_contentdiv('contentscroll','1','0');
-     }
+ 	return false;
+ }
+ function injectData(current, hiddenField, name, value) {
+ 	currentElement = document.getElementById(hiddenField);
+ 	currentElement.name = name;
+ 	currentElement.value = value;
+ 	current.submit();
  }
- function removeres(folderpath,index,oldtitle,container,pagesymb) {
+ ENDNEWSCRIPT
-     if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
+ }
- 	this.document.forms.renameform.markcopy.value=-1;
- 	this.document.forms.renameform.cmd.value='del_'+index;
+ sub resize_contentdiv_js {
-         if (container == 'sequence') {
+     my ($tabidstr) = @_;
-             this.document.forms.renameform.folderpath.value=folderpath;
+     my $viewport_js = &Apache::loncommon::viewport_geometry_js();
+     return <<ENDRESIZESCRIPT;
+ window.onresize=resizeContentEditor;
+ var activeTab;
+ $viewport_js
+ function resize_contentdiv(scrollboxname,chkw,chkh) {
+     var scrollboxid = 'div_'+scrollboxname;
+     var scrolltableid = 'table_'+scrollboxname;
+     var scrollbox;
+     var scrolltable;
+     if (document.getElementById("contenteditor") == null) {
+         return;
+     }
+     if (document.getElementById(scrollboxid) == null) {
+         return;
+     } else {
+         scrollbox = document.getElementById(scrollboxid);
+     }
+     if (document.getElementById(scrolltableid) == null) {
+         return;
+     } else {
+         scrolltable = document.getElementById(scrolltableid);
+     }
+     init_geometry();
+     var vph = Geometry.getViewportHeight();
+     var vpw = Geometry.getViewportWidth();
+     var alltabs = ['$tabidstr'];
+     var listwchange;
+     if (chkw == 1) {
+         var contenteditorw = document.getElementById("contenteditor").offsetWidth;
+         var contentlistw;
+         var contentlistid = document.getElementById("contentlist");
+         if (contentlistid != null) {
+             contentlistw = document.getElementById("contentlist").offsetWidth;
+         }
+         var contentlistwstart = contentlistw;
+         var scrollboxw = scrollbox.offsetWidth;
+         var scrollboxscrollw = scrollbox.scrollWidth;
+         var offsetw = parseInt(vpw * 0.015);
+         var paddingw = parseInt(vpw * 0.09);
+         var minscrollboxw = 250;
+         var maxtabw = 0;
+         var actabw = 0;
+         for (var i=0; i<alltabs.length; i++) {
+             if (activeTab == alltabs[i]) {
+                 actabw = document.getElementById(alltabs[i]).offsetWidth;
+                 if (actabw > maxtabw) {
+                     maxtabw = actabw;
+                 }
+             } else {
+                 if (document.getElementById(alltabs[i]) != null) {
+                     var thistab = document.getElementById(alltabs[i]);
+                     thistab.style.visibility = 'hidden';
+                     thistab.style.display = 'block';
+                     var tabw = document.getElementById(alltabs[i]).offsetWidth;
+                     thistab.style.display = 'none';
+                     thistab.style.visibility = '';
+                     if (tabw > maxtabw) {
+                         maxtabw = tabw;
+                     }
+                 }
+             }
          }
-         if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+         if (maxtabw > 0) {
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+             var newscrollboxw;
+             if (maxtabw+paddingw+scrollboxscrollw<contenteditorw) {
+                 newscrollboxw = contenteditorw-paddingw-maxtabw;
+                 if (newscrollboxw < minscrollboxw) {
+                     newscrollboxw = minscrollboxw;
+                 }
+                 scrollbox.style.width = newscrollboxw+"px";
+                 if (newscrollboxw != scrollboxw) {
+                     var newcontentlistw = newscrollboxw-offsetw;
+                     contentlistid.style.width = newcontentlistw+"px";
+                 }
+             } else {
+                 newscrollboxw = contenteditorw-paddingw-maxtabw;
+                 if (newscrollboxw < minscrollboxw) {
+                     newscrollboxw = minscrollboxw;
+                 }
+                 scrollbox.style.width = newscrollboxw+"px";
+                 if (newscrollboxw != scrollboxw) {
+                     var newcontentlistw = newscrollboxw-offsetw;
+                     contentlistid.style.width = newcontentlistw+"px";
+                 }
+             }
+             if (newscrollboxw != scrollboxw) {
+                 var newscrolltablew = newscrollboxw+offsetw;
+                 scrolltable.style.width = newscrolltablew+"px";
+             }
          }
-         this.document.forms.renameform.submit();
-     }
- }
- function cutres(folderpath,index,oldtitle,container,pagesymb,folder) {
+         if (contentlistid.offsetWidth != contentlistwstart) {
-     if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
+             listwchange = 1;
- 	this.document.forms.renameform.cmd.value='cut_'+index;
- 	this.document.forms.renameform.markcopy.value=index;
- 	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-         if (container == 'sequence') {
-             this.document.forms.renameform.folderpath.value=folderpath;
          }
-         if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+         if (activeTab == 'cc1') {
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+             if (document.getElementById('cc_hrule') != null) {
+                 document.getElementById('cc_hrule').style.width=actabw+"px";
+             }
+         } else {
+             if (activeTab == 'bb1') {
+                 if (document.getElementById('bb_hrule') != null) {
+                     document.getElementById('bb_hrule').style.width=actabw+"px";
+                 }
+             } else {
+                 if (activeTab == 'ee2') {
+                     if (document.getElementById('ee_hrule') != null) {
+                         document.getElementById('ee_hrule').style.width=actabw+"px";
+                     }
+                 }
+             }
          }
-         this.document.forms.renameform.submit();
      }
- }
+     if ((chkh == 1) || (listwchange)) {
+         var primaryheight = document.getElementById("LC_nav_bar").offsetHeight;
+         var secondaryheight = document.getElementById("LC_secondary_menu").offsetHeight;
+         var crumbsheight = document.getElementById("LC_breadcrumbs").offsetHeight;
+         var dccidheight = document.getElementById("dccid").offsetHeight;
+         var uploadresultheight = 0;
+         if (document.getElementById("uploadfileresult") != null) {
+             uploadresultheight = document.getElementById("uploadfileresult").offsetHeight;
+         }
+         var tabbedheight = document.getElementById("tabbededitor").offsetHeight;
+         var contenteditorheight = document.getElementById("contenteditor").offsetHeight;
+         var scrollboxheight = scrollbox.offsetHeight;
+         var scrollboxscrollheight = scrollbox.scrollHeight;
+         var freevspace = vph-(primaryheight+secondaryheight+crumbsheight+dccidheight+uploadresultheight+tabbedheight+contenteditorheight);
+         var minvscrollbox = 200;
+         var offsetv = 20;
+         var newscrollboxheight;
+         if (freevspace < 0) {
+             newscrollboxheight = scrollboxheight+freevspace-offsetv;
+             if (newscrollboxheight < minvscrollbox) {
+                 newscrollboxheight = minvscrollbox;
+             }
+             scrollbox.style.height = newscrollboxheight + "px";
+         } else {
+             if (scrollboxscrollheight > scrollboxheight) {
+                 if (freevspace > offsetv) {
+                     newscrollboxheight = scrollboxheight+freevspace-offsetv;
+                     if (newscrollboxheight < minvscrollbox) {
+                         newscrollboxheight = minvscrollbox;
+                     }
+                     scrollbox.style.height = newscrollboxheight+"px";
+                 }
+             }
+         }
+         scrollboxheight = scrollbox.offsetHeight;
+         var contentlistheight = document.getElementById("contentlist").offsetHeight;
- function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
+         if (scrollboxscrollheight <= scrollboxheight) {
-     this.document.forms.renameform.markcopy.value=index;
+             if ((contentlistheight+offsetv)<scrollboxheight) {
-     this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+                 newscrollheight = contentlistheight+offsetv;
-     if (container == 'sequence') {
+                 scrollbox.style.height = newscrollheight+"px";
- 	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();
+     return;
  }
- ENDNEWSCRIPT
+ function resizeContentEditor() {
+     var timer;
+     clearTimeout(timer)
+     timer=setTimeout('resize_contentdiv("contentscroll","1","1")',500);
+ }
+ ENDRESIZESCRIPT
+     return;
  }
 ;
  __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.288
changed lines
	Added in v.1.469