');
# --------------------------------------------------------- Standard documents
- if (($standard) && ($allowed) && (!$forcesupplement)) {
+ my $savefolderpath;
my $active = 'style="display: none;"';
if($activeClass == 0){
$active = 'style="display: block;"';
}
- $r->print('
');
+ $r->print('
');
$r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
&mt('Editing the Table of Contents for your '.$type)));
my $folder=$env{'form.folder'};
- if ($folder eq '' || $folder eq 'supplemental') {
+ if ($folder eq '' || $folder=~/^supplemental/) {
$folder='default';
+ $savefolderpath = $env{'form.folderpath'};
$env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
$uploadtag = '';
@@ -3030,7 +3030,7 @@ NBFORM
value="$plainname=/adm/$udom/$uname/aboutme" />
- $help{'My Personal Homepage'}
+ $help{'My Personal Information Page'}
NAMFORM
@@ -3060,6 +3060,7 @@ NASOFORM
NROSTFORM
my $specialdocumentsform;
+my $newfolderform;
unless ($env{'form.pagepath'}) {
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
@@ -3076,7 +3077,7 @@ my $specialdocumentsform;
NPFORM
- my $newfolderform=(<
@@ -3107,12 +3108,12 @@ NSYLFORM
value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
- $help{'Group Files'}
+ $help{'Group Portfolio'}
NGFFORM
- $specialdocumentsform="
$newfolderform
$newpageform
$newsylform
$newgroupfileform";
+ $specialdocumentsform="
$newpageform
$newsylform
$newgroupfileform";
}
$specialdocumentsform.="
$newnavform
$newsmppageform
$newsmpproblemform
$newdropboxform
@@ -3127,20 +3128,18 @@ my %orderhash = (
'aa' => 'New Document',
'bb' => 'Published Documents',
'cc' => 'Special Documents',
- 'dd' => 'More Options',
+ 'dd' => 'Tools',
'zz' => 'Hide all Options',
);
my %namehash = (
- 'New Document' => $fileuploadform,
+ 'New Document' => $fileuploadform.'
'.$newfolderform,
'Published Documents' => $simpleeditdefaultform,
'Special Documents' => $specialdocumentsform,
- 'More Options' => $extresourcesform.'
'.$imspform.'
'.$recoverform,
+ 'Tools' => $extresourcesform.'
'.$imspform.'
'.$recoverform.'
'.&generate_admin_options($containertag,$uploadtag,\%help,\%env),
);
my $tid='1';
-my $content='content';
-my $navigation='navigation';
my $varcd = 'Main Course Documents';
-$r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash));
+$r->print(&generate_edit_table($tid,$varcd,\%namehash,\%orderhash));
$hadchanges=0;
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
if ($error) {
@@ -3154,9 +3153,7 @@ $r->print(&generate_edit_table($tid,$con
$r->print('
');
if ($env{'form.pagepath'}) {
}
- }
# ----------------------------------------------------- Supplemental documents
- if (!$forcestandard) {
my $active = 'style="display: none;"';
if($activeClass == 1){
$active = 'style="display: block;"';
@@ -3170,6 +3167,8 @@ $r->print('
');
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
$env{'form.folderpath'} = 'supplemental&'.
&escape(&mt('Supplemental '.$type.' Documents'));
+ }else{
+ $env{'form.folderpath'} = $savefolderpath;
}
if ($allowed) {
my $folderseq=
@@ -3188,7 +3187,7 @@ $r->print('