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.325.2.10 and 1.467

-version 1.325.2.10, 2010/05/24 12:20:16
+version 1.467, 2011/12/04 15:51:58
  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 59  my $hadchanges;
+ Line 60  my $hadchanges;
  my %help=();
  sub mapread {
      my ($coursenum,$coursedom,$map)=@_;
      return
  Line 73  sub storemap {
        &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
  			      $map,1);
      if ($errtext) { return ($errtext,2); }
      $hadchanges=1;
      return ($errtext,0);
  }
  Line 120  sub dumpbutton {
      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 '.$crstype.' 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 '.$crstype.
+             $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;
  }
- Line 144  sub clean {
+ Line 147  sub clean {
  sub dumpcourse {
      my ($r) = @_;
      my $crstype = &Apache::loncommon::course_type();
-     $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' DOCS to Construction Space').
+     $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Documents to Construction Space').
  	      '<form name="dumpdoc" action="" method="post">');
-     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' 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 173  sub dumpcourse {
+ Line 176  sub dumpcourse {
  	    $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>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
- Line 257  sub dumpcourse {
+ Line 260  sub dumpcourse {
  	$r->print(&Apache::loncommon::end_data_table());
  	&untiehash();
  	$r->print(
-   '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype DOCS").'" /></p></form>');
+   '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Documents").'" /></p></form>');
      }
  }
- Line 265  sub dumpcourse {
+ Line 268  sub dumpcourse {
  sub exportbutton {
      my $crstype = &Apache::loncommon::course_type();
-     return '<div><input type="submit" name="exportcourse"'
+     return "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"exportcourse\", \"".&mt('IMS Export')."\")'>".&mt('IMS Export')."</a>".
-           .' value="'.&mt('IMS Export').'"'
+     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
-           .' title="'.&mt('Export '.$crstype.' to IMS Package').'" />'.
-     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
  }
- Line 279  sub exportcourse {
+ Line 280  sub exportcourse {
      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 $numprobs = 0;
      my $navmap = Apache::lonnavmaps::navmap->new();
      if (!defined($navmap)) {
          $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package').
- Line 309  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) {
- Line 330  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 358  sub exportcourse {
+ Line 362  sub exportcourse {
              } else {
                  $outcome = '<p class="LC_error">'
                            .&mt('Unfortunately you will not be able to retrieve'
-                               .' an IMS archive of this posts at this time,'
+                               .' an IMS archive of your course at this time,'
                                .' because there was a problem creating a'
                                .' manifest file.')
                            .'</p>'
- Line 368  sub exportcourse {
+ Line 372  sub exportcourse {
              }
          }
          $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package'));
-         $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
          $r->print($outcome);
          $r->print(&Apache::loncommon::end_page());
      } else {
- Line 434  sub exportcourse {
+ Line 438  sub exportcourse {
                  if (($curRes->is_sequence()) || ($curRes->is_page())) {
                      $lastcontainer = $currelem;
                      $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" />' x2)."\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" alt="" />&nbsp;'."\n";
- Line 448  sub exportcourse {
+ Line 454  sub exportcourse {
                  $display .= '&nbsp;'.$curRes->title().'</td>'."\n";
                  # Existing discussion posts?
                  if ($discussiontime{$ressymb} > 0) {
                      $boards ++;
                      $display .= '<td align="right">'
                                 .'<input type="checkbox" name="discussion" value="'.$count.'" />'
                                 .'</td>'."\n";
-                 } else {
+                 } elsif ($numdisc > 0) {
                      $display .= '<td>&nbsp;</td>'."\n";
                  }
                  $display .= &Apache::loncommon::end_data_table_row();
- Line 464  sub exportcourse {
+ Line 469  sub exportcourse {
          my $scripttag = qq|
  <script type="text/javascript">
  // <![CDATA[
  function checkAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
- Line 474  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 489  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 512  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 '.$crstype.' to IMS Package',
+ 	$r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',
-  						 $scripttag));
+ 						 $scripttag));
- 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($crstype).' to IMS content package'));
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
+         if ($numprobs > 0) {
+             $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="'.
- Line 529  function containerCheck(item) {
+ Line 542  function containerCheck(item) {
  }
  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 551  sub create_ims_store {
+ Line 564  sub create_ims_store {
      my $manifestfilename = $$tempexport.$manifest;
      if ($ims_manifest = Apache::File->new('>'.$manifestfilename)) {
          $$manifestok=1;
          print $ims_manifest
  '<?xml version="1.0" encoding="UTF-8"?>'."\n".
  '<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1"'.
  ' xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"'.
- Line 573  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 582  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 621  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 658  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.
- Line 722  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 779  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 802  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 846  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 900  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 969  sub group_import {
+ Line 1072  sub group_import {
      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 992  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 1001  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 1024  sub breadcrumbs {
+ Line 1127  sub breadcrumbs {
      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);
- Line 1032  sub breadcrumbs {
+ Line 1144  sub breadcrumbs {
  	my $url='/adm/coursedocs?folderpath='.
  	    &escape($folderpath);
  	    my $name=&unescape($foldername);
  # randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
   	    $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
  	    if ($1 ne '') {
                 $randompick=$1;
              } else {
                 $randompick=-1;
- Line 1043  sub breadcrumbs {
+ Line 1155  sub breadcrumbs {
              if ($3) { $isencrypted=1; }
  	    if ($4 ne '') { $is_random_order = 1; }
              if ($folder eq 'supplemental') {
-                 if ($allowed) {
+                 $name = &mt('Supplemental '.$crstype.' Documents');
-                     $name = &mt('Supplemental '.$crstype.' Documents');
-                 } else {
-                     $name = &mt($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,$is_random_order);
+ 					       undef, undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
  }
  sub log_docs {
- Line 1148  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',
- Line 1173  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 1224  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 1236  sub docs_change_log {
+ Line 1344  sub docs_change_log {
  	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
  	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
  		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
+ # 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 1262  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
- Line 1284  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 1301  ENDPASTE
+ Line 1411  ENDPASTE
  	if ($extension eq 'sequence' &&
  	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
  	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
- 	    $icon .= '/folder_closed.gif';
+ 	    $icon .= '/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'})));
- Line 1316  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 do_paste_from_buffer {
- Line 1386  sub do_paste_from_buffer {
+ Line 1496  sub do_paste_from_buffer {
  	    $db_name =~ s{_\d*$ }{_$now}x;
  	    my $result=&Apache::lonnet::put($db_name,\%contents,
  					    $coursedom,$coursenum);
  	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
  	    $title=&mt('Copy of').' '.$title;
  	}
      }
- Line 1400  sub do_paste_from_buffer {
+ Line 1510  sub do_paste_from_buffer {
          if ($folder =~ /^supplemental/) {
              $title = $env{'docs.markedcopy_supplemental'};
          } else {
              (undef,undef,$title) =
                  &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
          }
      } else {
- Line 1424  sub uniqueness_check {
+ Line 1534  sub uniqueness_check {
          $url=&LONCAPA::map::qtescape($url);
          if ($newurl eq $url) {
              $unique = 0;
              last;
          }
      }
      return $unique;
- Line 1450  sub update_parameter {
+ Line 1560  sub update_parameter {
  	&remember_parms($idx,$which,'set',$value);
      } else {
  	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
  	&remember_parms($idx,$which,'del');
      }
      return 1;
- Line 1467  sub handle_edit_cmd {
+ Line 1577  sub handle_edit_cmd {
      if ($cmd eq 'del') {
  	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
- 	    ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+ 	    ($url!~/$LONCAPA::assess_page_seq_re/)) {
  	    &Apache::lonnet::removeuploadedurl($url);
  	} else {
  	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
- Line 1478  sub handle_edit_cmd {
+ Line 1588  sub handle_edit_cmd {
  	&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];
- Line 1503  sub handle_edit_cmd {
+ Line 1613  sub handle_edit_cmd {
  }
  sub editor {
-     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype)=@_;
+     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
+         $supplementalflag,$orderhash)=@_;
      my $container= ($env{'form.pagepath'}) ? 'page'
  		                           : 'sequence';
- Line 1518  sub editor {
+ Line 1628  sub editor {
         	$LONCAPA::map::order[0]=$idx;
          $LONCAPA::map::resources[$idx]='';
      }
-     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
+     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
- 	&breadcrumbs($allowed,$crstype);
+ 	    &breadcrumbs($allowed,$crstype);
-     $r->print($breadcrumbtrail);
+         $r->print($breadcrumbtrail);
+     unless ($allowed) {
+         $randompick = -1;
+     }
  # ------------------------------------------------------------ Process commands
  # ---------------- if they are for this folder and user allowed to make changes
- Line 1543  sub editor {
+ Line 1657  sub editor {
  	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
  	    return $errtext if ($fatal);
  	}
  	if ($env{'form.pastemarked'}) {
              my $paste_res =
                  &do_paste_from_buffer($coursenum,$coursedom,$folder);
              if ($paste_res eq 'ok') {
                  ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
- Line 1589  sub editor {
+ Line 1703  sub editor {
  		return $errtext if ($fatal);
  	    } else {
  		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
  	    }
  	}
  	&log_differences($plain);
- Line 1599  sub editor {
+ Line 1713  sub editor {
      my $idx=0;
      my $shown=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>'.
+ 		  ($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').
  		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
  		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
- 		  '</ul></p>');
+ 		  ($is_random_order?'<li>'.&mt('random order').'</li>':'').
-     }
+ 		  '</ol>');
-     if ($randompick>=0) {
+         if ($randompick>=0) {
- 	$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
+             $r->print('<p class="LC_warning">'
-     }
+                  .&mt('Caution: this folder is set to randomly pick a subset'
-     if ($is_random_order) {
+                      .' of resources. Adding or removing resources from this'
- 	$r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>');
+                      .' folder will change the set of resources that the'
+                      .' students see, resulting in spurious or missing credit'
+                      .' for completed problems, not limited to ones you'
+                      .' modify. Do not modify the contents of this folder if'
+                      .' it is in active student use.')
+                  .'</p>'
+             );
+         }
+         if ($is_random_order) {
+             $r->print('<p class="LC_warning">'
+                  .&mt('Caution: this folder is set to randomly order its'
+                      .' contents. Adding or removing resources from this folder'
+                      .' will change the order of resources shown.')
+                  .'</p>'
+             );
+         }
+         $r->print('</div>');
      }
-     $r->print('<table class="LC_docs_editor">');
+     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]);
+         my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
- 	$name=&LONCAPA::map::qtescape($name);
+         $name=&LONCAPA::map::qtescape($name);
- 	$url=&LONCAPA::map::qtescape($url);
+         $url=&LONCAPA::map::qtescape($url);
- 	unless ($name) {  $name=(split(/\//,$url))[-1]; }
+         unless ($name) {  $name=(split(/\//,$url))[-1]; }
- 	unless ($name) { $idx++; next; }
+         unless ($name) { $idx++; next; }
- 	$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
+         $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
- 			     $coursenum,$crstype));
+                               $coursenum,$crstype);
- 	$idx++;
+         $idx++;
- 	$shown++;
+         $shown++;
      }
-     unless ($shown) {
+     &Apache::loncommon::end_data_table_count();
- 	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
+     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();
+         }
+         $to_show .= $output.' '
+                  .&Apache::loncommon::end_data_table()
+                  .'<br style="line-height:2px;" />'
+                  .&Apache::loncommon::end_scrollbox();
+     } else {
+         $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;
      }
-     $r->print("\n</table>\n");
      if ($allowed) {
+         $r->print(&generate_edit_table($tid,$orderhash,$to_show));
          &print_paste_buffer($r,$container);
+     } else {
+         $r->print($to_show);
      }
      return;
  }
- Line 1636  sub editor {
+ Line 1799  sub editor {
  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 1659  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 1670  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 1693  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') {
+                 $$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;
- 			&Apache::loncommon::ask_for_embedded_content(
+                         } else {
-                             '/adm/coursedocs',$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 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 1764  sub parse_supplemental_title {
+ Line 1924  sub parse_supplemental_title {
      }
      if (wantarray) {
  	return ($title,$foldertitle,$renametitle);
      }
      return $title;
  }
- Line 1772  sub parse_supplemental_title {
+ Line 1932  sub parse_supplemental_title {
  sub entryline {
      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 1785  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, $type, $esc_path, $path, $symb);
- Line 1803  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 1812  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="selected">('.$i.')</option>';
- Line 1854  sub entryline {
+ Line 2013  sub entryline {
  		}
  	    }
  	}
          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$
- Line 1893  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 1931  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 1946  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/});
- Line 1970  END
+ Line 2127  END
  	    } elsif ($url!~/\.(sequence|page)$/) {
  		$url='/adm/coursedocs/showdoc'.$url;
  	    }
  	} elsif ($url=~m|^/ext/|) {
  	    $url='/adm/wrapper'.$url;
  	    $external = 1;
  	}
- Line 1981  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);
  	}
- Line 1991  END
+ Line 2148  END
  	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]
- Line 2003  END
+ Line 2160  END
                                                '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="randompick_'.$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].
                                                '" />'.
- Line 2011  END
+ Line 2168  END
      	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 2031  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 {
- Line 2044  END
+ Line 2201  END
          $reinit = &mt('(re-initialize course to access)');
      }
      $line.='
-   <td class="LC_docs_entry_icon">
+   <td>
      '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
    </td>
-   <td class="LC_docs_entry_title">
+   <td>
      '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.$reinit.'</span>').$external."
    </td>";
      if (($allowed) && ($folder!~/^supplemental/)) {
- Line 2063  END
+ Line 2220  END
      $form_start
      <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="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
      $form_end
    </td>
-   <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
+   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end<br />
-   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
+                                       $form_start $rand_order_text $form_end</td>
  ENDPARMS
      }
-     $line.="</tr>";
+     $line.=&Apache::loncommon::end_data_table_row();
      return $line;
  }
- Line 2100  sub tiehash {
+ Line 2256  sub tiehash {
                  $hashtied=1;
  	    }
  	}
      }
  }
  sub untiehash {
- Line 2199  sub list_symbs {
+ Line 2355  sub list_symbs {
      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();
      if (!defined($navmap)) {
          $r->print('<h2>'.&mt('Retrieval of List Failed').'</h2>'.
- Line 2209  sub list_symbs {
+ Line 2366  sub list_symbs {
      } else {
          $r->print("<pre>\n");
          foreach my $res ($navmap->retrieveResources()) {
- 	    $r->print($res->compTitle()."\t".$res->symb()."\n");
+             $r->print($res->compTitle()."\t".$res->symb()."\n");
          }
          $r->print("\n</pre>\n");
      }
-     $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
  }
  sub verifycontent {
      my ($r) = @_;
      my $crstype = &Apache::loncommon::course_type();
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { return $loaderror; }
     $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
+    &startContentScreen($r,'tools');
     $hashtied=0;
     undef %alreadyseen;
     %alreadyseen=();
- Line 2232  sub verifycontent {
+ Line 2387  sub verifycontent {
         if ($hash{$key}=~/\.(page|sequence)$/) {
  	   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 '.$crstype.': ').
+ 			 &mt('The following sequence or page is included more than once in your '.$crstype.':').' '.
  			 &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 (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) {
- Line 2242  sub verifycontent {
+ Line 2397  sub verifycontent {
         }
     }
     &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>');
  }
- Line 2258  sub checkversions {
+ Line 2412  sub checkversions {
      my $crstype = &Apache::loncommon::course_type();
      $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
      $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
+     &startContentScreen($r,'tools');
      my $header='';
      my $startsel='';
      my $monthsel='';
- Line 2308  sub checkversions {
+ Line 2464  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 2318  sub checkversions {
+ Line 2474  sub checkversions {
      &changewarning($r,'');
      if ($env{'form.timerange'} eq 'all') {
  # show all documents
-         $header=&mt('All Documents in '.$crstype);
+ 	$header=&mt('All Documents in '.$crstype);
  	$allsel=1;
  	foreach my $key (keys(%hash)) {
  	    if ($key=~/^ids\_(\/res\/.+)$/) {
- Line 2363  sub checkversions {
+ Line 2519  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 '.$crstype,
+ 	      ('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 2435  ENDHEADERS
+ Line 2591  ENDHEADERS
  # Set version
  	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
  						      'set_version_'.$linkurl,
- 						      ('select_form_order' =>
+ 						      {'select_form_order' =>
  						       ['',1..$currentversion,'mostrecent'],
  						       '' => '',
  						       '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 2449  ENDHEADERS
+ Line 2605  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 2460  ENDHEADERS
+ Line 2616  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 2475  ENDHEADERS
+ Line 2631  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 2493  ENDHEADERS
+ Line 2649  ENDHEADERS
  	}
      }
      $r->print('</table></form>');
-     $r->print('<h1>'.&mt('Done').'.</h1>');
+     $r->print('<p class="LC_success">'.&mt('Done').'</p>');
      &untiehash();
  }
- Line 2551  sub changewarning {
+ Line 2707  sub changewarning {
      $env{'request.role'}.'" value="1" /><input type="button" value="'.
      &mt('re-initializing '.$course_type).'" onclick="reinit(this.form)" />').
  $help{'Caching'}.'</p></form>'."\n\n");
  }
- Line 2569  sub init_breadcrumbs {
+ Line 2724  sub init_breadcrumbs {
  					    bug=>'Instructor Interface'});
  }
+ # 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;
- Line 2579  sub handler {
+ Line 2793  sub handler {
      return OK if $r->header_only;
      my $crstype = &Apache::loncommon::course_type();
+ #
  # --------------------------------------------- Initialize help topics for this
      foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
  	               'Adding_External_Resource','Navigate_Content',
- Line 2597  sub handler {
+ Line 2812  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 2617  sub handler {
+ Line 2832  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','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) = &Apache::lonnet::decode_symb($env{'form.symb'});
+        if ($resurl=~/\.(sequence|page)$/) {
+            $mapurl=$resurl;
+        }
+        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('docs_folderpath',
+         &Apache::loncommon::restore_course_settings($stored_folderpath,
                                                {'folderpath' => 'scalar'});
      }
-     if (!$env{'form.folderpath'}) {
-         &Apache::loncommon::restore_course_settings('docs_folderpath',
+ # If we are not allowed to make changes, all we can see are supplemental docs
-                                               {'pagepath' => 'scalar'});
+     if (!$allowed) {
+         $env{'form.pagepath'}='';
+         unless ($env{'form.folderpath'} =~ /^supplemental/) {
+             $env{'form.folderpath'} = &supplemental_base();
+         }
      }
-     if ($env{'form.pagepath'}) {
+ # If we still not have a folderpath, see if we can resurrect at pagepath
-        $env{'form.folderpath'}='';
+     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&'.
+         $env{'form.folderpath'} = &supplemental_base()
-                                   &escape(&mt('Supplemental '.$crstype.' Documents')).'&'.
+                                   .'&'.
                                    $env{'form.folderpath'};
      }
-     &Apache::loncommon::store_course_settings('docs_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 2665  sub handler {
+ Line 2986  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 2701  sub handler {
+ Line 3029  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"
- Line 2709  sub handler {
+ Line 3052  sub handler {
                .$script."\n"
                .'// ]]>'."\n"
                .'</script>'."\n";
-     my $brcrum = [{href=>"/adm/createuser",text=>"$crstype Editor"}];
-     $r->print(&Apache::loncommon::start_page("$crstype Editor", $script,
+     # Breadcrumbs
- 				    {'force_register' => $showdoc,
+     &Apache::lonhtmlcommon::clear_breadcrumbs();
-                                      'bread_crumbs' => $brcrum}).
+     unless ($showdoc) {
- 	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
+         &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;
+           # Process file upload - phase one - upload and parse primary file.
  	  undef($hadchanges);
-           $upload_result = &process_file_upload(\$upload_output,$coursenum,
+           $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
- 						$coursedom,\%allfiles,
+                                               \%allfiles,\%codebase,$context);
- 						\%codebase,$1);
  	  if ($hadchanges) {
  	      &mark_hash_old();
  	  }
-           if ($upload_result eq 'phasetwo') {
+           $r->print($upload_output);
-               $r->print($upload_output);
+       } elsif ($env{'form.phase'} eq 'upload_embedded') {
-           }
+           # Process file upload - phase two - upload embedded objects
-       } elsif ($env{'form.phasetwo'}) {
+           $uploadphase = 'check_embedded';
-           my %newname = ();
+           my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');
-           my %origname = ();
+           my $state = &embedded_form_elems($uploadphase,$primaryurl,
-           my %attribs = ();
+                                            $env{'form.newidx'});
-           my $updateflag = 0;
+           my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
-           my $residx = $env{'form.newidx'};
+           my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-           my $primary_url = &unescape($env{'form.primaryurl'});
+           my ($destination,$dir_root) = &embedded_destination();
- # Process file upload - phase two - gather secondary files.
+           my $url_root = '/uploaded/'.$docudom.'/'.$docuname;
-           for (my $i=0; $i<$env{'form.phasetwo'}; $i++) {
+           my $actionurl = '/adm/coursedocs';
-               if ($env{'form.embedded_item_'.$i.'.filename'}) {
+           my ($result,$flag) =
-                   my $javacodebase;
+               &Apache::loncommon::upload_embedded('coursedoc',$destination,
-                   $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
+                   $docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,
-                   $origname{$i} = &unescape($env{'form.embedded_orig_'.$i});
+                   $actionurl);
-                   if (exists($env{'form.embedded_codebase_'.$i})) {
+           $r->print($result.&return_to_editor());
-                       $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});
+       } elsif ($env{'form.phase'} eq 'check_embedded') {
-                       $origname{$i} =~ s#^\Q$javacodebase\E/##;
+           # Process file upload - phase three - modify references in HTML file
-                   }
+           $uploadphase = 'modified_orightml';
-                   my @attributes = ();
+           my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
-                   if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
+           my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
-                       @attributes = split(/:/,$env{'form.embedded_attrib_'.$i});
+           my ($destination,$dir_root) = &embedded_destination();
-                   } else {
+           $r->print(&Apache::loncommon::modify_html_refs('coursedoc',$destination,
-                       @attributes = ($env{'form.embedded_attrib_'.$i});
+                                                          $docuname,$docudom,undef,
-                   }
+                                                          $dir_root).
-                   foreach my $attr (@attributes) {
+                    &return_to_editor());
-                       push(@{$attribs{$i}},&unescape($attr));
-                   }
-                   if ($javacodebase) {
-                       $codebase{$i} = $javacodebase;
-                       $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($crstype).' 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 Course Page',
                  'sipr' => 'Simple Problem',
                  'drbx' => 'Drop Box',
-                 'scuf' => 'Score Upload Form',
+                 'scuf' => 'External Scores (handgrade, upload, clicker)',
                  'bull' => 'Discussion Board',
                  'mypi' => 'My Personal Information Page',
-                 'grpo' => 'Group Portfolios',
+                 'grpo' => 'Group Portfolio',
                  'rost' => 'Course Roster',
- 		'abou' => 'About User',
+ 				'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 %tabtitles = (
+ 	my $fileupload=(<<FIUP);
-                        main => {
+ 	$lt{'file'}:<br />
-                                  Course => &mt('Main Course Documents'),
+ 	<input type="file" name="uploaddoc" size="40" />
-                                  Community => &mt('Main Community Documents'),
+ FIUP
-                                },
-                        supplemental => {
+ 	my $checkbox=(<<CHBO);
-                                  Course => &mt('Supplemental Course Documents'),
+ 	<!-- <label>$lt{'parse'}?
-                                  Community => &mt('Supplemental Community Documents'),
+ 	<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 2861  sub handler {
+ Line 3227  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&'.&escape($tabtitles{'main'}{$crstype});
+    <input type="hidden" name="markcopy" />
- 	   }
+    <input type="hidden" name="copyfolder" />
-        }
+    $containertag
-        unless ($env{'form.pagepath'}) {
+  </form>
-            $containertag = '<input type="hidden" name="folderpath" value="" />';
+  <form name="simpleedit" method="post" action="/adm/coursedocs">
-            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
+    <input type="hidden" name="importdetail" value="" />
-        }
+    $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 '.$crstype)));
-     }
- # --------------------------------------------------------- Standard documents
-     $r->print('<table class="LC_docs_documents">');
-     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 '.$crstype.' 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'},'<>&"').'" />';
         }
- Line 2935  ENDCOURSEVERIFY
+ Line 3270  ENDCOURSEVERIFY
         } else {
             #$postexec='self.close();';
         }
-        $hadchanges=0;
-        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
- 			   $upload_output,$crstype);
-        if ($error) {
- 	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-        }
-        if ($hadchanges) {
- 	   &mark_hash_old();
-        }
-        &changewarning($r,$postexec);
         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                       '.sequence';
         my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
- Line 2954  ENDCOURSEVERIFY
+ Line 3279  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" checked="checked" />
+ 	<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'}" title="$lt{imsl}" 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="$lt{'syll'}=/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="$lt{'navc'}=/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="$lt{'grpo'}=/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>
- <br /><form action="/adm/coursedocs" method="post" name="newroster">
+         @communityforma=(
- $uploadtag
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
- <input type="hidden" name="importdetail"
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
- value="$lt{'rost'}=/adm/viewclasslist" />
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
- <span class="LC_nobreak">
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},
- <input name="newroster" type="submit" value="$lt{'rost'}" />
+         {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
- $help{'Course Roster'}
+         );
- </span>
+         $communityform = &create_form_ul(&create_list_elements(@communityforma));
- </form>
- ENDFORM
-        }
-        if ($env{'form.pagepath'}) {
+ my @tools = (
-            $r->print(<<ENDBLOCK);
+ #	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
- <form action="/adm/coursedocs" method="post" name="newsmpproblem">
+ #	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
- $uploadtag
+ 	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
- <input type="hidden" name="importdetail" value="" />
+ 	);
- <span class="LC_nobreak">
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
+ my %orderhash = (
- onclick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+                 'aa' => ['Import Documents',$fileuploadform],
- </span>
+                 'bb' => ['Published Resources',$simpleeditdefaultform],
- </form>
+                 'cc' => ['Grading Resources',$gradingform],
- <br /><form action="/adm/coursedocs" method="post" name="newexamupload">
+ 		'ff' => ['Tools', &create_form_ul(&create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
- $uploadtag
+                 );
- <input type="hidden" name="importdetail" value="" />
+ unless ($env{'form.pagepath'}) {
- <span class="LC_nobreak">
+     $orderhash{'00'} = ['Newfolder',$newfolderform];
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
+     $orderhash{'dd'} = ['Community Resources',$communityform];
- onclick="javascript:makeexamupload();" />
+     $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
- $help{'Score_Upload_Form'}
+ }
- </span>
- </form>
+  $hadchanges=0;
- ENDBLOCK
+        unless ($supplementalflag) {
-        }
+           my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
-        $r->print('</td></tr>'."\n".
+                               $supplementalflag,\%orderhash);
- '</table>');
+           if ($error) {
-        $r->print('</td></tr>');
+              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-     }
+           }
- # ----------------------------------------------------- Supplemental documents
+           if ($hadchanges) {
-     if (!$forcestandard) {
+              &mark_hash_old();
-        $r->print('<tr><td class="LC_docs_document">');
+           }
- # '<h2>'.&mt('Supplemental Course Documents').
- #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
+           &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'} eq ''))) {
-           $env{'form.folderpath'} = 'supplemental&'.
+           $env{'form.folderpath'} = &supplemental_base();
-                                     &escape($tabtitles{'supplemental'}{$crstype});
+        } elsif ($allowed) {
-        }
+ 	  $env{'form.folderpath'} = $savefolderpath;
-        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
-        if ($error) {
- 	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
+        $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 3278  ENDSUPFORM
+ Line 3631  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 3289  ENDSUPFORM
+ Line 3642  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();
- Line 3300  sub editing_js {
+ Line 3773  sub editing_js {
                                            t_mnf => 'New Folder',
                                            p_mnp => 'Name of New Page',
                                            t_mnp => 'New Page',
-                                           p_mxu => 'Title for the Uploaded Score',
+                                           p_mxu => 'Title for the External Score',
-                                           p_msp => 'Name of the Simple Course Page',
+                                           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 'About Me' Page",
+                                           p_mab => "Enter user:domain for User's Personal Information Page",
-                                           p_mab2 => "About [_99]",
+                                           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',
- Line 3319  sub editing_js {
+ Line 3792  sub editing_js {
                                            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('$lt{"p_mnf"}','$lt{"t_mnf"}');
- Line 3354  function edittext(targetname,residx,titl
+ Line 3839  function edittext(targetname,residx,titl
  function makeexamupload() {
     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 3363  function makeexamupload() {
+ Line 3848  function makeexamupload() {
  function makesmppage() {
     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 3372  function makesmppage() {
+ Line 3857  function makesmppage() {
  function makesmpproblem() {
     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 3381  function makesmpproblem() {
+ Line 3866  function makesmpproblem() {
  function makedropbox() {
     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 3406  function makeabout() {
+ Line 3891  function makeabout() {
  	   if ((comp[0]) && (comp[1])) {
  	       this.document.forms.newaboutsomeone.importdetail.value=
  		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
- 	       this.document.forms.newaboutsomeone.submit();
+        this.document.forms.newaboutsomeone.submit();
- 	   } else {
+    } else {
-                alert("$lt{'p_mab_alrt1'}");
+        alert("$lt{'p_mab_alrt1'}");
-            }
-        } else {
-            alert("$lt{'p_mab_alrt2'}");
-        }
     }
+ } 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('$lt{"p_chn"}',oldtitle);
+ var title=prompt('$lt{"p_chn"}',oldtitle);
-     if (title) {
+ if (title) {
- 	this.document.forms.renameform.markcopy.value=-1;
+ this.document.forms.renameform.markcopy.value=-1;
- 	this.document.forms.renameform.title.value=title;
+ this.document.forms.renameform.title.value=title;
- 	this.document.forms.renameform.cmd.value='rename_'+index;
+ this.document.forms.renameform.cmd.value='rename_'+index;
-         if (container == 'sequence') {
+ if (container == 'sequence') {
- 	    this.document.forms.renameform.folderpath.value=folderpath;
+     this.document.forms.renameform.folderpath.value=folderpath;
-         }
+ }
-         if (container == 'page') {
+ if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
+ }
-         this.document.forms.renameform.submit();
+ this.document.forms.renameform.submit();
-     }
+ }
  }
  function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-     if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+ if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
- 	this.document.forms.renameform.markcopy.value=-1;
+ this.document.forms.renameform.markcopy.value=-1;
- 	this.document.forms.renameform.cmd.value='del_'+index;
+ this.document.forms.renameform.cmd.value='del_'+index;
-         if (container == 'sequence') {
+ if (container == 'sequence') {
-             this.document.forms.renameform.folderpath.value=folderpath;
+     this.document.forms.renameform.folderpath.value=folderpath;
-         }
+ }
-         if (container == 'page') {
+ if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
+ }
-         this.document.forms.renameform.submit();
+ this.document.forms.renameform.submit();
-     }
+ }
  }
  function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-     if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
+ if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
- 	this.document.forms.renameform.cmd.value='cut_'+index;
+ this.document.forms.renameform.cmd.value='cut_'+index;
- 	this.document.forms.renameform.markcopy.value=index;
+ this.document.forms.renameform.markcopy.value=index;
- 	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+ this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-         if (container == 'sequence') {
+ if (container == 'sequence') {
-             this.document.forms.renameform.folderpath.value=folderpath;
+     this.document.forms.renameform.folderpath.value=folderpath;
-         }
+ }
-         if (container == 'page') {
+ if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
+     this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
+     this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
+ }
-         this.document.forms.renameform.submit();
+ this.document.forms.renameform.submit();
-     }
+ }
  }
  function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
-     this.document.forms.renameform.markcopy.value=index;
+ this.document.forms.renameform.markcopy.value=index;
-     this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+ this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-     if (container == 'sequence') {
+ if (container == 'sequence') {
- 	this.document.forms.renameform.folderpath.value=folderpath;
+ this.document.forms.renameform.folderpath.value=folderpath;
-     }
+ }
-     if (container == 'page') {
+ if (container == 'page') {
- 	this.document.forms.renameform.pagepath.value=folderpath;
+ this.document.forms.renameform.pagepath.value=folderpath;
- 	this.document.forms.renameform.pagesymb.value=pagesymb;
+ this.document.forms.renameform.pagesymb.value=pagesymb;
-     }
+ }
-     this.document.forms.renameform.submit();
+ this.document.forms.renameform.submit();
+ }
+ function unselectInactive(nav) {
+ currentNav = document.getElementById(nav);
+ currentLis = currentNav.getElementsByTagName('LI');
+ for (i = 0; i < currentLis.length; i++) {
+ 	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';
+                 }
+             }
+         }
+         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();
  }
  ENDNEWSCRIPT
  }
+ sub resize_contentdiv_js {
+     my ($tabidstr) = @_;
+     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 (maxtabw > 0) {
+             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";
+             }
+         }
+         if (contentlistid.offsetWidth != contentlistwstart) {
+             listwchange = 1;
+         }
+         if (activeTab == 'cc1') {
+             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";
+                     }
+                 }
+             }
+         }
+     }
+     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;
+         if (scrollboxscrollheight <= scrollboxheight) {
+             if ((contentlistheight+offsetv)<scrollboxheight) {
+                 newscrollheight = contentlistheight+offsetv;
+                 scrollbox.style.height = newscrollheight+"px";
+             }
+         }
+     }
+     return;
+ }
+ function resizeContentEditor() {
+     var timer;
+     clearTimeout(timer)
+     timer=setTimeout('resize_contentdiv("contentscroll","1","1")',500);
+ }
+ ENDRESIZESCRIPT
+     return;
+ }
 ;
  __END__
- Line 3518  Available help topics
+ Line 4294  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

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

Removed from v.1.325.2.10
changed lines
	Added in v.1.467