--- loncom/interface/londocs.pm	2004/09/09 18:57:21	1.137.2.2
+++ loncom/interface/londocs.pm	2005/01/08 06:34:30	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.137.2.2 2004/09/09 18:57:21 albertel Exp $
+# $Id: londocs.pm,v 1.163 2005/01/08 06:34:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,15 +30,18 @@ package Apache::londocs;
 
 use strict;
 use Apache::Constants qw(:common :http);
+use Apache::imsexport;
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonratedt;
 use Apache::lonratsrv;
 use Apache::lonxml;
 use Apache::loncreatecourse;
+use Apache::lonnavmaps;
 use HTML::Entities;
 use GDBM_File;
 use Apache::lonlocal;
+use Cwd;
 
 my $iconpath;
 
@@ -211,7 +214,7 @@ sub dumpcourse {
 	}
 	my $title=$origcrsdata{'description'};
 	$title=~s/\s+/\_/gs;
-	$title=~s/\W//gs;
+	$title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
 	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
 	&tiehash();
 	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');
@@ -220,12 +223,13 @@ sub dumpcourse {
 	    my ($ext)=($_=~/\.(\w+)$/);
 	    my $title=$hash{'title_'.$hash{
 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+	    $title=~s/&colon;/:/g;
 	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
 	    unless ($title) {
 		$title=$_;
 	    }
 	    $title=~s/\.(\w+)$//;
-	    $title=~s/[^\w\/]+/\_/gs;
+	    $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
 	    $title.='.'.$ext;
 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
 	}
@@ -236,6 +240,598 @@ sub dumpcourse {
     }
 }
 
+# ------------------------------------------------------ Generate "export" button
+
+sub exportbutton {
+    return '';
+    return '</td><td bgcolor="#DDDDCC">'.
+            '<input type="submit" name="exportcourse" value="'.
+            &mt('Export Course to IMS').'" />'.
+            &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
+}
+
+sub exportcourse {
+    my $r=shift;
+    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();
+    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 = ();
+        if (defined($ENV{'form.archive'})) {
+            if (ref($ENV{'form.archive'}) eq 'ARRAY') {
+                @exportitems = @{$ENV{'form.archive'}};
+            } else {
+                $exportitems[0] = $ENV{'form.archive'};
+            }
+        }
+        my @discussions = ();
+        if (defined($ENV{'form.discussion'})) {
+            if (ref($ENV{'form.discussion'}) eq 'ARRAY') {
+                @discussions = $ENV{'form.discussion'};
+            } else {
+                $discussions[0] = $ENV{'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';
+# zip can cause an sh launch which can pass along all of %ENV
+# which can be too large for /bin/sh to handle
+                my %oldENV=%ENV;
+                undef(%ENV);
+                my $cwd = &Cwd::getcwd();
+                my $imszip = '/home/httpd/'.$imszipfile;
+                chdir $tempexport;
+                open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
+                close(OUTPUT);
+                chdir $cwd;
+                %ENV=%oldENV;
+                undef(%oldENV);
+                $outcome .= 'Download the zip file from <a href="'.$imszipfile.'">IMS course archive</a><br />';
+                if ($copyresult) {
+                    $outcome .= 'The following errors occurred during export - '.$copyresult;
+                }
+            } else {
+                $outcome = '<br />Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.<br />';
+            }
+        }
+
+        $r->print('<html><head><title>Export Course</title></head>'.
+            &Apache::loncommon::bodytag('Export course to IMS content package'));
+        $r->print($outcome);
+        $r->print('</body></html>');
+    } else {
+        my $display;
+        $display = '<form name="exportdoc" method="post">'."\n";
+        $display .= 'Choose which items you wish to export from your course.<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/(\w+)/(\w+)/(\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" width="25" height="1" alt="" border="0" /><img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" />'."\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('<html><head><title>Export Course</title>'.$scripttag.'</head>'.
+            &Apache::loncommon::bodytag('Export course to IMS content package'
+));
+
+        $r->print($display.'</table>'.
+                  '<p><input type="hidden" name="finishexport" value="1">'.
+                  '<input type="submit" name="exportcourse" value="'.
+                  &mt('Export Course DOCS').'" /></p></form></body></html>');
+    }
+}
+
+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".
+'  <organizations default="ORG-'.$ENV{'request.course.id'}.'-'.$now.'">'."\n".
+'    <organization identifier="ORG-'.$ENV{'request.course.id'}.'-'.$now.'"'.
+' structure="hierarchical">'."\n".
+'      <title>'.$ENV{'request.'.$ENV{'request.course.id'}.'.description'}.'</title>'
+    } else {
+        $$outcome .= 'An error occurred opening the IMS manifest file.<br />'
+;
+    }
+    return $ims_manifest;
+}
+
+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;
+    my $included = 0;
+    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.'"';
+                }
+                if (($depth <= $prevdepth) && ($count > 1) && ($included)) {
+                    print $ims_manifest "\n".'  </item>'."\n";
+                }
+                $included = 1;
+                $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 (@hrefs) {
+                            $imsresources .=
+                     '        <file href="'.$_.'" />'."\n";
+                        }
+                        if (grep/^$count$/,@$discussions) {
+                            my $ressymb = $symb;
+                            my $mode;
+                            if ($ressymb =~ m|adm/(\w+)/(\w+)/(\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;
+            } else {
+                $included = 0;
+            }
+        }
+    }
+    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;
+# find where user is author or co-author
+    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-m) {
+        $content_type = 'examupload';
+    } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\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;
+        }
+        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') {
+                $content = &Apache::lonnet::getfile('/home/httpd/html/res/'.$url);
+                if ($content eq -1) {
+                    $$message = 'Could not copy file '.$filename;
+                } else {
+                    &extract_media($content,$count,$tempexport,$href,'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(\$content,$count,$tempexport,$href,'uploaded');
+                    }
+                } else {
+                    $$message = 'Could not render '.$url.' server message - '.$rtncode;
+                }
+            } 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."\n";
+        }
+    } else {
+        $$message = 'Could not determine name of file for '.$symb."\n";
+    }
+    if ($repstatus eq 'ok') {
+        $content_name = $count.'/'.$filename;
+    }
+    return $content_name;
+}
+
+sub extract_media {
+    my ($content,$count,$tempexport,$href,$caller) = @_;
+# @$href will contain path to any embedded resources in the content.
+# For LON-CAPA problems this would be images. applets etc. 
+# For uploaded HTML files this would be images etc.
+# paths will be in the form $count/res/$file, and urls in the $content will be rewritten with the new paths. 
+    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 $count.'/'.$content_type.'.html';
+            } else {
+                return $count.'/'.$content_type.'.xml';
+            }
+        }
+    }
+}
 
 # Imports the given (name, url) resources into the course
 # coursenum, coursedom, and folder must precede the list
@@ -243,9 +839,31 @@ sub group_import {
     my $coursenum = shift;
     my $coursedom = shift;
     my $folder = shift;
+    my $container = shift;
+    my $caller = shift;
     while (@_) {
 	my $name = shift;
 	my $url = shift;
+        if (($url =~ m#^/uploaded/$coursedom/$coursenum/(default_\d+\.)(page|sequence)$#) && ($caller eq 'londocs')) {
+            my $errtext = '';
+            my $fatal = 0;
+            my $newmapstr = '<map>'."\n".
+                            '<resource id="1" src="" type="start"></resource>'."\n".
+                            '<link from="1" to="2" index="1"></link>'."\n".
+                            '<resource id="2" src="" type="finish"></resource>'."\n".
+                            '</map>';
+            $ENV{'form.output'}=$newmapstr;
+            my $home=&Apache::lonnet::homeserver($coursenum,$coursedom);
+            my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$home,
+                                                'output',$1.$2);
+            if ($result != m|^/uploaded/|) {
+                $errtext.='Map not saved: A network error occured when trying to save the new map. ';
+                $fatal = 2;
+            }
+            if ($fatal) {
+                return ($errtext,$fatal);
+            }
+        }
 	if ($url) {
 	    my $idx = $#Apache::lonratedt::resources + 1;
 	    $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
@@ -257,13 +875,18 @@ sub group_import {
 		join ':', ($name, $url, $ext, 'normal', 'res');
 	}
     }
-    return &storemap($coursenum, $coursedom, $folder.'.sequence');
+    return &storemap($coursenum, $coursedom, $folder.'.'.$container);
 }
 
 sub breadcrumbs {
     my ($where)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
-    my (@folders)=split('&',$ENV{'form.folderpath'});
+    my (@folders);
+    if ($ENV{'form.pagepath'}) {
+        @folders = split('&',$ENV{'form.pagepath'});
+    } else {
+        @folders=split('&',$ENV{'form.folderpath'});
+    }
     my $folderpath;
     while (@folders) {
 	my $folder=shift(@folders);
@@ -291,8 +914,12 @@ sub editor {
     $r->print(&breadcrumbs($folder));
     my $errtext='';
     my $fatal=0;
+    my $container='sequence';
+    if ($ENV{'form.pagepath'}) {
+        $container='page';
+    }
     ($errtext,$fatal)=
-          &mapread($coursenum,$coursedom,$folder.'.sequence');
+              &mapread($coursenum,$coursedom,$folder.'.'.$container);
     if ($#Apache::lonratedt::order<1) {
        	$Apache::lonratedt::order[0]=1;
         $Apache::lonratedt::resources[1]='';
@@ -360,7 +987,7 @@ sub editor {
 		}
 # store the changed version
 
-		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
+		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 		if ($fatal) {
 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
 		    return;
@@ -392,7 +1019,7 @@ sub editor {
               $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
                                                               $newidx;       
 
-	      ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
+	      ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
 	      if ($fatal) {
 		  $r->print('<p><font color="red">'.$errtext.'</font></p>');
 		  return;
@@ -426,6 +1053,7 @@ sub editor {
                     $Apache::lonratedt::order[$idx]=$i;
 		   }
                 } elsif ($cmd eq 'rename') {
+                    my $ratstr = $Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]];
                     my ($rtitle,@rrest)=split(/\:/,
                        $Apache::lonratedt::resources[
 				       $Apache::lonratedt::order[$idx]]);
@@ -434,14 +1062,15 @@ sub editor {
                     $comment=~s/\</\&lt\;/g;
                     $comment=~s/\>/\&gt\;/g;
                     $comment=~s/\:/\&colon;/g;
-                    $Apache::lonratedt::resources[
+		    if ($comment=~/\S/) {
+			$Apache::lonratedt::resources[
 				       $Apache::lonratedt::order[$idx]]=
-                             $comment.':'.join(':',@rrest);
-                    
+				            $comment.':'.join(':',@rrest);
+		    }
                 }
 # Store the changed version
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
-					    $folder.'.sequence');
+					    $folder.'.'.$container);
 		if ($fatal) {
 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
 		    return;
@@ -460,7 +1089,7 @@ sub editor {
 		}
 # Store the changed version
 		($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
-					       @imports);
+					       $container,'londocs',@imports);
 		if ($fatal) {
 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
 		    return;
@@ -478,7 +1107,7 @@ sub editor {
 
 # Store the changed version
 	       ($errtext,$fatal)=&storemap($coursenum,$coursedom,
-					   $folder.'.sequence');
+					   $folder.'.'.$container);
 	       if ($fatal) {
 		   $r->print('<p><font color="red">'.$errtext.'</font></p>');
 		   return;
@@ -488,15 +1117,17 @@ sub editor {
 # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen
         my $idx=0;
+	my $shown=0;
         $r->print('<table>');
         foreach (@Apache::lonratedt::order) {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
-           unless ($name) { next; }
+           unless ($name) { $idx++; next; }
            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
            $idx++;
+	   $shown++;
         }
-	unless ($idx) {
+	unless ($shown) {
 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
 	}
         $r->print('</table>');
@@ -512,6 +1143,7 @@ sub entryline {
      &Apache::lonnet::unescape($title)),'"<>&\'');
     my $renametitle=$title;
     my $foldertitle=$title;
+    my $pagetitle=$title;
     my $orderidx=$Apache::lonratedt::order[$index];
     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/	) { 
 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
@@ -523,11 +1155,19 @@ sub entryline {
     $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';
 # Edit commands
+    my $container;
     my $folderpath;
     if ($ENV{'form.folderpath'}) {
+        $container = 'sequence';
 	$folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
 	# $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     }
+    my ($pagepath,$pagesymb);
+    if ($ENV{'form.pagepath'}) {
+        $container = 'page';
+        $pagepath=&Apache::lonnet::escape($ENV{'form.pagepath'});
+        $pagesymb=&Apache::lonnet::escape($ENV{'form.pagesymb'});
+    }
     if ($allowed) {
 	my $incindex=$index+1;
 	my $selectbox='';
@@ -549,7 +1189,29 @@ sub entryline {
 		'dw' => 'Move Down',
 		'rm' => 'Remove',
 		'rn' => 'Rename');
-	$line.=(<<END);
+        if ($ENV{'form.pagepath'}) {
+            $line.=(<<END);
+<form name="entry_$index" action="/adm/coursedocs" method="post">
+<input type="hidden" name="pagepath" value="$ENV{'form.pagepath'}" />
+<input type="hidden" name="pagesymb" value="$ENV{'form.pagesymb'}" />
+<input type="hidden" name="setparms" value="$orderidx" />
+<td><table border='0' cellspacing='2' cellpadding='0'>
+<tr><td bgcolor="#DDDDDD">
+<a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb'>
+<img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
+<tr><td bgcolor="#DDDDDD">
+<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb'>
+<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
+</table></td>
+<td>$selectbox
+</td><td bgcolor="#DDDDDD">
+<a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#990000">$lt{'rm'}</font></a>
+<a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
+<font size="-2" color="#009900">$lt{'rn'}</font></a></td>
+END
+        } else {
+            $line.=(<<END); 
 <form name="entry_$index" action="/adm/coursedocs" method="post">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="setparms" value="$orderidx" />
@@ -563,18 +1225,22 @@ sub entryline {
 </table></td>
 <td>$selectbox
 </td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$folderpath","$index","$renametitle");'>
+<a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>
-<a href='javascript:changename("$folderpath","$index","$renametitle");'>
+<a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a></td>
 END
+        }
     }
 # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);
     my $uploaded=($url=~/^\/*uploaded\//);
     my $icon=&Apache::loncommon::icon($url);
     my $isfolder=0;
+    my $ispage=0;
     my $folderarg;
+    my $pagearg;
+    my $pagefile;
     if ($uploaded) {
 	if ($extension eq 'sequence') {
 	    $icon=$iconpath.'/folder_closed.gif';
@@ -582,12 +1248,18 @@ END
 	    $url='/adm/coursedocs?';
 	    $folderarg=$1;
 	    $isfolder=1;
+        } elsif ($extension eq 'page') {
+            $icon=$iconpath.'/page.gif';
+            $url=~/$coursenum\/([\/\w]+)\.page$/;
+            $pagearg=$1;
+            $url='/adm/coursedocs?';
+            $ispage=1;
 	} else {
 	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
 	}
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
-    if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
+    if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
 	my $symb=&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.
            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
@@ -607,8 +1279,16 @@ END
 	    } elsif ($url!~/\.(sequence|page)$/) {
 		$url='/adm/coursedocs/showdoc'.$url;
 	    }
+	} elsif ($url=~m|^/ext/|) { 
+	    $url='/adm/wrapper'.$url;
 	}
 	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+	if ($container eq 'page') {
+	    my $symb=$ENV{'form.pagesymb'};
+	    	    
+	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
+	    $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+	}
     }
     my $parameterset='&nbsp;';
     if ($isfolder) {
@@ -617,9 +1297,30 @@ END
 	if ($folderpath) { $folderpath.='&' };
 	$folderpath.=$folderarg.'&'.$foldername;
 	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
-	$parameterset=&mt('Randomly Pick: ').
+	$parameterset='<label>'.&mt('Randomly Pick: ').
 	    '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
-	    (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
+	    (&Apache::lonratedt::getparameter($orderidx,
+                                              'parameter_randompick'))[0].
+                                              '" />'.'</label>';
+       
+    }
+    if ($ispage) {
+        my $pagename=&Apache::lonnet::escape($pagetitle);
+        my $pagepath;
+        my $folderpath=$ENV{'form.folderpath'};
+        if ($folderpath) { $pagepath = $folderpath.'&' };
+        $pagepath.=$pagearg.'&'.$pagename;
+	my $symb=$ENV{'form.pagesymb'};
+	if (!$symb) {
+	    my $path='uploaded/'.
+		$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
+		$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/';
+	    $symb=&Apache::lonnet::encode_symb($path.$folder.'.sequence',
+					       $residx,
+					       $path.$pagearg.'.page');
+	}
+	$url.='pagepath='.&Apache::lonnet::escape($pagepath).
+	    '&pagesymb='.&Apache::lonnet::escape($symb);
     }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
 	'" border="0"></a></td>'.
@@ -635,9 +1336,9 @@ END
 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
 	$line.=(<<ENDPARMS);
 <td bgcolor="#BBBBFF"><font size='-2'>
-<input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
-<!--<td bgcolor="#BBBBFF"><font size='-2'>
-<input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>-->
+<nobr><label><input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</label></nobr></td>
+<td bgcolor="#BBBBFF"><font size='-2'>
+<nobr><label><input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
 <td bgcolor="#BBBBFF"><font size='-2'>
 <input type="submit" value="$lt{'sp'}" />
@@ -677,6 +1378,7 @@ sub untiehash {
 
 sub checkonthis {
     my ($r,$url,$level,$title)=@_;
+    $url=&Apache::lonnet::unescape($url);
     $alreadyseen{$url}=1;
     $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
@@ -763,7 +1465,15 @@ sub verifycontent {
    %alreadyseen=();
    &tiehash();
    foreach (keys %hash) {
-       if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
+       if ($hash{$_}=~/\.(page|sequence)$/) {
+	   if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
+	       $r->print('<hr /><font color="red">'.
+			 &mt('The following sequence or page is included more than once in your course: ').
+			 &Apache::lonnet::unescape($hash{$_}).'</font><br />'.
+			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
+	   }
+       }
+       if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
            &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});
        }
    }
@@ -1041,11 +1751,18 @@ sub is_hash_old {
 sub changewarning {
     my ($r,$postexec)=@_;
     if (!&is_hash_old()) { return; }
+    my $pathvar='folderpath';
+    my $path=&Apache::lonnet::escape($ENV{'form.folderpath'});
+    if (defined($ENV{'form.pagepath'})) {
+	$pathvar='pagepath';
+	$path=&Apache::lonnet::escape($ENV{'form.pagepath'});
+	$path.='&amp;symb='.&Apache::lonnet::escape($ENV{'form.pagesymb'});
+    }
     $r->print(
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.
-'<input type="hidden" name="orgurl" value="/adm/coursedocs?folderpath='.
-&Apache::lonnet::escape($ENV{'form.folderpath'}).
+'<input type="hidden" name="orgurl" value="/adm/coursedocs?'.
+$pathvar.'='.$path.
 '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
 &mt('Changes will become active for your current session after').
 ' <input type="hidden" name="'.
@@ -1065,7 +1782,7 @@ sub handler {
   foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',
            'Adding_Folders','Docs_Overview', 'Load_Map',
-           'Supplemental', 'Score_Upload_Form',
+           'Supplemental','Score_Upload_Form','Adding_Pages',
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
 	   'Check_Resource_Versions','Verify_Content') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
@@ -1082,35 +1799,51 @@ sub handler {
     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
 		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
- 
+
   if ($ENV{'form.verify'}) {
       &verifycontent($r);
   } elsif ($ENV{'form.versions'}) {
       &checkversions($r);
   } elsif ($ENV{'form.dumpcourse'}) {
       &dumpcourse($r);
+  } elsif ($ENV{'form.exportcourse'}) {
+      &exportcourse($r);
   } else {
 # is this a standard course?
 
     my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);
-    my $forcestandard;
+    my $forcestandard = 0;
     my $forcesupplement;
     my $script='';
     my $allowed;
     my $events='';
     my $showdoc=0;
+    my $containertag;
+    my $uploadtag;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['folderpath']);
+					    ['folderpath','pagepath','pagesymb']);
     if ($ENV{'form.folderpath'}) {
 	my (@folderpath)=split('&',$ENV{'form.folderpath'});
 	$ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
 	$ENV{'form.folder'}=pop(@folderpath);
-    } 
+    }
+    if ($ENV{'form.pagepath'}) {
+        my (@pagepath)=split('&',$ENV{'form.pagepath'});
+        $ENV{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath));
+        $ENV{'form.folder'}=pop(@pagepath);
+        $containertag = '<input type="hidden" name="pagepath" value="" />'.
+	    '<input type="hidden" name="pagesymb" value="" />';
+        $uploadtag = '<input type="hidden" name="pagepath" value="'.$ENV{'form.pagepath'}.'" />'.
+	    '<input type="hidden" name="pagesymb" value="'.$ENV{'form.pagesymb'}.'" />';
+    }
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc='/'.$1;
     }
     unless ($showdoc) { # got called from remote
-       $forcestandard=($ENV{'form.folder'}=~/^default_/);
+       if (($ENV{'form.folder'}=~/^default_/) || 
+          ($ENV{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) {
+           $forcestandard = 1;
+       } 
        $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
 
 # does this user have privileges to post, etc?
@@ -1163,6 +1896,14 @@ function makenewfolder(targetform,folder
     }
 }
 
+function makenewpage(targetform,folderseq) {
+    var pagename=prompt('Name of New Page','New Page');
+    if (pagename) {
+        targetform.importdetail.value=pagename+"="+folderseq;
+        targetform.submit();
+    }
+}
+
 function makenewext(targetname) {
     this.document.forms.extimport.useform.value=targetname;
     window.open('/adm/rat/extpickframe.html');
@@ -1236,20 +1977,32 @@ function finishpick() {
     '";this.document.forms.'+form+'.submit();');
 }
 
-function changename(folderpath,index,oldtitle) {
+function changename(folderpath,index,oldtitle,container,pagesymb) {
     var title=prompt('New Title',oldtitle);
     if (title) {
 	this.document.forms.renameform.title.value=title;
 	this.document.forms.renameform.cmd.value='rename_'+index;
-	this.document.forms.renameform.folderpath.value=folderpath;
+        if (container == 'sequence') {
+	    this.document.forms.renameform.folderpath.value=folderpath;
+        }
+        if (container == 'page') {
+            this.document.forms.renameform.pagepath.value=folderpath;
+            this.document.forms.renameform.pagesymb.value=pagesymb;
+        }
         this.document.forms.renameform.submit();
     }
 }
 
-function removeres(folderpath,index,oldtitle) {
+function removeres(folderpath,index,oldtitle,container,pagesymb) {
     if (confirm('Remove "'+oldtitle+'"?')) {
 	this.document.forms.renameform.cmd.value='del_'+index;
-	this.document.forms.renameform.folderpath.value=folderpath;
+        if (container == 'sequence') {
+            this.document.forms.renameform.folderpath.value=folderpath;
+        }
+        if (container == 'page') {
+            this.document.forms.renameform.pagepath.value=folderpath;
+            this.document.forms.renameform.pagesymb.value=pagesymb;
+        }
         this.document.forms.renameform.submit();
     }
 }
@@ -1276,6 +2029,7 @@ ENDNEWSCRIPT
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
                 'newf' => 'New Folder',
+                'newp' => 'New Composite Page',
                 'extr' => 'External Resource',
                 'syll' => 'Syllabus',
                 'navc' => 'Navigate Contents',
@@ -1293,6 +2047,7 @@ ENDNEWSCRIPT
 # -----------------------------------------------------------------------------
     if ($allowed) {
        my $dumpbut=&dumpbutton();
+       my $exportbut=&exportbutton();
        my %lt=&Apache::lonlocal::texthash(
 					 'vc' => 'Verify Content',
 					 'cv' => 'Check/Set Resource Versions',
@@ -1306,15 +2061,20 @@ ENDNEWSCRIPT
 		   &Apache::lonnet::escape(&mt('Main Course Documents'));
 	   }
        }
+       unless ($ENV{'form.pagepath'}) {
+           $containertag = '<input type="hidden" name="folderpath" value="" />';
+           $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
+       }
+
        $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />
 <input type="hidden" name="cmd" />
-<input type="hidden" name="folderpath" />
+$containertag
 </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">
-<input type="hidden" name="folderpath" value="$folderpath" />
+$uploadtag
 </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">
 <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
@@ -1323,6 +2083,7 @@ ENDNEWSCRIPT
 </td><td bgcolor="#DDDDCC">
     <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
 $dumpbut
+$exportbut
 </td></tr></table>
 </form>
 ENDCOURSEVERIFY
@@ -1354,6 +2115,9 @@ ENDCOURSEVERIFY
        &changewarning($r,$postexec);
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
+       my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
+                     '.page';
+
        $r->print(<<ENDFORM);
 <table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">$lt{'uplm'}</th>
@@ -1367,7 +2131,7 @@ $lt{'file'}:<br />
 <br />
 $lt{'title'}:<br />
 <input type="text" size="50" name="comment">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type="hidden" name="cmd" value="upload_default">
 <nobr>
 <input type="submit" value="$lt{'upld'}">
@@ -1377,7 +2141,7 @@ $lt{'title'}:<br />
 </td>
 <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
 <nobr>
 <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
@@ -1392,7 +2156,11 @@ value="$lt{'selm'}"> <input type="submit
 $help{'Load_Map'}</nobr>
 </p>
 </form>
-</td><td bgcolor="#DDDDDD">
+</td>
+<td bgcolor="#DDDDDD">
+ENDFORM
+       unless ($ENV{'form.pagepath'}) {
+           $r->print(<<ENDFORM);
 <form action="/adm/coursedocs" method="post" name="newfolder">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
@@ -1402,16 +2170,25 @@ onClick="javascript:makenewfolder(this.f
 value="$lt{'newf'}" />$help{'Adding_Folders'}
 </nobr>
 </form>
-<form action="/adm/coursedocs" method="post" name="newext">
+<form action="/adm/coursedocs" method="post" name="newpage">
 <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type=hidden name="importdetail" value="">
 <nobr>
+<input name="newpage" type="button"
+onClick="javascript:makenewpage(this.form,'$pageseq');"
+value="$lt{'newp'}" />$help{'Adding_Pages'}
+</nobr>
+</form>
+<form action="/adm/coursedocs" method="post" name="newext">
+$uploadtag
+<input type=hidden name="importdetail" value="">
+<nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
@@ -1420,7 +2197,7 @@ value="Syllabus=/public/$coursedom/$cour
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newnav">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
 <nobr>
@@ -1429,7 +2206,7 @@ $help{'Navigate_Content'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newsmppg" type="button" value="$lt{'sipa'}"
@@ -1437,7 +2214,7 @@ onClick="javascript:makesmppage();" /> $
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
@@ -1445,7 +2222,7 @@ onClick="javascript:makesmpproblem();" /
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newexamupload" type="button" value="$lt{'scuf'}"
@@ -1454,7 +2231,7 @@ $help{'Score_Upload_Form'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newbul">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newbulletin" type="button" value="$lt{'bull'}"
@@ -1463,7 +2240,7 @@ $help{'Bulletin Board'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
@@ -1472,21 +2249,46 @@ $help{'My Personal Info'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
-<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
+$uploadtag
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
 onClick="javascript:makeabout();" />
 </nobr>
+ENDFORM
+       }
+       if ($ENV{'form.pagepath'}) {
+           $r->print(<<ENDBLOCK);
+<form action="/adm/coursedocs" method="post" name="newsmpproblem">
+$uploadtag
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
+onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+</nobr>
+</form>
+<form action="/adm/coursedocs" method="post" name="newexamupload">
+$uploadtag
+<input type=hidden name="importdetail" value="">
+<nobr>
+<input name="newexamupload" type="button" value="$lt{'scuf'}"
+onClick="javascript:makeexamupload();" />
+$help{'Score_Upload_Form'}
+</nobr>
+</form>
+ENDBLOCK
+       } else {
+           $r->print(<<ENDFORM);
 </form>
 <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();" />
 </nobr>
 </form>
-</td></tr>
-</table>
 ENDFORM
+       }
+       $r->print('</td></tr>'."\n".
+'</table>');
        $r->print('</td></tr>');
     }
 # ----------------------------------------------------- Supplemental documents