'."\n";
@@ -405,19 +436,25 @@ sub exportcourse {
}
my $currelem = $count+$boards+$startcount;
$children{$parent{$depth}} .= $currelem.':';
- $display .= ' '.$curRes->title().'
'
+ .'
'=>"$help{'Uploading_From_Harddrive'}"},
+ );
my $supupdocform=(<
+
');
');
# --------------------------------------------------------- Standard documents
my $savefolderpath;
my $active = 'style="display: none;"';
if($activeClass == 0){
$active = 'style="display: block;"';
}
+ if ($allowed) {
$r->print('
');
if($activeClass == 1){
$active = 'style="display: block;"';
}
- $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=~/^supplemental/) {
$folder='default';
@@ -2924,7 +3036,12 @@ HIDDENFORM
}
my $postexec='';
if ($folder eq 'default') {
- $r->print('');
+ $r->print(''."\n"
+ );
} else {
#$postexec='self.close();';
}
@@ -2942,197 +3059,202 @@ HIDDENFORM
my $recoverform=(<
-
+ $lt{'reco'}
RFORM
my $imspform=(<
-
+ $lt{'imsf'}
IMSPFORM
my $newnavform=(<
+
$uploadtag
-
-
+ $lt{'navc'}
$help{'Navigate_Content'}
-
NNFORM
my $newsmppageform=(<
+
$uploadtag
-
- $help{'Simple Page'}
-
+ $lt{'sipa'}
+ $help{'Simple Page'}
NSPFORM
my $newsmpproblemform=(<
+
$uploadtag
-
- $help{'Simple Problem'}
-
+ $lt{'sipr'}
+ $help{'Simple Problem'}
NSPROBFORM
my $newdropboxform=(<
+
$uploadtag
-
-
-
+ $lt{'drbx'}
NDBFORM
my $newexuploadform=(<
+
$uploadtag
-
-
+ $lt{'scuf'}
$help{'Score_Upload_Form'}
-
NEXUFORM
my $newbulform=(<
+
$uploadtag
-
-
+ $lt{'bull'}
$help{'Bulletin Board'}
-
NBFORM
my $newaboutmeform=(<
+
$uploadtag
-
-
+ $lt{'mypi'}
$help{'My Personal Information Page'}
-
NAMFORM
my $newaboutsomeoneform=(<
+
$uploadtag
-
-
-
+ $lt{'abou'}
NASOFORM
my $newrosterform=(<
+
$uploadtag
-
-
+ $lt{'rost'}
$help{'Course Roster'}
-
NROSTFORM
my $specialdocumentsform;
+my @specialdocumentsforma;
my $newfolderform;
+my $newfolderb;
unless ($env{'form.pagepath'}) {
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
-
+
my $newpageform=(<
-
- $help{'Adding_Pages'}
-
+
+ $lt{'newp'}
+ $help{'Adding_Pages'}
NPFORM
+
$newfolderform=(<
-
- $help{'Adding_Folders'}
-
+
+ $lt{'newf'}$help{'Adding_Folders'}
NFFORM
my $newsylform=(<
+
$uploadtag
-
-
+ $lt{'syll'}
$help{'Syllabus'}
-
+
NSYLFORM
my $newgroupfileform=(<
+
$uploadtag
-
-
+ $lt{'grpo'}
$help{'Group Portfolio'}
-
NGFFORM
-
- $specialdocumentsform="
$newpageform
$newsylform
$newgroupfileform"; + @specialdocumentsforma=( + {''=>$newpageform},
+ {''=>$newsylform},
+ {''=>$newgroupfileform},
+ );
+
}
- $specialdocumentsform.="
$newnavform
$newsmppageform -
$newsmpproblemform
$newdropboxform -
$newexuploadform
$newbulform -
$newaboutmeform
$newaboutsomeoneform -
$newrosterform"; + push @specialdocumentsforma, ({''=>$newnavform},
+ {''=>$newsmppageform},
+ {''=>$newsmpproblemform},
+ {''=>$newdropboxform},
+ {''=>$newexuploadform},
+ {''=>$newbulform},
+ {''=>$newaboutmeform},
+ {''=>$newaboutsomeoneform},
+ {''=>$newrosterform},);
+
+ $specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
+
if($env{'form.pagepath'}) {
- $specialdocumentsform="
$newsmpproblemform
$newexuploadform"; + + @specialdocumentsforma=( + {''=>$newsmpproblemform},
+ {''=>$newexuploadform}
+ );
+ $specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
}
+my @tools = (
+ {''=>$extresourcesform},
+ {''=>$imspform},
+ {''=>$recoverform},
+ );
+
my %orderhash = (
- 'aa' => ['New Document',$fileuploadform.'
'.$newfolderform], - 'bb' => ['Published Documents',$simpleeditdefaultform], + '00' => ['Newfolder',$newfolderform], + 'aa' => ['Upload Document',$fileuploadform], + 'bb' => ['Published Resources',$simpleeditdefaultform], 'cc' => ['Special Documents',$specialdocumentsform], - 'dd' => ['Tools',$extresourcesform.'
'.$imspform.'
'.$recoverform.'
'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)], - 'zz' => ['Hide all Options'], + 'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)], ); my $tid='1'; my $varcd = 'Main Course Documents'; -$r->print(&generate_edit_table($tid,$varcd,\%orderhash)); $hadchanges=0; my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); if ($error) { @@ -3143,7 +3265,10 @@ $r->print(&generate_edit_table($tid,$var } &changewarning($r,''); +$r->print(&generate_edit_table($tid,$varcd,\%orderhash)); + $r->print('
');
+ }
if ($env{'form.pagepath'}) {
}
# ----------------------------------------------------- Supplemental documents
@@ -3151,7 +3276,7 @@ $r->print('$newpageform
$newsylform
$newgroupfileform"; + @specialdocumentsforma=( + {'
'=>$newpageform},
+ {''=>$newsylform},
+ {''=>$newgroupfileform},
+ );
+
}
- $specialdocumentsform.="$newnavform
$newsmppageform -
$newsmpproblemform
$newdropboxform -
$newexuploadform
$newbulform -
$newaboutmeform
$newaboutsomeoneform -
$newrosterform"; + push @specialdocumentsforma, ({'
'=>$newnavform},
+ {''=>$newsmppageform},
+ {''=>$newsmpproblemform},
+ {''=>$newdropboxform},
+ {''=>$newexuploadform},
+ {''=>$newbulform},
+ {''=>$newaboutmeform},
+ {''=>$newaboutsomeoneform},
+ {''=>$newrosterform},);
+
+ $specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
+
if($env{'form.pagepath'}) {
- $specialdocumentsform="$newsmpproblemform
$newexuploadform"; + + @specialdocumentsforma=( + {'
'=>$newsmpproblemform},
+ {''=>$newexuploadform}
+ );
+ $specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
}
+my @tools = (
+ {''=>$extresourcesform},
+ {''=>$imspform},
+ {''=>$recoverform},
+ );
+
my %orderhash = (
- 'aa' => ['New Document',$fileuploadform.''.$newfolderform], - 'bb' => ['Published Documents',$simpleeditdefaultform], + '00' => ['Newfolder',$newfolderform], + 'aa' => ['Upload Document',$fileuploadform], + 'bb' => ['Published Resources',$simpleeditdefaultform], 'cc' => ['Special Documents',$specialdocumentsform], - 'dd' => ['Tools',$extresourcesform.'
'.$imspform.'
'.$recoverform.'
'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)], - 'zz' => ['Hide all Options'], + 'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)], ); my $tid='1'; my $varcd = 'Main Course Documents'; -$r->print(&generate_edit_table($tid,$varcd,\%orderhash)); $hadchanges=0; my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); if ($error) { @@ -3143,7 +3265,10 @@ $r->print(&generate_edit_table($tid,$var } &changewarning($r,''); +$r->print(&generate_edit_table($tid,$varcd,\%orderhash)); + $r->print('
');
+ $r->print('
');
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+ my @supupdocform = (
+ {'');
my $folder=$env{'form.folder'};
unless ($folder=~/^supplemental/) {
$folder='supplemental';
@@ -3160,7 +3285,7 @@ $r->print('
');
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
$env{'form.folderpath'} = 'supplemental&'.
&escape(&mt('Supplemental '.$type.' Documents'));
- }else{
+ } elsif ($allowed) {
$env{'form.folderpath'} = $savefolderpath;
}
$env{'form.pagepath'} = '';
@@ -3171,8 +3296,12 @@ $r->print(''=>"$help{'Uploading_From_Harddrive'}"},
+ );
my $supupdocform=(<$lt{'comment'}:
- +
- - - $help{'Uploading_From_Harddrive'} - - SUPDOCFORM + $supupdocform .= create_form_ul(create_list_elements(@supupdocform)).""; my $supnewfolderform=(<
'=>$supnewextform},
+ {''=>$supnewsylform},
+ {''=>$supnewaboutmeform},
+ );
my %suporderhash = (
- 'ee' => ['New Document',$supupdocform.''.$supnewfolderform], - 'ff' => ['Special Documents',$supnewextform.'
'.$supnewsylform.'
'.$supnewaboutmeform], - 'zz' => ['Hide all Options'], + '00' => ['Supnewfolder', $supnewfolderform], + 'ee' => ['Upload Document',$supupdocform], + 'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))] ); -my $tid='2'; -my $varscd = 'Supplemental Course Documents'; + my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); + if ($error) { + $r->print('
'.$error.'
'); + } + my $tid='2'; + my $varscd = 'Supplemental Course Documents'; + $r->print(&generate_edit_table($tid,$varscd,\%suporderhash)); + } else { + my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); + if ($error) { + $r->print(''.$error.'
'); + } + } + -$r->print(&generate_edit_table($tid,$varscd,\%suporderhash)); -my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); - if ($error) { - $r->print(''.$error.'
'); - } -$r->print('