--- loncom/interface/londocs.pm	2009/02/02 11:23:56	1.333
+++ loncom/interface/londocs.pm	2012/04/08 22:34:58	1.481
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.333 2009/02/02 11:23:56 muellerd Exp $
+# $Id: londocs.pm,v 1.481 2012/04/08 22:34:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,8 +26,6 @@
 # http://www.lon-capa.org/
 #
 
-
-
 package Apache::londocs;
 
 use strict;
@@ -35,11 +33,13 @@ 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;
 use Apache::lonclonecourse;
 use Apache::lonnavmaps;
+use Apache::lonnavdisplay();
 use HTML::Entities;
 use GDBM_File;
 use Apache::lonlocal;
@@ -72,7 +72,7 @@ sub storemap {
       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
 			      $map,1);
     if ($errtext) { return ($errtext,2); }
-    
+
     $hadchanges=1;
     return ($errtext,0);
 }
@@ -116,34 +116,39 @@ sub authorhosts {
 
 sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();
-    my $type = &Apache::loncommon::course_type();
+    my $crstype = &Apache::loncommon::course_type();
     if ($home+$other==0) { return ''; }
     if ($home) {
-	return '<input type="submit" name="dumpcourse" value="'.
-	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
-	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
-    } else {
-	return '<div>'.
-     &mt('Dump '.$type.
-	 ' DOCS to Construction Space: available on other servers').
-	 '</div>';
+        my $link =
+            "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"dumpcourse\", \""
+           .&mt('Dump '.$crstype.' Documents to Construction Space')
+           ."\")'>"
+           .&mt('Dump '.$crstype.' Documents to Construction Space')
+           .'</a>';
+        return
+            $link.' '
+           .&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs')
+           .'<br />';
+    } else {
+        return
+            &mt('Dump '.$crstype.' Documents to Construction Space: available on other servers');
     }
 }
 
 sub clean {
     my ($title)=@_;
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
-    return $title;	
+    return $title;
 }
 
 
 
 sub dumpcourse {
     my ($r) = @_;
-    my $type = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
-	      '<form name="dumpdoc" method="post">');
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));
+    my $crstype = &Apache::loncommon::course_type();
+    $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.' Documents to Construction Space'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) { return ''; }
     my $origcrsid=$env{'request.course.id'};
@@ -170,13 +175,13 @@ 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; } 
+		unless (-e $makepath) {
+		    unless(mkdir($makepath,0777)) { $fail=1; }
 		}
 	    }
 	    $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
@@ -254,677 +259,25 @@ sub dumpcourse {
 	$r->print(&Apache::loncommon::end_data_table());
 	&untiehash();
 	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $type DOCS").'" /></p></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Documents").'" /></p></form>');
     }
 }
 
-
-
 sub exportbutton {
-    my $type = &Apache::loncommon::course_type();
-    return '<input type="submit" name="exportcourse" value="'.
-            &mt('Export '.$type.' to IMS').'" />'.
-    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
-}
-
-
-
-sub exportcourse {
-    my $r=shift;
-    my $type = &Apache::loncommon::course_type();
-    my %discussiontime = &Apache::lonnet::dump('discussiontimes',
-                                               $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
-    my $numdisc = keys(%discussiontime);
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    if (!defined($navmap)) {
-        $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package').
-                  '<h2>IMS Export Failed</h2>'.
-                  '<div class="LC_error">'.
-                  &mt('Unable to retrieve information about course contents').
-                  '</div><a href="/adm/coursedocs">'.&mt('Return to Course Editor').'</a>');
-        &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
-        return;
-    }
-    my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
-    my $curRes;
-    my $outcome;
-
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['finishexport']);
-    if ($env{'form.finishexport'}) {
-        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['archive','discussion']);
-
-        my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
-        my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
-        if (@exportitems == 0 && @discussions == 0) {
-            $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created.  Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export';
-        } else {
-            my $now = time;
-            my %symbs;
-            my $manifestok = 0;
-            my $imsresources;
-            my $tempexport;
-            my $copyresult;
-            my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport);
-            if ($manifestok) {
-                &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,$tempexport,\$copyresult,$ims_manifest);
-                close($ims_manifest);
-
-#Create zip file in prtspool
-                my $imszipfile = '/prtspool/'.
-                $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
-                   time.'_'.rand(1000000000).'.zip';
-                my $cwd = &Cwd::getcwd();
-                my $imszip = '/home/httpd/'.$imszipfile;
-                chdir $tempexport;
-                open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
-                close(OUTPUT);
-                chdir $cwd;
-                $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
-                if ($copyresult) {
-                    $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult);
-                }
-            } else {
-                $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
-            }
-        }
-        $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
-	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
-        $r->print($outcome);
-        $r->print(&Apache::loncommon::end_page());
-    } else {
-        my $display;
-        $display = '<form name="exportdoc" method="post">'."\n";
-        $display .= &mt('Choose which items you wish to export from your '.$type.'.<br /><br />');
-        $display .= '<table border="0" cellspacing="0" cellpadding="3">'.
-                    '<tr><td><fieldset><legend>&nbsp;<b>Content items</b></legend>'.
-                    '<input type="button" value="check all" '.
-                    'onclick="javascript:checkAll(document.exportdoc.archive)" />'.
-                    '&nbsp;&nbsp;<input type="button" value="uncheck all"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset></td>'.
-                    '<td>&nbsp;</td><td>&nbsp;</td>'.
-                    '<td align="right"><fieldset><legend>&nbsp;<b>Discussion posts'.
-                    '</b></legend><input type="button" value="check all"'.
-                    ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
-                    '&nbsp;&nbsp;<input type="button" value="uncheck all"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" /></fieldset></td>'.
-                    '</tr></table>';
-        my $curRes;
-        my $depth = 0;
-        my $count = 0;
-        my $boards = 0;
-        my $startcount = 5;
-        my %parent = ();
-        my %children = ();
-        my $lastcontainer = $startcount;
-        my @bgcolors = ('#F6F6F6','#FFFFFF');
-        $display .= '<table cellspacing="0"><tr>'.
-            '<td><b>Export content item?<br /></b></td><td>&nbsp;</td><td align="right">'."\n";
-        if ($numdisc > 0) {
-            $display.='<b>Export&nbsp;discussion posts?</b>'."\n";
-        }
-        $display.='&nbsp;</td></tr>';
-        while ($curRes = $it->next()) {
-            if (ref($curRes)) {
-                $count ++;
-            }
-            if ($curRes == $it->BEGIN_MAP()) {
-                $depth++;
-                $parent{$depth} = $lastcontainer;
-            }
-            if ($curRes == $it->END_MAP()) {
-                $depth--;
-                $lastcontainer = $parent{$depth};
-            }
-            if (ref($curRes)) {
-                my $symb = $curRes->symb();
-                my $ressymb = $symb;
-                if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
-                    unless ($ressymb =~ m|adm/wrapper/adm|) {
-                        $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
-                    }
-                }
-                my $color = $count%2;
-                $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n".
-                    '<input type="checkbox" name="archive" value="'.$count.'" ';
-                if (($curRes->is_sequence()) || ($curRes->is_page())) {
-                    my $checkitem = $count + $boards + $startcount;
-                    $display .= 'onClick="javascript:propagateCheck('."'$checkitem'".')"';
-                }
-                $display .= ' />'."\n";
-                for (my $i=0; $i<$depth; $i++) {
-                    $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";
-                }
-                if ($curRes->is_sequence()) {
-                    $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";
-                    $lastcontainer = $count + $startcount + $boards;
-                } elsif ($curRes->is_page()) {
-                    $display .= '<img src="/adm/lonIcons/navmap.page.open.gif">&nbsp;'."\n";
-                    $lastcontainer = $count + $startcount + $boards;
-                }
-                my $currelem = $count+$boards+$startcount;
-                $children{$parent{$depth}} .= $currelem.':';
-                $display .= '&nbsp;'.$curRes->title().'</td>';
-                if ($discussiontime{$ressymb} > 0) {
-                    $boards ++;
-                    $currelem = $count+$boards+$startcount;
-                    $display .= '<td>&nbsp;</td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" />&nbsp;</td>'."\n";
-                } else {
-                    $display .= '<td colspan="2">&nbsp;</td>'."\n";
-                }
-            }
-        }
-        my $scripttag = qq|
-<script>
-
-function checkAll(field) {
-    if (field.length > 0) {
-        for (i = 0; i < field.length; i++) {
-            field[i].checked = true ;
-        }
-    } else {
-        field.checked = true
-    }
-}
-                                                                                
-function uncheckAll(field) {
-    if (field.length > 0) {
-        for (i = 0; i < field.length; i++) {
-            field[i].checked = false ;
-        }
-    } else {
-        field.checked = false ;
-    }
-}
-
-function propagateCheck(item) {
-    if (document.exportdoc.elements[item].checked == true) {
-        containerCheck(item)
-    }
-} 
-
-function containerCheck(item) {
-    document.exportdoc.elements[item].checked = true
-    var numitems = $count + $boards + $startcount
-    var parents = new Array(numitems)
-    for (var i=$startcount; i<numitems; i++) {
-        parents[i] = new Array
-    }
-        |;
-
-        foreach my $container (sort { $a <=> $b } (keys(%children))) {
-            my @contents = split(/:/,$children{$container});
-            for (my $i=0; $i<@contents; $i ++) {
-                $scripttag .= '    parents['.$container.']['.$i.'] = '.$contents[$i]."\n";
-            }
-        }
-
-        $scripttag .= qq|
-    if (parents[item].length > 0) {
-        for (var j=0; j<parents[item].length; j++) {
-            containerCheck(parents[item][j])
-        }
-     }   
-}
-
-</script>
-        |;
-	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
-						 $scripttag));
-	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
-	$r->print($display.'</table>'.
-                  '<p><input type="hidden" name="finishexport" value="1">'.
-                  '<input type="submit" name="exportcourse" value="'.
-                  &mt('Export '.$type.' DOCS').'" /></p></form>');
-    }
-}
-
-sub create_ims_store {
-    my ($now,$manifestok,$outcome,$tempexport) = @_;
-    $$tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
-    my $ims_manifest;
-    if (!-e $$tempexport) {
-        mkdir($$tempexport,0700);
-    }
-    $$tempexport .= '/'.$now;
-    if (!-e $$tempexport) {
-        mkdir($$tempexport,0700);
-    }
-    $$tempexport .= '/'.$env{'user.domain'}.'_'.$env{'user.name'};
-    if (!-e $$tempexport) {
-        mkdir($$tempexport,0700);
-    }
-    if (!-e "$$tempexport/resources") {
-        mkdir("$$tempexport/resources",0700);
-    }
-# open manifest file
-    my $manifest = '/imsmanifest.xml';
-    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"'.
-' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
-' identifier="MANIFEST-'.$env{'request.course.id'}.'-'.$now.'"'.
-'  xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1imscp_v1p1.xsd'.
-'  http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">'."\n".
-'  <metadata>
-    <schema></schema>
-    <imsmd:lom>
-      <imsmd:general>
-        <imsmd:identifier>'.$env{'request.course.id'}.'</imsmd:identifier>
-        <imsmd:title>
-          <imsmd:langstring xml:lang="en">'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</imsmd:langstring>
-        </imsmd:title>
-      </imsmd:general>
-    </imsmd:lom>
-  </metadata>'."\n".
-'  <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>'
-    } else {
-        $$outcome .= 'An error occurred opening the IMS manifest file.<br />'
-;
-    }
-    return $ims_manifest;
+    my $crstype = &Apache::loncommon::course_type();
+    return "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"exportcourse\", \"".&mt('IMS Export')."\")'>".&mt('IMS Export')."</a>".
+    &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
 }
 
-sub build_package {
-    my ($now,$navmap,$exportitems,$discussions,$outcome,$tempexport,$copyresult,$ims_manifest) = @_;
-# first iterator to look for dependencies
-    my $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
-    my $curRes;
-    my $count = 0;
-    my $depth = 0;
-    my $lastcontainer = 0;
-    my %parent = ();
-    my @dependencies = ();
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    while ($curRes = $it->next()) {
-        if (ref($curRes)) {
-            $count ++;
-        }
-        if ($curRes == $it->BEGIN_MAP()) {
-            $depth++;
-            $parent{$depth} = $lastcontainer;
-        }
-        if ($curRes == $it->END_MAP()) {
-            $depth--;
-            $lastcontainer = $parent{$depth};
-        }
-        if (ref($curRes)) {
-            if ($curRes->is_sequence() || $curRes->is_page()) {
-                $lastcontainer = $count;
-            }
-            if (grep(/^$count$/,@$exportitems)) {
-                &get_dependencies($exportitems,\%parent,$depth,\@dependencies);
-            }
-        }
-    }
-# second iterator to build manifest and store resources
-    $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
-    $depth = 0;
-    my $prevdepth;
-    $count = 0;
-    my $imsresources;
-    my $pkgdepth;
-    while ($curRes = $it->next()) {
-        if ($curRes == $it->BEGIN_MAP()) {
-            $prevdepth = $depth;
-            $depth++;
-        }
-        if ($curRes == $it->END_MAP()) {
-            $prevdepth = $depth;
-            $depth--;
-        }
-
-        if (ref($curRes)) {
-            $count ++;
-            if ((grep(/^$count$/,@$exportitems)) || (grep(/^$count$/,@dependencies))) {
-                my $symb = $curRes->symb();
-                my $isvisible = 'true';
-                my $resourceref;
-                if ($curRes->randomout()) {
-                    $isvisible = 'false';
-                }
-                unless ($curRes->is_sequence()) {
-                    $resourceref = 'identifierref="RES-'.$env{'request.course.id'}.'-'.$count.'"';
-                }
-                my $step = $prevdepth - $depth;
-                if (($step >= 0) && ($count > 1)) {
-                    while ($step >= 0) {
-                        print $ims_manifest "\n".'  </item>'."\n";
-                        $step --;
-                    }
-                }
-                $prevdepth = $depth;
-
-                my $itementry =
-              '<item identifier="ITEM-'.$env{'request.course.id'}.'-'.$count.
-              '" isvisible="'.$isvisible.'" '.$resourceref.'>'.
-              '<title>'.$curRes->title().'</title>';
-                print $ims_manifest "\n".$itementry;
-
-                unless ($curRes->is_sequence()) {
-                    my $content_file;
-                    my @hrefs = ();
-                    &process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport);
-                    if ($content_file) {
-                        $imsresources .= "\n".
-                     '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
-                     '" type="webcontent" href="'.$content_file.'">'."\n".
-                     '       <file href="'.$content_file.'" />'."\n";
-                        foreach my $item (@hrefs) {
-                            $imsresources .=
-                     '        <file href="'.$item.'" />'."\n";
-                        }
-                        if (grep(/^$count$/,@$discussions)) {
-                            my $ressymb = $symb;
-                            my $mode;
-                            if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
-                                unless ($ressymb =~ m|adm/wrapper/adm|) {
-                                    $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
-                                }
-                                $mode = 'board';
-                            }
-                            my %extras = (
-                                          caller => 'imsexport',
-                                          tempexport => $tempexport.'/resources',
-                                          count => $count
-                                         );
-                            my $discresult = &Apache::lonfeedback::list_discussion($mode,undef,$ressymb,\%extras);
-                        }
-                        $imsresources .= '    </resource>'."\n";
-                    }
-                }
-                $pkgdepth = $depth;
-            }
-        }
-    }
-    while ($pkgdepth > 0) {
-        print $ims_manifest "    </item>\n";
-        $pkgdepth --;
-    }
-    my $resource_text = qq|
-    </organization>
-  </organizations>
-  <resources>
-    $imsresources
-  </resources>
-</manifest>
-    |;
-    print $ims_manifest $resource_text;
-}
-
-sub get_dependencies {
-    my ($exportitems,$parent,$depth,$dependencies) = @_;
-    if ($depth > 1) {
-        if ((!grep(/^$$parent{$depth}$/,@$exportitems)) && (!grep(/^$$parent{$depth}$/,@$dependencies))) {
-            push(@{$dependencies},$$parent{$depth});
-            if ($depth > 2) {
-                &get_dependencies($exportitems,$parent,$depth-1,$dependencies);
-            }
-        }
-    }
-}
-
-sub process_content {
-    my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport) = @_;
-    my $content_type;
-    my $message;
-    my @uploads = ();
-    if ($curRes->is_sequence()) {
-        $content_type = 'sequence';
-    } elsif ($curRes->is_page()) {
-        $content_type = 'page'; # need to handle individual items in pages.
-    } elsif ($symb =~ m-public/$cdom/$cnum/syllabus$-) {
-        $content_type = 'syllabus';
-        my $contents = &Apache::imsexport::templatedpage($content_type);
-        if ($contents) {
-            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
-        }
-    } elsif ($symb =~ m-\.sequence___\d+___ext-) {
-        $content_type = 'external';
-        my $title = $curRes->title;
-        my $contents =  &Apache::imsexport::external($symb,$title);
-        if ($contents) {
-            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
-        }
-    } elsif ($symb =~ m-adm/navmaps$-) {
-        $content_type =  'navmap';
-    } elsif ($symb =~ m-adm/[^/]+/[^/]+/(\d+)/smppg$-) {
-        $content_type = 'simplepage';
-        my $contents = &Apache::imsexport::templatedpage($content_type,$1,$count,\@uploads);
-        if ($contents) {
-            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
-        }
-    } elsif ($symb =~ m-lib/templates/simpleproblem\.problem$-) {
-        $content_type = 'simpleproblem';
-        my $contents =  &Apache::imsexport::simpleproblem($symb);
-        if ($contents) {
-            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
-        }
-    } elsif ($symb =~ m-lib/templates/examupload\.problem$-) {
-        $content_type = 'examupload';
-    } elsif ($symb =~ m-adm/($match_domain)/($match_username)/(\d+)/bulletinboard$-) {
-        $content_type = 'bulletinboard';
-        my $contents =  &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2);
-        if ($contents) {
-            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
-        }
-    } elsif ($symb =~ m-adm/([^/]+)/([^/]+)/aboutme$-) {
-        $content_type = 'aboutme';
-        my $contents =  &Apache::imsexport::templatedpage($content_type,undef,$count,\@uploads,$1,$2);
-        if ($contents) {
-            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
-        }
-    } elsif ($symb =~ m-\.(sequence|page)___\d+___uploaded/$cdom/$cnum/-) {
-        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
-    } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) {
-        my $canedit = 0;
-        if ($2 eq $env{'user.domain'} && $3 eq $env{'user.name'})  {
-            $canedit= 1;
-        }
-# only include problem code where current user is author
-        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');
-    }
-    if (@uploads > 0) {
-        foreach my $item (@uploads) {
-            my $uploadmsg = '';
-            &replicate_content($cdom,$cnum,$tempexport,$item,$count,\$uploadmsg,$href,'templateupload');
-            if ($uploadmsg) {
-                $$copyresult .= $uploadmsg."\n";
-            }
-        }
-    }
-    if ($message) {
-        $$copyresult .= $message."\n";
-    }
-}
-
-sub replicate_content {
-    my ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller) = @_;
-    my ($map,$ind,$url);
-    if ($caller eq 'templateupload') {
-        $url = $symb;
-        $url =~ s#//#/#g;
-    } else { 
-        ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
-    }
-    my $content;
-    my $filename;
-    my $repstatus;
-    my $content_name;
-    if ($url =~ m-/([^/]+)$-) {
-        $filename = $1;
-        if (!-e $tempexport.'/resources') {
-            mkdir($tempexport.'/resources',0700);
-        }
-        if (!-e $tempexport.'/resources/'.$count) {
-            mkdir($tempexport.'/resources/'.$count,0700);
-        }
-        my $destination = $tempexport.'/resources/'.$count.'/'.$filename;
-        my $copiedfile;
-        if ($copiedfile = Apache::File->new('>'.$destination)) {
-            my $content;
-            if ($caller eq 'resource') {
-                my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';
-                my $filepath = &Apache::lonnet::filelocation($respath,$url);
-                $content = &Apache::lonnet::getfile($filepath);
-                if ($content eq -1) {
-                    $$message = 'Could not copy file '.$filename;
-                } else {
-                    &extract_media($url,$cdom,$cnum,\$content,$count,$tempexport,$href,$message,'resource');
-                    $repstatus = 'ok';
-                }
-            } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') {
-                my $rtncode;
-                $repstatus = &Apache::lonnet::getuploaded('GET',$url,$cdom,$cnum,\$content,$rtncode);
-                if ($repstatus eq 'ok') {
-                    if ($url =~ /\.html?$/i) {
-                        &extract_media($url,$cdom,$cnum,\$content,$count,$tempexport,$href,$message,'uploaded');
-                    }
-                } else {
-                    $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
-                }
-            } elsif ($caller eq 'noedit') {
-# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this. 
-                $repstatus = 'ok';
-                $content = 'Not the owner of this resource'; 
-            }
-            if ($repstatus eq 'ok') {
-                print $copiedfile $content;
-            }
-            close($copiedfile);
-        } else {
-            $$message = 'Could not open destination file for '.$filename."<br />\n";
-        }
-    } else {
-        $$message = 'Could not determine name of file for '.$symb."<br />\n";
-    }
-    if ($repstatus eq 'ok') {
-        $content_name = 'resources/'.$count.'/'.$filename;
-    }
-    return $content_name;
-}
-
-sub extract_media {
-    my ($url,$cdom,$cnum,$content,$count,$tempexport,$href,$message,$caller) = @_;
-    my ($dirpath,$container);
-    my %allfiles = ();
-    my %codebase = ();
-    if ($url =~ m-(.*/)([^/]+)$-) {
-        $dirpath = $1;
-        $container = $2;
-    } else {
-        $dirpath = $url;
-        $container = '';
-    }
-    &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,$content);
-    foreach my $embed_file (keys(%allfiles)) {
-        my $filename;
-        if ($embed_file =~ m#([^/]+)$#) {
-            $filename = $1;
-        } else {
-            $filename = $embed_file;
-        }
-        my $newname = 'res/'.$filename;
-        my ($rtncode,$embed_content,$repstatus);
-        my $embed_url;
-        if ($embed_file =~ m-^/-) {
-            $embed_url = $embed_file;           # points to absolute path
-        } else {
-            if ($embed_file =~ m-https?://-) {
-                next;                           # points to url
-            } else {
-                $embed_url = $dirpath.$embed_file;  # points to relative path
-            }
-        }
-        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') {
-            my $destination = $tempexport.'/resources/'.$count.'/res';
-            if (!-e "$destination") {
-                mkdir($destination,0755);
-            }
-            $destination .= '/'.$filename;
-            my $copiedfile;
-            if ($copiedfile = Apache::File->new('>'.$destination)) {
-                print $copiedfile $embed_content;
-                push(@{$href},'resources/'.$count.'/res/'.$filename);
-                my $attrib_regexp = '';
-                if (@{$allfiles{$embed_file}} > 1) {
-                    $attrib_regexp = join('|',@{$allfiles{$embed_file}});
-                } else {
-                    $attrib_regexp = $allfiles{$embed_file}[0];
-                }
-                $$content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$embed_file\E(['"]?)#$1$newname$2#gi;
-                if ($caller eq 'resource' && $container =~ /\.(problem|library)$/) {
-                    $$content =~ s#\Q$embed_file\E#$newname#gi;
-                }
-            }
-        } else {
-            $$message .= 'replication of embedded file - '.$embed_file.' in '.$url.' failed, reason -'.$rtncode."<br />\n";
-        }
-    }
-    return;
-}
-
-sub store_template {
-    my ($contents,$tempexport,$count,$content_type) = @_;
-    if ($contents) {
-        if ($tempexport) {
-            if (!-e $tempexport.'/resources') {
-                mkdir($tempexport.'/resources',0700);
-            }
-            if (!-e $tempexport.'/resources/'.$count) {
-                mkdir($tempexport.'/resources/'.$count,0700);
-            }
-            my $destination = $tempexport.'/resources/'.$count.'/'.$content_type.'.xml';
-            my $storetemplate;
-            if ($storetemplate = Apache::File->new('>'.$destination)) {
-                print $storetemplate $contents;
-                close($storetemplate);
-            }
-            if ($content_type eq 'external') {
-                return 'resources/'.$count.'/'.$content_type.'.html';
-            } else {
-                return 'resources/'.$count.'/'.$content_type.'.xml';
-            }
-        }
-    }
-}
-
-
 sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
 
     while (@files) {
 	my ($name, $url, $residx) = @{ shift(@files) };
-        if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) 
+        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".
@@ -944,7 +297,7 @@ sub group_import {
             }
         }
 	if ($url) {
-	    if (!$residx 
+	    if (!$residx
 		|| defined($LONCAPA::map::zombies[$residx])) {
 		$residx = &LONCAPA::map::getresidx($url,$residx);
 		push(@LONCAPA::map::order, $residx);
@@ -953,7 +306,7 @@ 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] = 
+	    $LONCAPA::map::resources[$residx] =
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
@@ -961,7 +314,7 @@ sub group_import {
 }
 
 sub breadcrumbs {
-    my ($where,$allowed,$type)=@_;
+    my ($allowed,$crstype)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders);
     if ($env{'form.pagepath'}) {
@@ -981,38 +334,39 @@ sub breadcrumbs {
     	my $foldername=shift(@folders);
 	if ($folderpath) {$folderpath.='&';}
 	$folderpath.=$folder.'&'.$foldername;
-	my $url='/adm/coursedocs?folderpath='.
-	    &escape($folderpath);
-	    my $name=&unescape($foldername);
-# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername	
- 	    $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
-	    if ($1 ne '') { 
-               $randompick=$1;
-            } else {
-               $randompick=-1;
-            }
-            if ($2) { $ishidden=1; }
-            if ($3) { $isencrypted=1; }
-	    if ($4 ne '') { $is_random_order = 1; }
-            if ($folder eq 'supplemental') {
-                if ($allowed) {
-                    $name = &mt('Supplemental '.$type.' Documents');
-                } else {
-                    $name = &mt($type.' Documents');
-                }
-            }
-	    &Apache::lonhtmlcommon::add_breadcrumb(
+        my $url;
+        if ($allowed) {
+            $url = '/adm/coursedocs?folderpath=';
+        } else {
+            $url = '/adm/supplemental?folderpath=';
+        }
+	$url .= &escape($folderpath);
+	my $name=&unescape($foldername);
+# randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
+ 	$name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
+	if ($1 ne '') {
+           $randompick=$1;
+        } else {
+           $randompick=-1;
+        }
+        if ($2) { $ishidden=1; }
+        if ($3) { $isencrypted=1; }
+	if ($4 ne '') { $is_random_order = 1; }
+        if ($folder eq 'supplemental') {
+            $name = &mt('Supplemental '.$crstype.' Content');
+        }
+	&Apache::lonhtmlcommon::add_breadcrumb(
 		      {'href'=>$url.$cpinfo,
 		       'title'=>$name,
-		       'text'=>'<font size="+1">'.
-			   $name.'</font>',
+		       'text'=>$name,
 		       '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 {
@@ -1100,6 +454,7 @@ 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',
@@ -1125,7 +480,7 @@ sub docs_change_log {
 	    foreach my $key (@changes) {
 		$wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
 	    }
-	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }         
+	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
 	}
         my $count = 0;
         my $time =
@@ -1176,7 +531,7 @@ 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}) {
@@ -1188,6 +543,7 @@ 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})
@@ -1214,7 +570,7 @@ sub update_paste_buffer {
 
     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
 				    $env{'form.copyfolder'});
-    
+
     return if ($fatal);
 
 # Mark for copying
@@ -1223,7 +579,7 @@ sub update_paste_buffer {
         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
 	($title) = &parse_supplemental_title($title);
     } elsif ($env{'docs.markedcopy_supplemental'}) {
-        &Apache::lonnet::delenv('docs\\.markedcopy_supplemental');
+        &Apache::lonnet::delenv('docs.markedcopy_supplemental');
     }
     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
 
@@ -1236,10 +592,11 @@ sub print_paste_buffer {
     my ($r,$container) = @_;
     return if (!defined($env{'docs.markedcopy_url'}));
 
-    $r->print(<<ENDPASTE);
-<form name="pasteform" action="/adm/coursedocs" method="post"><p>
-ENDPASTE
-    $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');
+    $r->print('<fieldset>'
+             .'<legend>'.&mt('Clipboard').'</legend>'
+             .'<form name="pasteform" action="/adm/coursedocs" method="post">'
+             .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '
+    );
 
     my $type;
     if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
@@ -1253,7 +610,7 @@ 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'})));
@@ -1268,7 +625,7 @@ 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 {
@@ -1327,7 +684,7 @@ sub do_paste_from_buffer {
     }
 # published maps can only exists once, so remove it from paste buffer when done
     if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
-	&Apache::lonnet::delenv('docs\\.markedcopy');
+	&Apache::lonnet::delenv('docs.markedcopy');
     }
     if ($url=~ m{/smppg$}) {
 	my $db_name = &Apache::lonsimplepage::get_db_name($url);
@@ -1338,7 +695,7 @@ 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; 
+	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
 	    $title=&mt('Copy of').' '.$title;
 	}
     }
@@ -1352,7 +709,7 @@ sub do_paste_from_buffer {
         if ($folder =~ /^supplemental/) {
             $title = $env{'docs.markedcopy_supplemental'};
         } else {
-            (undef,undef,$title) = 
+            (undef,undef,$title) =
                 &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
         }
     } else {
@@ -1376,7 +733,7 @@ sub uniqueness_check {
         $url=&LONCAPA::map::qtescape($url);
         if ($newurl eq $url) {
             $unique = 0;
-            last;    
+            last;
         }
     }
     return $unique;
@@ -1402,7 +759,7 @@ sub update_parameter {
 	&remember_parms($idx,$which,'set',$value);
     } else {
 	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
-	
+
 	&remember_parms($idx,$which,'del');
     }
     return 1;
@@ -1411,7 +768,6 @@ sub update_parameter {
 
 sub handle_edit_cmd {
     my ($coursenum,$coursedom) =@_;
-
     my ($cmd,$idx)=split('_',$env{'form.cmd'});
 
     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
@@ -1419,7 +775,7 @@ 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]);
@@ -1430,7 +786,7 @@ sub handle_edit_cmd {
 	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
 	splice(@LONCAPA::map::order, $idx, 1);
 
-    } elsif ($cmd eq 'up' 
+    } elsif ($cmd eq 'up'
 	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
 	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
 
@@ -1455,8 +811,8 @@ sub handle_edit_cmd {
 }
 
 sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
-
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype,
+        $supplementalflag,$orderhash,$iconpath)=@_;
     my $container= ($env{'form.pagepath'}) ? 'page'
 		                           : 'sequence';
 
@@ -1470,11 +826,17 @@ sub editor {
        	$LONCAPA::map::order[0]=$idx;
         $LONCAPA::map::resources[$idx]='';
     }
-    
-    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
-	&breadcrumbs($folder,$allowed,$type);
+
+    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
+        &breadcrumbs($allowed,$crstype);
     $r->print($breadcrumbtrail);
-    
+
+    my $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
+
+    unless ($allowed) {
+        $randompick = -1;
+    }
+
 # ------------------------------------------------------------ Process commands
 
 # ---------------- if they are for this folder and user allowed to make changes
@@ -1495,9 +857,9 @@ sub editor {
 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 	    return $errtext if ($fatal);
 	}
-	    
+
 	if ($env{'form.pastemarked'}) {
-            my $paste_res = 
+            my $paste_res =
                 &do_paste_from_buffer($coursenum,$coursedom,$folder);
             if ($paste_res eq 'ok') {
                 ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
@@ -1541,7 +903,7 @@ sub editor {
 		return $errtext if ($fatal);
 	    } else {
 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
-		
+
 	    }
 	}
 	&log_differences($plain);
@@ -1551,36 +913,98 @@ sub editor {
     my $idx=0;
     my $shown=0;
     if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
-	$r->print('<p>'.&mt('Parameters').':<ul>'.
-		  ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
+	$r->print('<div class="LC_Box">'.
+          '<ol class="LC_docs_parameters"><li class="LC_docs_parameters_title">'.&mt('Parameters:').'</li>'.
+		  ($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').
 		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
 		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
-		  '</ul></p>');
-    }                                                                                                     
-    if ($randompick>=0) {
-	$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
-    }
-    if ($is_random_order) {
-	$r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>');
+		  ($is_random_order?'<li>'.&mt('random order').'</li>':'').
+		  '</ol>');
+        if ($randompick>=0) {
+            $r->print('<p class="LC_warning">'
+                 .&mt('Caution: this folder is set to randomly pick a subset'
+                     .' of resources. Adding or removing resources from this'
+                     .' folder will change the set of resources that the'
+                     .' students see, resulting in spurious or missing credit'
+                     .' for completed problems, not limited to ones you'
+                     .' modify. Do not modify the contents of this folder if'
+                     .' it is in active student use.')
+                 .'</p>'
+            );
+        }
+        if ($is_random_order) {
+            $r->print('<p class="LC_warning">'
+                 .&mt('Caution: this folder is set to randomly order its'
+                     .' contents. Adding or removing resources from this folder'
+                     .' will change the order of resources shown.')
+                 .'</p>'
+            );
+        }
+        $r->print('</div>');
     }
-    $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]);
-	$name=&LONCAPA::map::qtescape($name);
-	$url=&LONCAPA::map::qtescape($url);
-	unless ($name) {  $name=(split(/\//,$url))[-1]; }
-	unless ($name) { $idx++; next; }
-	$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
-			     $coursenum));
-	$idx++;
-	$shown++;
+        my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+        $name=&LONCAPA::map::qtescape($name);
+        $url=&LONCAPA::map::qtescape($url);
+        unless ($name) {  $name=(split(/\//,$url))[-1]; }
+        unless ($name) { $idx++; next; }
+        $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
+                              $coursenum,$crstype);
+        $idx++;
+        $shown++;
     }
-    unless ($shown) {
-	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
+    &Apache::loncommon::end_data_table_count();
+    
+    if ($shown) {
+        $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll')
+                  .&Apache::loncommon::start_data_table(undef,'contentlist');
+        if ($allowed) {
+            $to_show .= &Apache::loncommon::start_data_table_header_row()
+                     .'<th colspan="2">'.&mt('Move').'</th>'
+                     .'<th>'.&mt('Actions').'</th>'
+                     .'<th colspan="2">'.&mt('Document').'</th>';
+            if ($folder !~ /^supplemental/) {
+                $to_show .= '<th colspan="4">'.&mt('Settings').'</th>';
+            }
+            $to_show .= &Apache::loncommon::end_data_table_header_row();
+        }
+        $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,$iconpath,$jumpto));
         &print_paste_buffer($r,$container);
+    } else {
+        if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+            #Function Box for Supplemental Content for users with mdc priv.
+            my $funcname = &mt('Folder Editor');
+            $r->print(
+                &Apache::loncommon::head_subbox(
+                    &Apache::lonhtmlcommon::start_funclist().
+                    &Apache::lonhtmlcommon::add_item_funclist(
+                        '<a href="/adm/coursedocs?command=direct&forcesupplement=1&'.
+                        'supppath='.&HTML::Entities::encode($env{'form.folderpath'}).'">'.
+                        '<img src="/res/adm/pages/docs.png" alt="'.$funcname.'" class="LC_icon" />'.
+                        '<span class="LC_menubuttons_inline_text">'.$funcname.'</span></a>').
+                          &Apache::lonhtmlcommon::end_funclist()));
+        }
+        $r->print($to_show);
     }
     return;
 }
@@ -1588,11 +1012,10 @@ sub editor {
 sub process_file_upload {
     my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
 # upload a file, if present
-    my $parseaction;
-   if ($env{'form.parserflag'}) {
+    my ($parseaction,$showupload,$nextphase,$mimetype);
+    if ($env{'form.parserflag'}) {
         $parseaction = 'parse';
     }
-    my $phase_status;
     my $folder=$env{'form.folder'};
     if ($folder eq '') {
         $folder='default';
@@ -1611,7 +1034,8 @@ 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/) {
@@ -1622,13 +1046,23 @@ sub process_file_upload {
         } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
             $destination .=  $2.'/';
         }
-# this is for a course, not a user, so set coursedoc flag
-# probably the only place in the system where this should be "1"
+# this is for a course, not a user, so set context to coursedoc.
         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);
@@ -1645,51 +1079,85 @@ sub process_file_upload {
         ($errtext,$fatal)=&storemap($coursenum,$coursedom,
 				    $folder.'.'.$container);
         if ($fatal) {
-            $$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';
-            return 'failed';
+            $$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>';
+            return;
         } else {
-            if ($parseaction eq 'parse') {
-                my $total_embedded = keys(%{$allfiles});
+            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 $state = '
-   <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
-   <input type="hidden" name="cmd" value="upload_embedded" />
-   <input type="hidden" name="newidx" value="'.$newidx.'" />
-   <input type="hidden" name="primaryurl" value="'.&escape($url).'" />
-   <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
-		    $phase_status = 'phasetwo';
-
-                    $$upload_output .= 
-			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
-			&Apache::loncommon::ask_for_embedded_content(
-                            '/adm/coursedocs',$state,$allfiles,$codebase);
+                    my $uploadphase = 'upload_embedded';
+                    my $primaryurl = &HTML::Entities::encode($url,'<>&"');
+		    my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx); 
+                    my ($embedded,$num) = 
+                        &Apache::loncommon::ask_for_embedded_content(
+                            '/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url});
+                    if ($embedded) {
+                        if ($num) {
+                            $$upload_output .=
+			         '<p>'.&mt('This file contains embedded multimedia objects, which need to be uploaded.').'</p>'.$embedded;
+                            $nextphase = $uploadphase;
+                        } else {
+                            $$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>';
+            } elsif (&Apache::loncommon::is_archive_file($mimetype)) {
+                $nextphase = 'decompress_uploaded';
+                my $position = scalar(@LONCAPA::map::order)-1;
+                my $noextract = &return_to_editor();
+                my $archiveurl = &HTML::Entities::encode($url,'<>&"');
+                my %archiveitems = (
+                    folderpath => $env{'form.folderpath'},
+                    pagepath   => $env{'form.pagepath'},
+                    cmd        => $nextphase,
+                    newidx     => $newidx,
+                    position   => $position,
+                    phase      => $nextphase,
+                    comment    => $comment,
+                );
+                my ($destination,$dir_root) = &embedded_destination($coursenum,$coursedom);
+                my @current = &get_dir_list($url,$coursenum,$coursedom,$newidx); 
+                $$upload_output = $showupload.
+                                  &Apache::loncommon::decompress_form($mimetype,
+                                      $archiveurl,'/adm/coursedocs',$noextract,
+                                      \%archiveitems,\@current);
             }
         }
     }
-    return $phase_status;
-}
-
-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.'/';
+    return $nextphase;
+}
+
+sub get_dir_list {
+    my ($url,$coursenum,$coursedom,$newidx) = @_;
+    my ($destination,$dir_root) = &embedded_destination();
+    my ($dirlistref,$listerror) =  
+        &Apache::lonnet::dirlist("$dir_root/$destination/$newidx",$coursedom,$coursenum,1);
+    my @dir_lines;
+    my $dirptr=16384;
+    if (ref($dirlistref) eq 'ARRAY') {
+        foreach my $dir_line (sort
+                          {
+                              my ($afile)=split('&',$a,2);
+                              my ($bfile)=split('&',$b,2);
+                              return (lc($afile) cmp lc($bfile));
+                          } (@{$dirlistref})) {
+            my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16);
+            $filename =~ s/\s+$//;
+            next if ($filename =~ /^\.\.?$/); 
+            my $isdir = 0;
+            if ($dirptr&$testdir) {
+                $isdir = 1;
+            }
+            push(@dir_lines, [$filename,$dom,$isdir,$size,$mtime,$obs]);
+        }
     }
-    $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;
+    return @dir_lines;
 }
 
 sub is_supplemental_title {
@@ -1710,20 +1178,20 @@ sub parse_supplemental_title {
 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
 	my $name =  &Apache::loncommon::plainname($uname,$udom);
 	$name = &HTML::Entities::encode($name,'"<>&\'');
+        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
 	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
 	    $name.': <br />'.$foldertitle;
     }
     if (wantarray) {
 	return ($title,$foldertitle,$renametitle);
-    } 
+    }
     return $title;
 }
 
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
-
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
@@ -1736,13 +1204,13 @@ sub entryline {
     }
 
     my $orderidx=$LONCAPA::map::order[$index];
-    
+
 
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
     $renametitle=~s/ /%20/g;
-    my $line='<tr>';
-    my ($form_start,$form_end);
+    my $line=&Apache::loncommon::start_data_table_row();
+    my ($form_start,$form_end,$form_common);
 # Edit commands
     my ($container, $type, $esc_path, $path, $symb);
     if ($env{'form.folderpath'}) {
@@ -1754,7 +1222,7 @@ 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'});
     }
@@ -1762,20 +1230,19 @@ sub entryline {
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
-	if (($folder!~/^supplemental/) &&
-	    ($#LONCAPA::map::order>0) && 
+	if (($#LONCAPA::map::order>0) &&
 	    ((split(/\:/,
-	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1] 
-	     ne '') && 
+	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
+	     ne '') &&
 	    ((split(/\:/,
-	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1] 
+	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]
 	     ne '')) {
 	    $selectbox=
 		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
-		'<select name="newpos" onChange="this.form.submit()">';
+		'<select name="newpos" onchange="this.form.submit()">';
 	    for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
 		if ($i==$incindex) {
-		    $selectbox.='<option value="" selected="1">('.$i.')</option>';
+		    $selectbox.='<option value="" selected="selected">('.$i.')</option>';
 		} else {
 		    $selectbox.='<option value="'.$i.'">'.$i.'</option>';
 		}
@@ -1805,13 +1272,13 @@ sub entryline {
 		}
 	    }
 	}
-        if ($url=~/^\/res\/lib\/templates\//) { 
-           $nocopy=1; 
+        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$
@@ -1834,8 +1301,10 @@ ENDCOPY
 <a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
 ENDCUT
         }
-	$form_start = (<<END);
-   <form  action="/adm/coursedocs" method="post">
+	$form_start = '
+   <form action="/adm/coursedocs" method="post">
+';
+        $form_common=(<<END);
    <input type="hidden" name="${type}path" value="$path" />
    <input type="hidden" name="${type}symb" value="$symb" />
    <input type="hidden" name="setparms" value="$orderidx" />
@@ -1844,21 +1313,20 @@ END
         $form_end = '</form>';
 	$line.=(<<END);
 <td>
-   <table class="LC_docs_entry_move">
-      <tr>
-         <td>
-            <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
-         </td>
-      </tr>
-      <tr>
-        <td>
-           <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
-        </td>
-      </tr>
-    </table>
+<div class="LC_docs_entry_move">
+  <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>
+</div>
+<div class="LC_docs_entry_move">
+  <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>
+</div>
 </td>
 <td>
    $form_start
+   $form_common
    $selectbox
    $form_end
 </td>
@@ -1881,24 +1349,30 @@ END
     my $pagearg;
     my $pagefile;
     if ($uploaded) {
-	if ($extension eq 'sequence') {
-	    $icon=$iconpath.'/folder_closed.gif';
-	    $url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/;
-	    $url='/adm/coursedocs?';
-	    $folderarg=$1;
-	    $isfolder=1;
-        } elsif ($extension eq 'page') {
-            $icon=$iconpath.'/page.gif';
-            $url=~/\Q$coursenum\E\/([\/\w]+)\.page$/;
-            $pagearg=$1;
-            $url='/adm/coursedocs?';
-            $ispage=1;
+        if (($extension eq 'sequence') || ($extension eq 'page')) {
+            $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/;
+            my $containerarg = $1;
+	    if ($extension eq 'sequence') {
+	        $icon=$iconpath.'navmap.folder.closed.gif';
+                $folderarg=$containerarg;
+                $isfolder=1;
+            } else {
+                $icon=$iconpath.'page.gif';
+                $pagearg=$containerarg;
+                $ispage=1;
+            }
+            if ($allowed) {
+                $url='/adm/coursedocs?';
+            } else {
+                $url='/adm/supplemental?';
+            }
 	} else {
 	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
 	}
     }
-    
+
     my $orig_url = $url;
+    $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(
@@ -1920,7 +1394,7 @@ END
 	    } elsif ($url!~/\.(sequence|page)$/) {
 		$url='/adm/coursedocs/showdoc'.$url;
 	    }
-	} elsif ($url=~m|^/ext/|) { 
+	} elsif ($url=~m|^/ext/|) {
 	    $url='/adm/wrapper'.$url;
 	    $external = 1;
 	}
@@ -1931,17 +1405,17 @@ END
         }
 	if ($container eq 'page') {
 	    my $symb=$env{'form.pagesymb'};
-	    	    
+
 	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
 	}
     }
-    my ($parameterset,$rand_order_text) = ('&nbsp;', '&nbsp;');
+    my ($rand_pick_text,$rand_order_text);
     if ($isfolder || $extension eq 'sequence') {
 	my $foldername=&escape($foldertitle);
 	my $folderpath=$env{'form.folderpath'};
 	if ($folderpath) { $folderpath.='&' };
-# Append randompick number, hidden, and encrypted with ":" to foldername, 
+# 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]
@@ -1952,16 +1426,27 @@ END
                                                .':'.((&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randomorder'))[0]=~/^yes$/i);
 	$url.='folderpath='.&escape($folderpath).$cpinfo;
-	$parameterset='<label>'.&mt('Randomly Pick: ').
-	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
-	    (&LONCAPA::map::getparameter($orderidx,
-                                              'parameter_randompick'))[0].
-                                              '" />'.
-'<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
+        my $rpicknum = (&LONCAPA::map::getparameter($orderidx,
+                                                   'parameter_randompick'))[0];
+        my $rpckchk;
+        if ($rpicknum) {
+            $rpckchk = ' checked="checked"';
+        }
+        my $formname = 'edit_rpick_'.$orderidx;
+	$rand_pick_text = 
+'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
+$form_common."\n".
+'<span class="LC_nobreak"><label><input type="checkbox" name="randpickon_'.$orderidx.'" id="rpick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="randompick_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" />';
+        if ($rpicknum ne '') {
+            $rand_pick_text .= ':&nbsp;<a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>';
+        }
+        $rand_pick_text .= '</span></form>';
     	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>';   
+	$rand_order_text = 
+$form_start.
+$form_common.'
+<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></form>';
     }
     if ($ispage) {
         my $pagename=&escape($pagetitle);
@@ -1981,43 +1466,64 @@ END
 	$url.='pagepath='.&escape($pagepath).
 	    '&amp;pagesymb='.&escape($symb).$cpinfo;
     }
-    if ($external) {
+    if (($external) && ($allowed)) {
 	my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
 	$external = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>';
     } else {
 	undef($external);
     }
-    $line.='
-  <td class="LC_docs_entry_icon">
-    '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
-  </td>
-  <td class="LC_docs_entry_title">
-    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external."
-  </td>";
+    my $reinit;
+    if ($crstype eq 'Community') {
+        $reinit = &mt('(re-initialize community to access)');
+    } else {
+        $reinit = &mt('(re-initialize course to access)');
+    }  
+    $line.='<td>';
+    if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
+       $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
+    } elsif ($url) {
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
+                                             '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+    } else {
+       $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
+    }
+    $line.='</td><td>';
+    if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) {
+       $line.='<a href="'.$url.'">'.$title.'</a>';
+    } elsif ($url) {
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
+                                             $title,600,500);
+    } else {
+       $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
+    }
+    $line.=$external."</td>";
+    $rand_pick_text = '&nbsp;' if ($rand_pick_text eq '');
+    $rand_order_text = '&nbsp;' if ($rand_order_text eq '');
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
  			      'ec' => 'URL hidden');
 	my $enctext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
+	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
 	my $hidtext=
-	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
+	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
 	$line.=(<<ENDPARMS);
   <td class="LC_docs_entry_parameter">
     $form_start
-    <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
+    $form_common
+    <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
     $form_end
-  </td>
-  <td class="LC_docs_entry_parameter">
+    <br />
     $form_start
-    <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+    $form_common
+    <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
     $form_end
   </td>
-  <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
-  <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
+  <td class="LC_docs_entry_parameter">$rand_pick_text<br />
+                                      $rand_order_text</td>
 ENDPARMS
     }
-    $line.="</tr>";
+    $line.=&Apache::loncommon::end_data_table_row();
     return $line;
 }
 
@@ -2044,7 +1550,7 @@ sub tiehash {
                 $hashtied=1;
 	    }
 	}
-    }    
+    }
 }
 
 sub untiehash {
@@ -2093,7 +1599,7 @@ sub checkonthis {
                  if (($errorcount) ||
                      ($warningcount)) {
 		     if ($errorcount) {
-                        $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
+                        $r->print('<img src="/adm/lonMisc/bomb.gif" alt="'.&mt('bomb').'" /><span class="LC_error">'.
                           &mt('[quant,_1,error]',$errorcount).'</span>');
                      }
 		     if ($warningcount) {
@@ -2118,7 +1624,7 @@ sub checkonthis {
 	      unless ($url=~/\$/) {
 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
 	      } else {
-		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
+		  $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
 	      }
           } else {
              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
@@ -2140,34 +1646,33 @@ List Symbs
 sub list_symbs {
     my ($r) = @_;
 
-    my $type = &Apache::loncommon::course_type();
+    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>'.
                   '<div class="LC_error">'.
                   &mt('Unable to retrieve information about course contents').
                   '</div>');
-        &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
+        &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
     } else {
         $r->print("<pre>\n");
         foreach my $res ($navmap->retrieveResources()) {
-	    $r->print($res->compTitle()."\t".$res->symb()."\n");
+            $r->print($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 $type = &Apache::loncommon::course_type();
-   my $loaderror=&Apache::lonnet::overloaderror($r);
-   if ($loaderror) { return $loaderror; }
-   $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
-   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$type.' Documents'));
+    my $crstype = &Apache::loncommon::course_type();
+   $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=();
@@ -2176,9 +1681,9 @@ 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 '.$type.': ').
+			 &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})})) {
@@ -2186,8 +1691,7 @@ sub verifycontent {
        }
    }
    &untiehash();
-   $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
-	     &mt('Return to DOCS').'</a>');
+   $r->print('<p class="LC_success">'.&mt('Done').'</p>');
 }
 
 
@@ -2199,9 +1703,11 @@ sub devalidateversioncache {
 
 sub checkversions {
     my ($r) = @_;
-    my $type = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page("Check $type Document Versions"));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $type Document Versions"));
+    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='';
@@ -2252,17 +1758,19 @@ 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>');
+			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
+	    $r->print(&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved'))));
 	} else {
-	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
+	    $r->print(&Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1)));
 	}
 	&mark_hash_old();
     }
     &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
-	$header=&mt('All Documents in '.$type);
+	$header=&mt('All Documents in '.$crstype);
 	$allsel=1;
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
@@ -2307,7 +1815,7 @@ sub checkversions {
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'});
     my %lt=&Apache::lonlocal::texthash
-	      ('st' => 'Version changes since start of '.$type,
+	      ('st' => 'Version changes since start of '.$crstype,
 	       'lm' => 'Version changes since last Month',
 	       'lw' => 'Version changes since last Week',
 	       'sy' => 'Version changes since Yesterday',
@@ -2316,17 +1824,24 @@ sub checkversions {
 	       'fi' => 'File',
 	       'md' => 'Modification Date',
                'mr' => 'Most recently published Version',
-	       've' => 'Version used in '.$type,
-               'vu' => 'Set Version to be used in '.$type,
-'sv' => 'Set Versions to be used in '.$type.' according to Selections below',
+	       've' => 'Version used in '.$crstype,
+               'vu' => 'Set Version to be used in '.$crstype,
+'sv' => 'Set Versions to be used in '.$crstype.' according to Selections below',
 'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
 'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
-	       'di' => 'Differences');
+	       'di' => 'Differences',
+	       'save' => 'Save',
+	       'act' => 'Actions');
     $r->print(<<ENDHEADERS);
 <form action="/adm/coursedocs" method="post">
 <input type="hidden" name="versions" value="1" />
-<input type="submit" name="setmostrecent" value="$lt{'sm'}" />
-<input type="submit" name="setcurrent" value="$lt{'sc'}" /><hr />
+<div class="LC_columnSection">
+<fieldset>
+<legend>$lt{'act'}</legend>
+$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" /><br />
+$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" />
+</fieldset>
+</div>
 <select name="timerange">
 <option value='all' $allsel>$lt{'al'}</option>
 <option value="-1" $startsel>$lt{'st'}</option>
@@ -2335,56 +1850,57 @@ sub checkversions {
 <option value="86400" $daysel>$lt{'sy'}</option>
 </select>
 <input type="submit" name="display" value="$lt{'sd'}" />
-<h3>$header</h3>
-<input type="submit" name="setversions" value="$lt{'sv'}" />
+<h2>$header</h2>
+<input type="submit" name="setversions" value="$lt{'save'}" />
 <table border="0">
 ENDHEADERS
+    #number of columns for version history
+    my $num_ver_col = 1;
+    $r->print(
+    &Apache::loncommon::start_data_table().
+    &Apache::loncommon::start_data_table_header_row().
+    '<th>'.&mt('Resources').'</th>'.
+    "<th>$lt{'mr'}</th>".
+    "<th>$lt{'ve'}</th>".
+    "<th>$lt{'vu'}</th>".
+    '<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'.
+    '</b>');
     foreach my $key (sort(keys(%changes))) {
 	if ($changes{$key}>$starttime) {
 	    my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
 	    my $currentversion=&Apache::lonnet::getversion($key);
 	    if ($currentversion<0) {
-		$currentversion=&mt('Could not be determined.');
+                $currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>';
 	    }
 	    my $linkurl=&Apache::lonnet::clutter($key);
-	    $r->print(
-		      '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
-		      &Apache::lonnet::gettitle($linkurl).
-                      '</b></font></td></tr>'.
-                      '<tr><td>&nbsp;&nbsp;&nbsp;</td>'.
-                      '<td colspan="4">'.
-                      '<a href="'.$linkurl.'" target="cat">'.$linkurl.
-		      '</a></td></tr>'.
-                      '<tr><td></td>'.
-                      '<td title="'.$lt{'md'}.'">'.
-		      &Apache::lonlocal::locallocaltime(
-                           &Apache::lonnet::metadata($root.'.'.$extension,
-                                                     'lastrevisiondate')
-                                                        ).
-                      '</td>'.
-                      '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
-                      '<font size="+1">'.$currentversion.'</font>'.
-                      '</span></td>'.
-                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
-                      '<font size="+1">');
+        $r->print(
+            &Apache::loncommon::end_data_table_header_row().
+            &Apache::loncommon::start_data_table_row().
+            '<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br>'.
+            '<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'.
+            '<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br>('.
+            &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'.
+            '<td align="right">');
 # Used in course
 	    my $usedversion=$hash{'version_'.$linkurl};
 	    if (($usedversion) && ($usedversion ne 'mostrecent')) {
-		$r->print($usedversion);
+                if($usedversion != $currentversion){
+                    $r->print('<span class="LC_warning">'.$usedversion.'</span>');
+                }else{
+                    $r->print($usedversion);
+                }
 	    } else {
 		$r->print($currentversion);
 	    }
-	    $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'.
-                      '<span class="LC_nobreak">Use: ');
+	    $r->print('</td><td title="'.$lt{'vu'}.'">');
 # Set version
 	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
 						      'set_version_'.$linkurl,
-						      ('select_form_order' =>
+						      {'select_form_order' =>
 						       ['',1..$currentversion,'mostrecent'],
 						       '' => '',
-						       'mostrecent' => 'most recent',
-						       map {$_,$_} (1..$currentversion))));
-	    $r->print('</span></td></tr><tr><td></td>');
+						       'mostrecent' => &mt('most recent'),
+						       map {$_,$_} (1..$currentversion)}));
 	    my $lastold=1;
 	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
 		my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -2393,18 +1909,18 @@ ENDHEADERS
 		    $lastold=$prevvers;
 		}
 	    }
-            # 
+            #
             # Code to figure out how many version entries should go in
             # each of the four columns
             my $entries_per_col = 0;
             my $num_entries = ($currentversion-$lastold);
-            if ($num_entries % 4 == 0) {
-                $entries_per_col = $num_entries/4;
+            if ($num_entries % $num_ver_col == 0) {
+                $entries_per_col = $num_entries/$num_ver_col;
             } else {
-                $entries_per_col = $num_entries/4 + 1;
+                $entries_per_col = $num_entries/$num_ver_col + 1;
             }
             my $entries_count = 0;
-            $r->print('<td valign="top"><font size="-2">'); 
+            $r->print('<td valign="top"><span class="LC_fontsize_medium">');
             my $cols_output = 1;
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
 		my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -2419,25 +1935,25 @@ 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) {
-                    $r->print('</font></td>');
-                    if ($cols_output != 4) {
-                        $r->print('<td valign="top"><font size="-2">');
+                    $r->print('</span></td>');
+                    if ($cols_output != $num_ver_col) {
+                        $r->print('<td valign="top"><span class="LC_fontsize_medium">');
                         $cols_output++;
                     }
                 }
 	    }
-            while($cols_output++ < 4) {
-                $r->print('</font></td><td><font>')
+            while($cols_output++ < $num_ver_col) {
+                $r->print('</span></td><td>');
             }
-	    $r->print('</font></td></tr>'."\n");
 	}
     }
-    $r->print('</table></form>');
-    $r->print('<h1>'.&mt('Done').'.</h1>');
+    $r->print('</td>'.&Apache::loncommon::end_data_table_row().
+            &Apache::loncommon::end_data_table().
+            '<input type="submit" name="setversions" value="'.$lt{'save'}.'" />');
 
     &untiehash();
 }
@@ -2483,14 +1999,18 @@ sub changewarning {
 	$message='Changes will become active for your current session after [_1], or the next time you log in.';
     }
     $r->print("\n\n".
-'<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". 
+'<script type="text/javascript">'."\n".
+'// <![CDATA['."\n".
+'function reinit(tf) { tf.submit();'.$postexec.' }'."\n".
+'// ]]>'."\n".
+'</script>'."\n".
 '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.
-'" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
+'" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'.
 &mt($message,' <input type="hidden" name="'.
     $env{'request.role'}.'" value="1" /><input type="button" value="'.
-    &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
-$help{'Caching'}.'</span></h3></form>'."\n\n");
+    &mt('re-initializing '.$course_type).'" onclick="reinit(this.form)" />').
+$help{'Caching'}.'</p></form>'."\n\n");
 }
 
 
@@ -2498,7 +2018,7 @@ sub init_breadcrumbs {
     my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
-					    text=>"Edit ".&Apache::loncommon::course_type(),
+					    text=>&Apache::loncommon::course_type().' Editor',
 					    faq=>273,
 					    bug=>'Instructor Interface',
                                             help => 'Docs_Adding_Course_Doc'});
@@ -2508,17 +2028,70 @@ 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">');
+    if (($mode eq 'navmaps') || ($mode eq 'supplemental')) {
+        $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>'."\n");
+        $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>'."\n");
+        $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>'."\n");
+        $r->print('<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
+    } else {
+        $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 'suppdocs')?' class="active"':'').
+                  '><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Content Editor').'</b></a></li>');
+    }
+    $r->print("\n".'</ul>'."\n");
+    $r->print('<div class="LC_DocsBox" style="clear:both;margin:0;" id="contenteditor">'.
+              '<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'.
+              '<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().' Content'));
+}
 
 sub handler {
     my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    my $type = &Apache::loncommon::course_type();
-
+    my $crstype = &Apache::loncommon::course_type();
 
+#
 # --------------------------------------------- Initialize help topics for this
     foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
 	               'Adding_External_Resource','Navigate_Content',
@@ -2537,13 +2110,19 @@ 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
-    my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+    
+    my $allowed;
+# URI is /adm/supplemental when viewing supplemental docs in non-edit mode.
+    unless ($r->uri eq '/adm/supplemental') {
+        # does this user have privileges to modify content.  
+        $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+    }
+
   if ($allowed && $env{'form.verify'}) {
       &init_breadcrumbs('verify','Verify Content');
       &verifycontent($r);
@@ -2557,83 +2136,212 @@ sub handler {
       &init_breadcrumbs('versions','Check/Set Resource Versions');
       &checkversions($r);
   } elsif ($allowed && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
+      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Documents to Construction Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
-      &init_breadcrumbs('exportcourse','Export '.&Apache::loncommon::course_type().' to IMS');
-      &exportcourse($r);
+      &init_breadcrumbs('exportcourse','IMS Export');
+      &Apache::imsexport::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 $container;
     my $containertag;
     my $uploadtag;
 
+# Do we directly jump somewhere?
+
+   if ($env{'form.command'} eq 'direct') {
+       my ($mapurl,$id,$resurl);
+       if ($env{'form.symb'} ne '') {
+           ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
+           if ($resurl=~/\.(sequence|page)$/) {
+               $mapurl=$resurl;
+           } elsif ($resurl eq 'adm/navmaps') {
+               $mapurl=$env{'course.'.$env{'request.course.id'}.'.url'};
+           }
+           my $mapresobj;
+           my $navmap = Apache::lonnavmaps::navmap->new();
+           if (ref($navmap)) {
+               $mapresobj = $navmap->getResourceByUrl($mapurl);
+           }
+           $mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1};
+           my $type=$2;
+           my $path;
+           if (ref($mapresobj)) {
+               my $pcslist = $mapresobj->map_hierarchy();
+               if ($pcslist ne '') {
+                   foreach my $pc (split(/,/,$pcslist)) {
+                       next if ($pc <= 1);
+                       my $res = $navmap->getByMapPc($pc);
+                       if (ref($res)) {
+                           my $thisurl = $res->src();
+                           $thisurl=~s{^.*/([^/]+)\.\w+$}{$1}; 
+                           my $thistitle = $res->title();
+                           $path .= '&'.
+                                    &Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
+                                    &Apache::lonhtmlcommon::entity_encode($thistitle).
+                                    ':'.$res->randompick().
+                                    ':'.$res->randomout().
+                                    ':'.$res->encrypted().
+                                    ':'.$res->randomorder();
+                       }
+                   }
+               }
+               $path .= '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                    &Apache::lonhtmlcommon::entity_encode($mapresobj->title()).
+                    ':'.$mapresobj->randompick().
+                    ':'.$mapresobj->randomout().
+                    ':'.$mapresobj->encrypted().
+                    ':'.$mapresobj->randomorder();
+           } else {
+               my $maptitle = &Apache::lonnet::gettitle($mapurl);
+               $path = '&default&...::::'.
+                   '&'.&Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
+                   &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
+           }
+           $path = 'default&'.
+                   &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
+                   $path;
+           if ($type eq 'sequence') {
+               $env{'form.folderpath'}=$path;
+               $env{'form.pagepath'}='';
+           } else {
+               $env{'form.pagepath'}=$path;
+               $env{'form.folderpath'}='';
+           }
+       } elsif ($env{'form.supppath'} ne '') {
+           $env{'form.folderpath'}=$env{'form.supppath'};
+       }
+   } elsif ($env{'form.command'} eq 'editdocs') {
+        $env{'form.folderpath'} = 'default&'.
+                                  &Apache::lonhtmlcommon::entity_encode('Main Course Content');
+        $env{'form.pagepath'}='';
+   } elsif ($env{'form.command'} eq 'editsupp') {
+        $env{'form.folderpath'} = 'default&'.
+                                  &Apache::lonhtmlcommon::entity_encode('Supplemental Content');
+        $env{'form.pagepath'}='';
+   }
+
+# Where do we store these for when we come back?
+    my $stored_folderpath='docs_folderpath';
+    if ($supplementalflag) {
+       $stored_folderpath='docs_sup_folderpath';
+    }
 
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['folderpath','pagepath',
-					     'pagesymb']);
 # No folderpath, no pagepath, see if we have something stored
     if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
-        &Apache::loncommon::restore_course_settings('docs_folderpath',
+        &Apache::loncommon::restore_course_settings($stored_folderpath,
                                               {'folderpath' => 'scalar'});
     }
-    if (!$env{'form.folderpath'}) {
-        &Apache::loncommon::restore_course_settings('docs_folderpath',
-                                              {'pagepath' => 'scalar'});
+   
+# If we are not allowed to make changes, all we can see are supplemental docs
+    if (!$allowed) {
+        $env{'form.pagepath'}='';
+        unless ($env{'form.folderpath'} =~ /^supplemental/) {
+            $env{'form.folderpath'} = &supplemental_base();
+        }
     }
-    if ($env{'form.pagepath'}) {
-       $env{'form.folderpath'}='';
+# If we still not have a folderpath, see if we can resurrect at pagepath
+    if (!$env{'form.folderpath'} && $allowed) {
+        &Apache::loncommon::restore_course_settings($stored_folderpath,
+                                              {'pagepath' => 'scalar'});
     }
+# Make the zeroth entry in supplemental docs page paths, so we can get to top level
     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
-        $env{'form.folderpath'} = 'supplemental&'.
-                                  &escape(&mt('Supplemental '.$type.' Documents')).'&'.
+        $env{'form.folderpath'} = &supplemental_base()
+                                  .'&'.
                                   $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));
 	$env{'form.folder'}=pop(@folderpath);
+        $container='sequence';
     }
     if ($env{'form.pagepath'}) {
         my (@pagepath)=split('&',$env{'form.pagepath'});
         $env{'form.pagename'}=&unescape(pop(@pagepath));
         $env{'form.folder'}=pop(@pagepath);
+        $container='page';
         $containertag = '<input type="hidden" name="pagepath" value="" />'.
-	    '<input type="hidden" name="pagesymb" value="" />';
-        $uploadtag = '<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="pagesymb" value="" />';
+        $uploadtag = 
+            '<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 (($env{'form.folder'}=~/^(?:group|default)_/) || 
-          ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
-           $forcestandard = 1;
-       } 
-       $forcesupplement=($env{'form.folder'}=~/^supplemental_/);
-
-       if ($allowed) { 
+    if ($showdoc) { # got called in sequence from course
+	$allowed=0; 
+    } else {
+       if ($allowed) {
          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
-         $script=&Apache::lonratedt::editscript('simple'); 
+         $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 
+# get personal data
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
     my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
@@ -2643,142 +2351,140 @@ 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,$supplementalflag).
+                   &resize_contentdiv_js($tabidstr);
+        $addentries = {
+                        onload   => "javascript:resize_contentdiv('contentscroll','1','1');",
+                      };
     }
 # -------------------------------------------------------------------- Body tag
-    $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';
-    my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}];
-    $r->print(&Apache::loncommon::start_page("$type Documents", $script,
-				    {'force_register' => $showdoc,
-                                     'bread_crumbs' => $brcrum}).
-	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
-  
+    $script = '<script type="text/javascript">'."\n"
+              .'// <![CDATA['."\n"
+              .$script."\n"
+              .'// ]]>'."\n"
+              .'</script>'."\n";
+
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    unless ($showdoc) {
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            href=>"/adm/coursedocs",text=>"$crstype Contents"});
+
+        $r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
+                                                 {'force_register' => $showdoc,
+                                                  'add_entries'    => $addentries,
+                                                 })
+                 .&Apache::loncommon::help_open_menu('','',273,'RAT')
+                 .&Apache::lonhtmlcommon::breadcrumbs(
+                     'Editing the Table of Contents for your '.$crstype,
+                     'Docs_Adding_Course_Doc')
+        );
+    } else {
+        $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
+                                                {'force_register' => $showdoc,}));
+    }
+
   my %allfiles = ();
   my %codebase = ();
-  my ($upload_result,$upload_output);
+  my ($upload_result,$upload_output,$uploadphase);
   if ($allowed) {
       if (($env{'form.uploaddoc.filename'}) &&
 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
-# Process file upload - phase one - upload and parse primary file.  
+          my $context = $1; 
+          # Process file upload - phase one - upload and parse primary file.
 	  undef($hadchanges);
-          $upload_result = &process_file_upload(\$upload_output,$coursenum,
-						$coursedom,\%allfiles,
-						\%codebase,$1);
+          $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
+                                              \%allfiles,\%codebase,$context);
 	  if ($hadchanges) {
 	      &mark_hash_old();
 	  }
-          if ($upload_result eq 'phasetwo') {
-              $r->print($upload_output);
-          }
-      } elsif ($env{'form.phasetwo'}) {
-          my %newname = ();
-          my %origname = ();
-          my %attribs = ();
-          my $updateflag = 0;
-          my $residx = $env{'form.newidx'};
-          my $primary_url = &unescape($env{'form.primaryurl'});
-# Process file upload - phase two - gather secondary files.
-          for (my $i=0; $i<$env{'form.phasetwo'}; $i++) {
-              if ($env{'form.embedded_item_'.$i.'.filename'}) {
-                  my $javacodebase;
-                  $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
-                  $origname{$i} = &unescape($env{'form.embedded_orig_'.$i});
-                  if (exists($env{'form.embedded_codebase_'.$i})) {
-                      $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});  
-                      $origname{$i} =~ s#^\Q$javacodebase\E/##; 
-                  }
-                  my @attributes = ();
-                  if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
-                      @attributes = split(/:/,$env{'form.embedded_attrib_'.$i});
-                  } else {
-                      @attributes = ($env{'form.embedded_attrib_'.$i});
-                  }
-                  foreach my $attr (@attributes) {
-                      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); 
-              }
-          }
+          $r->print($upload_output);
+      } elsif ($env{'form.phase'} eq 'upload_embedded') {
+          # Process file upload - phase two - upload embedded objects 
+          $uploadphase = 'check_embedded';
+          my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');   
+          my $state = &embedded_form_elems($uploadphase,$primaryurl,
+                                           $env{'form.newidx'});
+          my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+          my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+          my ($destination,$dir_root) = &embedded_destination();
+          my $url_root = '/uploaded/'.$docudom.'/'.$docuname;
+          my $actionurl = '/adm/coursedocs';
+          my ($result,$flag) = 
+              &Apache::loncommon::upload_embedded('coursedoc',$destination,
+                  $docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,
+                  $actionurl);
+          $r->print($result.&return_to_editor());
+      } elsif ($env{'form.phase'} eq 'check_embedded') {
+          # Process file upload - phase three - modify references in HTML file
+          $uploadphase = 'modified_orightml';
+          my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+          my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+          my ($destination,$dir_root) = &embedded_destination();
+          $r->print(&Apache::loncommon::modify_html_refs('coursedoc',$destination,
+                                                         $docuname,$docudom,undef,
+                                                         $dir_root).
+                   &return_to_editor());
+      } elsif ($env{'form.phase'} eq 'decompress_uploaded') {
+          $uploadphase = 'decompress_phase_one';
+          $r->print(&decompression_phase_one().
+                    &return_to_editor());
+      } elsif ($env{'form.phase'} eq 'decompress_cleanup') {
+          $uploadphase = 'decompress_phase_two';
+          $r->print(&decompression_phase_two().
+                    &return_to_editor());
       }
   }
 
-  unless ($showdoc ||  $upload_result eq 'phasetwo') {
+  unless ($showdoc || $uploadphase) {  
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
-                'uplm' => 'Upload a new main '.lc($type).' document',
-                'upls' => 'Upload a new supplemental '.lc($type).' document',
+                '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',
-                'upld' => 'Upload Document',
+                'upld' => 'Import 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',
-                'sipa' => 'Simple Page',
+                'navc' => 'Table of Contents',
+                'sipa' => 'Simple Course Page',
                 'sipr' => 'Simple Problem',
                 'drbx' => 'Drop Box',
-                'scuf' => 'Score Upload Form',
-                'bull' => 'Bulletin Board',
-                'mypi' => 'My Personal Info',
-                'grpo' => 'Group Files',
+                'scuf' => 'External Scores (handgrade, upload, clicker)',
+                'bull' => 'Discussion Board',
+                'mypi' => 'My Personal Information Page',
+                'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',
-		'abou' => 'About User',
-                'imsf' => 'Import IMS package',
+				'abou' => 'Personal Information Page for a User',
+                'imsf' => 'IMS Import',
+                'imsl' => 'Import IMS package',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
-                'parse' => 'Upload embedded images/multimedia files if HTML file!',
-		'nd' => 'New Document',
+                'parse' => 'Upload embedded images/multimedia files if HTML file',
+		'nd' => 'Upload Document',
 		'pm' => 'Published Map',
 		'sd' => 'Special Document',
 		'mo' => 'More Options',
-		'hao' => 'Hide all Options'
 					  );
 # -----------------------------------------------------------------------------
 	my $fileupload=(<<FIUP);
@@ -2795,62 +2501,53 @@ FIUP
 	</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="50" name="comment" />
+	<input type="text" size="60" name="comment" />
 	$uploadtag
 	<input type="hidden" name="cmd" value="upload_default" />
 	<br />
-	<span class="LC_nobreak">
+	<span class="LC_nobreak" style="float:left">
 	$checkbox
 	</span>
-	<br />
-	<br />
-	<span class="LC_nobreak">
-	<input type="submit" value="$lt{'upld'}" />
-	 $help{'Uploading_From_Harddrive'}
-	</span>
-	</form>
 FUFORM
+    $fileuploadform .= $fileuploada.'</form>';
 
 	my $simpleeditdefaultform=(<<SEDFFORM);
 	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
-	$lt{'pubd'}<br />
-	$uploadtag
-	<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />
-	<br />
-	<span class="LC_nobreak">
-	<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />
-	$help{'Importing_LON-CAPA_Resource'}
-	</span>
-	<br />
-	<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
-	<hr />
-	<p>
+	<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"><input type="button" 
-	onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
+	<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>
-	</p>
 	</form>
 SEDFFORM
 
-	my $extresourcesform=(<<ERFORM);
-	<form action="/adm/coursedocs" method="post" name="newext">
-	$uploadtag
-	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newext" type="button" onClick="javascript:makenewext('newext');"
-	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-	</span>
-	</form>
+      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 %lt=&Apache::lonlocal::texthash(
@@ -2860,48 +2557,53 @@ ERFORM
                                          'sl' => 'Show Log'
 					  );
 
-       my $folderpath=$env{'form.folderpath'};
-       if (!$folderpath) {
-	   if ($env{'form.folder'} eq '' ||
-	       $env{'form.folder'} eq 'supplemental') {
-	       $folderpath='default&'.
-		   &escape(&mt('Main '.$type.' Documents'));
-	   }
-       }
-       unless ($env{'form.pagepath'}) {
-           $containertag = '<input type="hidden" name="folderpath" value="" />';
-           $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
-       }
+	$r->print(<<HIDDENFORM);
+	<form name="renameform" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="title" />
+   <input type="hidden" name="cmd" />
+   <input type="hidden" name="markcopy" />
+   <input type="hidden" name="copyfolder" />
+   $containertag
+ </form>
+ <form name="simpleedit" method="post" action="/adm/coursedocs">
+   <input type="hidden" name="importdetail" value="" />
+   $uploadtag
+ </form>
+HIDDENFORM
+    }
 
-       $r->print(&generate_admin_options($containertag,$uploadtag,\%lt,\%help,\%env));
-       $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-		     &mt('Editing the Table of Contents for your '.$type)));
+# Generate the tabs
+    my $mode;
+    if (($supplementalflag) && (!$allowed)) {
+        &Apache::lonnavdisplay::startContentScreen($r,'supplemental');
+    } else {
+        &startContentScreen($r,($supplementalflag?'suppdocs':'docs'));
     }
-# --------------------------------------------------------- Standard documents
-    if (($standard) && ($allowed) && (!$forcesupplement)) {
+
+#
+
+    my $savefolderpath;
+
+    if ($allowed) {
        my $folder=$env{'form.folder'};
-       if ($folder eq '' || $folder eq 'supplemental') {
+       if ($folder eq '' || $supplementalflag) {
            $folder='default';
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
+	   $savefolderpath = $env{'form.folderpath'};
+	   $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
            $uploadtag = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
        my $postexec='';
        if ($folder eq 'default') {
-	   $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>');
+           $r->print('<script type="text/javascript">'."\n"
+                    .'// <![CDATA['."\n"
+                    .'this.window.name="loncapaclient";'."\n"
+                    .'// ]]>'."\n"
+                    .'</script>'."\n"
+       );
        } else {
            #$postexec='self.close();';
        }
-       $hadchanges=0;
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,
-			   $upload_output,$type);
-       if ($error) {
-	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-       }
-       if ($hadchanges) {
-	   &mark_hash_old();
-       }
-       &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
@@ -2916,227 +2618,241 @@ ERFORM
 
 	my $recoverform=(<<RFORM);
 	<form action="/adm/groupsort" method="post" name="recover">
-	<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
+	<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
 	</form>
 RFORM
 
 	my $imspform=(<<IMSPFORM);
 	<form action="/adm/imsimportdocs" method="post" name="ims">
 	<input type="hidden" name="folder" value="$folder" />
-	<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+	<a class="LC_menubuttons_link" href="javascript:makeims();">$lt{'imsf'}</a>
 	</form>
 IMSPFORM
 
 	my $newnavform=(<<NNFORM);
 	<form action="/adm/coursedocs" method="post" name="newnav">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
-	<span class="LC_nobreak">
-	<input name="newnav" type="submit" value="$lt{'navc'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
 	$help{'Navigate_Content'}
-	</span>
 	</form>
 NNFORM
 	my $newsmppageform=(<<NSPFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmppg">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newsmppg" type="button" value="$lt{'sipa'}"
-	onClick="javascript:makesmppage();" /> $help{'Simple Page'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
+	$help{'Simple Page'}
 	</form>
 NSPFORM
 
 	my $newsmpproblemform=(<<NSPROBFORM);
 	<form action="/adm/coursedocs" method="post" name="newsmpproblem">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
-	onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
+	$help{'Simple Problem'}
 	</form>
 
 NSPROBFORM
 
 	my $newdropboxform=(<<NDBFORM);
 	<form action="/adm/coursedocs" method="post" name="newdropbox">
-	$uploadtag      
+	<input type="hidden" name="active" value="cc" />
+	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">          
-	<input name="newdropbox" type="button" value="$lt{'drbx'}"
-	onClick="javascript:makedropbox();" />
-	</span>         
-	</form> 
+	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
+	</form>
 NDBFORM
 
 	my $newexuploadform=(<<NEXUFORM);
 	<form action="/adm/coursedocs" method="post" name="newexamupload">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newexamupload" type="button" value="$lt{'scuf'}"
-	onClick="javascript:makeexamupload();" />
+	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
 	$help{'Score_Upload_Form'}
-	</span>
 	</form>
 NEXUFORM
 
 	my $newbulform=(<<NBFORM);
 	<form action="/adm/coursedocs" method="post" name="newbul">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newbulletin" type="button" value="$lt{'bull'}"
-	onClick="javascript:makebulboard();" />
+	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
 	$help{'Bulletin Board'}
-	</span>
 	</form>
 NBFORM
 
 	my $newaboutmeform=(<<NAMFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutme">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<span class="LC_nobreak">
-	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
-	$help{'My Personal Info'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
+	$help{'My Personal Information Page'}
 	</form>
 NAMFORM
 
 	my $newaboutsomeoneform=(<<NASOFORM);
 	<form action="/adm/coursedocs" method="post" name="newaboutsomeone">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
-	onClick="javascript:makeabout();" />
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
 	</form>
 NASOFORM
 
 
 	my $newrosterform=(<<NROSTFORM);
 	<form action="/adm/coursedocs" method="post" name="newroster">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
-	<span class="LC_nobreak">
-	<input name="newroster" type="submit" value="$lt{'rost'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
 	$help{'Course Roster'}
-	</span>
 	</form>
 NROSTFORM
 
-       unless ($env{'form.pagepath'}) {
-	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+my $specialdocumentsform;
+my @specialdocumentsforma;
+my $gradingform;
+my @gradingforma;
+my $communityform;
+my @communityforma;
+my $newfolderform;
+my $newfolderb;
 
+	my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+	
 	my $newpageform=(<<NPFORM);
 	<form action="/adm/coursedocs" method="post" name="newpage">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newpage" type="button"
-	onClick="javascript:makenewpage(this.form,'$pageseq');"
-	value="$lt{'newp'}" />$help{'Adding_Pages'}
-	</span>
+	<input type="hidden" name="active" value="cc" />
+	<a class="LC_menubuttons_link" href="javascript:makenewpage(document.newpage,'$pageseq');">$lt{'newp'}</a>
+	$help{'Adding_Pages'}
 	</form>
 NPFORM
 
-	my $newfolderform=(<<NFFORM);
+
+	$newfolderform=(<<NFFORM);
 	<form action="/adm/coursedocs" method="post" name="newfolder">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newfolder" type="button"
-	onClick="javascript:makenewfolder(this.form,'$folderseq');"
-	value="$lt{'newf'}" />$help{'Adding_Folders'}
-	</span>
+	<input type="hidden" name="active" value="aa" />
+	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
 	</form>
 NFFORM
 
 	my $newsylform=(<<NSYLFORM);
 	<form action="/adm/coursedocs" method="post" name="newsyl">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
-	<span class="LC_nobreak">
-	<input name="newsyl" type="submit" value="$lt{'syll'}" /> 
+	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
 	$help{'Syllabus'}
-	</span>
+
 	</form>
 NSYLFORM
-	
+
 	my $newgroupfileform=(<<NGFFORM);
 	<form action="/adm/coursedocs" method="post" name="newgroupfiles">
+	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
-	<span class="LC_nobreak">
-	<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
-	$help{'Group Files'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
+	$help{'Group Portfolio'}
 	</form>
 NGFFORM
+	@specialdocumentsforma=(
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'"  onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
+        );
+        $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
+
+
+        my @importdoc = (
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
+        $fileuploadform =  &create_form_ul(&create_list_elements(@importdoc)) . '<hr id="cc_hrule" style="width:0px;text-align:left;margin-left:0" />' . $fileuploadform;
+
+        @gradingforma=(
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},
+
+        );
+        $gradingform = &create_form_ul(&create_list_elements(@gradingforma));
+
+        @communityforma=(
+       {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},
+        {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
+        );
+        $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
 
-        my $specialdocumentsform=(<<SPDOFORM);
-	<br />$newfolderform
-	<br />$newpageform
-	<br />$newsylform
-	<br />$newnavform
-	<br />$newsmppageform
-	<br />$newsmpproblemform
-	<br />$newdropboxform
-	<br />$newexuploadform
-	<br />$newbulform
-	<br />$newaboutmeform
-	<br />$newaboutsomeoneform
-	<br />$newgroupfileform
-	<br />$newrosterform
-SPDOFORM
 
+my @tools = (
+#	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
+#	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
+	);
 
 my %orderhash = (
-                'aa' => 'New Document',
-                'bb' => 'Published Documents',
-                'cc' => 'Special Documents',
-		'dd' => 'More Options',
-                'zz' => 'Hide all Option',
-                );
-my %namehash = (
-                'New Document' => $fileuploadform,
-                'Published Documents' => $simpleeditdefaultform,
-                'Special Documents' => $specialdocumentsform,
-		'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform,
-                'drei' => 'dr',
+                'aa' => ['Import Documents',$fileuploadform],
+                'bb' => ['Published Resources',$simpleeditdefaultform],
+                'cc' => ['Grading Resources',$gradingform],
+		'ff' => ['Tools', &create_form_ul(&create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
                 );
-my $tid = '1';
-my $varcd = 'Course Documents';
-$r->print(&generate_edit_table($varcd,\%namehash,\%orderhash)); 
-      }
-       if ($env{'form.pagepath'}) {
-       }
+unless ($env{'form.pagepath'}) {
+    $orderhash{'00'} = ['Newfolder',$newfolderform];
+    $orderhash{'dd'} = ['Community Resources',$communityform];
+    $orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
+}
+
+ $hadchanges=0;
+       unless ($supplementalflag) {
+          my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
+                              $supplementalflag,\%orderhash,$iconpath);
+          if ($error) {
+             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+          }
+          if ($hadchanges) {
+             &mark_hash_old();
+          }
+
+          &changewarning($r,'');
+        }
     }
-# ----------------------------------------------------- Supplemental documents
-    if (!$forcestandard) {
+
+# 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&'.
-                                    &escape(&mt('Supplemental '.$type.' Documents'));
-       }
-       my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
-       if ($error) {
-	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+          $env{'form.folderpath'} = &supplemental_base();
+       } elsif ($allowed) {
+	  $env{'form.folderpath'} = $savefolderpath;
        }
+       $env{'form.pagepath'} = '';
        if ($allowed) {
 	   my $folderseq=
 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
@@ -3144,8 +2860,10 @@ $r->print(&generate_edit_table($varcd,\%
 
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
+	my $supupdocformbtn = "<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}";
 	my $supupdocform=(<<SUPDOCFORM);
-	<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
+	<input type="hidden" name="active" value="ee" />	
 	$fileupload
 	<br />
 	<br />
@@ -3154,93 +2872,89 @@ $r->print(&generate_edit_table($varcd,\%
 	</span>
 	<br /><br />
 	$lt{'comment'}:<br />
-	<textarea cols=50 rows=4 name='comment'>
-	</textarea>
+	<textarea cols="50" rows="4" name="comment"></textarea>
 	<br />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="cmd" value="upload_supplemental" />
-	<span class="LC_nobreak">
-	<input type="submit" value="$lt{'upld'}" />
-	 $help{'Uploading_From_Harddrive'}
-	</span>
-	</form>
 SUPDOCFORM
+	$supupdocform .=  &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";
 
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
+	<input type="hidden" name="active" value="ee" />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newfolder" type="button"
-	onClick="javascript:makenewfolder(this.form,'$folderseq');"
-	value="$lt{'newf'}" /> $help{'Adding_Folders'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
+	$help{'Adding_Folders'}
 	</form>
 SNFFORM
-
+	
 
 	my $supnewextform=(<<SNEFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewext">
+	<input type="hidden" name="active" value="ff" />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newext" type="button" 
-	onClick="javascript:makenewext('supnewext');"
-	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'}
 	</form>
 SNEFORM
 
 	my $supnewsylform=(<<SNSFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
+	<input type="hidden" name="active" value="ff" />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-	<span class="LC_nobreak">
-	<input name="newsyl" type="submit" value="$lt{'syll'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
 	$help{'Syllabus'}
-	</span>
 	</form>
 SNSFORM
 
 	my $supnewaboutmeform=(<<SNAMFORM);
-	<form action="/adm/coursedocs" method="post" name="subnewaboutme">
+	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
+	<input type="hidden" name="active" value="ff" />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<span class="LC_nobreak">
-	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
-	$help{'My Personal Info'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
+	$help{'My Personal Information Page'}
 	</form>
 SNAMFORM
 
 
-
+my @specialdocs = (
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />'
+            =>$supnewsylform},
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />'
+            =>$supnewaboutmeform},
+		);
+my @supimportdoc = (
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
+            =>$supnewextform},
+        );
+$supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
 my %suporderhash = (
-                'ee' => 'New Document',
-                'ff' => 'Special Documents',
-                'zz' => 'Hide all Options',
+		'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,$iconpath);
+           if ($error) {
+              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+           }
+        }
+    } elsif ($supplementalflag) {
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
+                            $supplementalflag,'',$iconpath);
+        if ($error) {
+            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+        }
+    }
 
-my %supnamehash = (
-                'New Document' => $supupdocform,
-                'Special Documents' => $supnewfolderform.'<br />'.$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform,
-                );
-my $tid='2';
-my $varscd = 'Supplemented Course Documents';
-
-$r->print(<<FORM);
-<ul class="LC_TabContent">
-	<li>New Document</li>
-	<li>Special Documents</li>
-</ul>
-FORM
-
-#$r->print(&generate_edit_table($varscd,\%supnamehash,\%suporderhash));
+    &endContentScreen($r);
 
-	} 
-   }
     if ($allowed) {
 	$r->print('
 <form method="post" name="extimport" action="/adm/coursedocs">
@@ -3251,7 +2965,7 @@ FORM
 </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>'.
@@ -3262,97 +2976,261 @@ FORM
  }
  $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 decompression_info {
+    my ($destination,$dir_root) = &embedded_destination();
+    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+    my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $container='sequence';
+    my ($pathitem,$hiddenelem);
+    my @hiddens = ('newidx','comment','position');
+    if ($env{'form.pagepath'}) {
+        $container='page';
+        $pathitem = 'pagepath';
+    } else {
+        $pathitem = 'folderpath';
+    }
+    unshift(@hiddens,$pathitem);
+    foreach my $item (@hiddens) {
+        if ($env{'form.'.$item}) {
+            $hiddenelem .= '<input type="hidden" name="'.$item.'" value="'.
+                           $env{'form.'.$item}.'" />'."\n";
+        }
+    }
+    return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,
+            $hiddenelem);
+}
+
+sub decompression_phase_one {
+    my ($dir,$file,$warning,$error,$output);
+    my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)=
+        &decompression_info();
+    if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/docs/\E(?:default|supplemental|\d+).*/([^/]+)$}) {
+        $error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});
+    } else {
+        my $file = $1;
+        $output = 
+            &Apache::loncommon::process_decompression($docudom,$docuname,$file,
+                                                      $destination,$dir_root,
+                                                      $hiddenelem);
+        if ($env{'form.autoextract_camtasia'}) {
+            $output .= &remove_archive($docudom,$docuname,$container);
+        }
+    }
+    if ($error) {
+        $output .= '<p class="LC_error">'.&mt('Not extracted.').'<br />'.
+                   $error.'</p>'."\n";
+    }
+    if ($warning) {
+        $output .= '<p class="LC_warning">'.$warning.'</p>'."\n";
+    }
+    return $output;
+}
+
+sub decompression_phase_two {
+    my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)=
+        &decompression_info();
+    my $output;
+    if ($env{'form.archivedelete'}) {
+        $output = &remove_archive($docudom,$docuname,$container);
+    }
+    $output .= 
+        &Apache::loncommon::process_extracted_files('coursedocs',$docudom,$docuname,
+                                                    $destination,$dir_root,$hiddenelem);
+    return $output;
+}
+
+sub remove_archive {
+    my ($docudom,$docuname,$container) = @_;
+    my $map = $env{'form.folder'}.'.'.$container;
+    my ($output,$delwarning,$delresult,$url);
+    my ($errtext,$fatal) = &mapread($docuname,$docudom,$map);
+    if ($fatal) {
+        if ($container eq 'page') {
+            $delwarning = &mt('An error occurred retrieving the contents of the current page.');
+        } else {
+            $delwarning = &mt('An error occurred retrieving the contents of the current folder.');
+        }
+        $delwarning .= &mt('As a result the archive file has not been removed.');
+    } else {
+        my $currcmd = $env{'form.cmd'};
+        my $position = $env{'form.position'};
+        if ($position > 0) { 
+            $env{'form.cmd'} = 'del_'.$position;
+            my ($title,$url,@rrest) = 
+                split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]);
+            if (&handle_edit_cmd($docuname,$docudom)) {
+                ($errtext,$fatal) = &storemap($docuname,$docudom,$map);
+                if ($fatal) {
+                    if ($container eq 'page') {
+                        $delwarning = &mt('An error occurred updating the contents of the current page.');
+                    } else {
+                        $delwarning = &mt('An error occurred updating the contents of the current folder.');
+                    }
+                } else {
+                    $delresult = &mt('Archive file removed.');
+                }
+            }
+        }
+        $env{'form.cmd'} = $currcmd;
+    }
+    if ($delwarning) {
+        $output = '<p class="LC_warning">'.
+                   $delwarning.
+                   '</p>';
+    }
+    if ($delresult) {
+        $output .= '<p class="LC_info">'.
+                   $delresult.
+                   '</p>';
+    }
+    return $output;
+}
 
 sub generate_admin_options {
-  my ($containertag,$uploadtag,$lt_ref,$help_ref,$env_ref) = @_;
-  my %lt = %{$lt_ref};
+  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();
-  return (<<ENDOPTIONFORM);
- <form name="renameform" method="post" action="/adm/coursedocs">
-   <input type="hidden" name="title" />
-   <input type="hidden" name="cmd" />
-   <input type="hidden" name="markcopy" />
-   <input type="hidden" name="copyfolder" />
-   $containertag
- </form>
- <form name="simpleedit" method="post" action="/adm/coursedocs">
-   <input type="hidden" name="importdetail" value="" />
-   $uploadtag
- </form>
- <form action="/adm/coursedocs" method="post" name="courseverify">
-   <ul style="list-style-type:none">
-       <li>
-           <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
-       </li>
-       <li>
-           <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
-       </li>
-       <li>
-           $dumpbut
-       </li>
-       <li>
-           $exportbut
-       </li>
-       <li>
-          <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-        </li>
-        <li>
-          <input type="hidden" name="folder" value="$env{'form.folder'}" />
-          <input type="submit" name="docslog" value="$lt{'sl'}" />
-        </li>
-   </ul>
- </form>
- <div style="clear: both; height: 0px;">&nbsp;</div>
-ENDOPTIONFORM
+  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 ($varcd,$namehash_ref,$orderhash_ref) = @_;
-    my %namehash = %{$namehash_ref};             #name verlinkt mit id
-    my %orderhash = %{$orderhash_ref};           #name mit kürzel verlinkt mit name
+    my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto) = @_;
+    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'};
+    }
+    my $backicon = $iconpath.'clickhere.gif';
+    my $backtext = &mt('To Overview');
+    $form = '<div class="LC_Box" style="margin:0;">'.
+             '<ul id="navigation'.$tid.'" class="LC_TabContent">'.
+             '<li class="goback">'.
+             '<a href="javascript:toContents('."'$jumpto'".');">'.
+             '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
+             '  alt="'.$backtext.'" />'.$backtext.'</a></li>';
+    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">';
 
-    $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt('Upload '.$varcd).'</h4>';
-    $form .= '<ul id="navigation" class="LC_TabContent">';
-    foreach my $name (sort(keys(%orderhash))){
-        if($name eq 'zz'){
-            $form .= '<li onclick="javascript:hideAll(this);" class="active">'.&mt($orderhash{$name}).'</li>';
-        }else{
-            $form .= '<li onclick="javascript:showPage(this, \''.$orderhash{$name}.'\');">'.&mt($orderhash{$name}).'</li>';
+    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 id="content" style="padding: 0 0; margin: 0 0;">';
-    foreach my $field (keys(%namehash)){
-        $form .= '<div id="'.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
-      }
     $form .= '</div></div>';
-    }
+
     return $form;
 }
 
 sub editing_js {
-    my ($udom,$uname) = @_;
+    my ($udom,$uname,$supplementalflag) = @_;
     my $now = time();
     my %lt = &Apache::lonlocal::texthash(
                                           p_mnf => 'Name of New Folder',
                                           t_mnf => 'New Folder',
                                           p_mnp => 'Name of New Page',
                                           t_mnp => 'New Page',
-                                          p_mxu => 'Title for the Uploaded Score',
-                                          p_msp => 'Title for the Page',
+                                          p_mxu => 'Title for the External Score',
+                                          p_msp => 'Name of Simple Course Page',
                                           p_msb => 'Title for the Problem',
                                           p_mdb => 'Title for the Drop Box',
-                                          p_mbb => 'Title for the Bulletin Board',
-                                          p_mab => "Enter user:domain for User's 'About Me' Page",
-                                          p_mab2 => "About [_99]",
+                                          p_mbb => 'Title for the Discussion Board',
+                                          p_mab => "Enter user:domain for User's Personal Information Page",
+                                          p_mab2 => 'Personal Information Page of ',
                                           p_mab_alrt1 => 'Not a valid user:domain',
                                           p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
                                           p_chn => 'New Title',
@@ -3362,9 +3240,27 @@ sub editing_js {
                                           p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
                                           p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
                                           p_ctr2a => 'Cut[_98]',
-                                          p_ctr2b => '?[_98]'
+                                          p_ctr2b => '?[_98]',
+                                          rpck    => 'Enter number to pick (e.g., 3)',
                                         );
 
+    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();
+
+    my $backtourl = '/adm/navmaps';
+    if ($supplementalflag) {
+        $backtourl = '/adm/supplemental';
+    }
+
     return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
     var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
@@ -3400,7 +3296,7 @@ function edittext(targetname,residx,titl
 
 function makeexamupload() {
    var title=prompt('$lt{"p_mxu"}');
-   if (title) { 
+   if (title) {
     this.document.forms.newexamupload.importdetail.value=
 	escape(title)+'=/res/lib/templates/examupload.problem';
     this.document.forms.newexamupload.submit();
@@ -3409,7 +3305,7 @@ function makeexamupload() {
 
 function makesmppage() {
    var title=prompt('$lt{"p_msp"}');
-   if (title) { 
+   if (title) {
     this.document.forms.newsmppg.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/$now/smppg';
     this.document.forms.newsmppg.submit();
@@ -3418,7 +3314,7 @@ function makesmppage() {
 
 function makesmpproblem() {
    var title=prompt('$lt{"p_msb"}');
-   if (title) { 
+   if (title) {
     this.document.forms.newsmpproblem.importdetail.value=
 	escape(title)+'=/res/lib/templates/simpleproblem.problem';
     this.document.forms.newsmpproblem.submit();
@@ -3427,7 +3323,7 @@ function makesmpproblem() {
 
 function makedropbox() {
    var title=prompt('$lt{"p_mdb"}');
-   if (title) { 
+   if (title) {
     this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';
     this.document.forms.newdropbox.submit();
@@ -3452,123 +3348,429 @@ 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();
-	   } else {
-               alert("$lt{'p_mab_alrt1'}");
-           }
-       } else {
-           alert("$lt{'p_mab_alrt2'}");
-       }
+       this.document.forms.newaboutsomeone.submit();
+   } else {
+       alert("$lt{'p_mab_alrt1'}");
    }
+} else {
+   alert("$lt{'p_mab_alrt2'}");
+}
+}
 }
 
 function makeims() {
-    var caller = document.forms.ims.folder.value;
-    var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
-    newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
-    newWindow.location.href = newlocation;
+var caller = document.forms.ims.folder.value;
+var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+newWindow.location.href = newlocation;
 }
 
-
 function finishpick() {
-    var title=this.document.forms.extimport.title.value;
-    var url=this.document.forms.extimport.url.value;
-    var form=this.document.forms.extimport.useform.value;
-    var residx=this.document.forms.extimport.residx.value;
-    eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
+var title=this.document.forms.extimport.title.value;
+var url=this.document.forms.extimport.url.value;
+var form=this.document.forms.extimport.useform.value;
+var residx=this.document.forms.extimport.residx.value;
+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);
-    if (title) {
-	this.document.forms.renameform.markcopy.value=-1;
-	this.document.forms.renameform.title.value=title;
-	this.document.forms.renameform.cmd.value='rename_'+index;
-        if (container == 'sequence') {
-	    this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
-        }
-        this.document.forms.renameform.submit();
-    }
+var title=prompt('$lt{"p_chn"}',oldtitle);
+if (title) {
+this.document.forms.renameform.markcopy.value=-1;
+this.document.forms.renameform.title.value=title;
+this.document.forms.renameform.cmd.value='rename_'+index;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
 }
 
 function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-    if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
-	this.document.forms.renameform.markcopy.value=-1;
-	this.document.forms.renameform.cmd.value='del_'+index;
-        if (container == 'sequence') {
-            this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
-        }
-        this.document.forms.renameform.submit();
-    }
+if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+this.document.forms.renameform.markcopy.value=-1;
+this.document.forms.renameform.cmd.value='del_'+index;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
 }
 
 function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-    if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
-	this.document.forms.renameform.cmd.value='cut_'+index;
-	this.document.forms.renameform.markcopy.value=index;
-	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-        if (container == 'sequence') {
-            this.document.forms.renameform.folderpath.value=folderpath;
-        }
-        if (container == 'page') {
-            this.document.forms.renameform.pagepath.value=folderpath;
-            this.document.forms.renameform.pagesymb.value=pagesymb;
+if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
+this.document.forms.renameform.cmd.value='cut_'+index;
+this.document.forms.renameform.markcopy.value=index;
+this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+if (container == 'sequence') {
+    this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+    this.document.forms.renameform.pagepath.value=folderpath;
+    this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
+}
+
+function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
+this.document.forms.renameform.markcopy.value=index;
+this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+if (container == 'sequence') {
+this.document.forms.renameform.folderpath.value=folderpath;
+}
+if (container == 'page') {
+this.document.forms.renameform.pagepath.value=folderpath;
+this.document.forms.renameform.pagesymb.value=pagesymb;
+}
+this.document.forms.renameform.submit();
+}
+
+function updatePick(targetform,index,caller) {
+    var pickitem = document.getElementById('rpick_'+index);
+    var picknumitem = document.getElementById('rpicknum_'+index);
+    if (pickitem.checked) {
+        var picknum=prompt('$lt{"rpck"}',picknumitem.value);
+        if (picknum == '' || picknum == null) {
+            if (caller == 'check') {
+                pickitem.checked=false;
+                return;
+            }
+        } else {
+            picknum.toString();
+            var regexdigit=/^\\d+\$/;
+            if (regexdigit.test(picknum)) {
+                picknumitem.value = picknum;
+                targetform.changeparms.value='randompick';
+                targetform.submit();
+            } else {
+                if (caller == 'check') {
+                    pickitem.checked=false;
+                }
+                return;
+            }
         }
-        this.document.forms.renameform.submit();
+    } else {
+        picknumitem.value = 0;
+        targetform.changeparms.value='randompick';
+        targetform.submit();
     }
 }
 
-function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
-    this.document.forms.renameform.markcopy.value=index;
-    this.document.forms.renameform.copyfolder.value=folder+'.'+container;
-    if (container == 'sequence') {
-	this.document.forms.renameform.folderpath.value=folderpath;
-    }
-    if (container == 'page') {
-	this.document.forms.renameform.pagepath.value=folderpath;
-	this.document.forms.renameform.pagesymb.value=pagesymb;
-    }
-    this.document.forms.renameform.submit();
-}
-
-function unselectInactive() {
-	currentTable = document.getElementById('tableId');
-	currentNav = document.getElementById('navigation');
-	currentLis = currentNav.getElementsByTagName('LI');
-	for (i = 0; i < currentLis.length; i++) {
+function unselectInactive(nav) {
+currentNav = document.getElementById(nav);
+currentLis = currentNav.getElementsByTagName('LI');
+for (i = 0; i < currentLis.length; i++) {
+        if (currentLis[i].className == 'goback') {
+            currentLis[i].className = 'goback';
+        } else {
+	    if (currentLis[i].className == 'right active' || currentLis[i].className == 'right') {
+		currentLis[i].className = 'right';
+	    } else {
 		currentLis[i].className = 'i';
-	}
+	    }
+        }
+}
 }
 
-function hideAll(current) {
-	unselectInactive();
+function hideAll(current, nav, data) {
+unselectInactive(nav);
+if(current.className == 'right'){
+	current.className = 'right active'
+	}else{
 	current.className = 'active';
-	currentData = document.getElementById('content');
-	currentDivs = currentData.getElementsByTagName('DIV');
-	for (i = 0; i < currentDivs.length; i++) {
+}
+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) {
-	hideAll(current);
-	unselectInactive();
+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();
+}
+
+function toContents(jumpto) {
+    var newurl = '$backtourl';
+    if (jumpto != '') {
+        newurl = newurl+'?postdata='+jumpto;
+;
+    }
+    location.href=newurl;
+}
+
 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;
+}
+
 1;
 __END__
 
@@ -3592,7 +3794,7 @@ Available help topics
 
 =item mapread()
 
-Mapread read maps into LONCAPA::map:: global arrays 
+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
@@ -3616,22 +3818,6 @@ Generate "dump" button
 
     Generate "export" button
 
-=item exportcourse()
-
-=item create_ims_store()
-
-=item build_package()
-
-=item get_dependencies()
-
-=item process_content()
-
-=item replicate_content()
-
-=item extract_media()
-
-=item store_template()
-
 =item group_import()
 
     Imports the given (name, url) resources into the course