SEDFFORM
my @simpleeditdefaultforma = (
- { ' ' => "$uploadtag$lt{'srch'} " },
- { ' ' => "$lt{'impo'} $help{'Importing_LON-CAPA_Resource'}" },
- { ' ' => "$lt{'book'} " },
+ { ' ' => "$uploadtag" },
+ { ' ' => "$help{'Importing_LON-CAPA_Resource'}" },
+ { ' ' => "" },
);
- $simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
+ $simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));
$simpleeditdefaultform .=(<
@@ -3000,14 +3009,15 @@ SEDFFORM
SEDFFORM
- my $extresourcesform=(<
- $uploadtag
-
- $lt{'extr'} $help{'Adding_External_Resource'}
-
+ my $extresourcesform=(<
+ $uploadtag
+
+ $help{'Adding_External_Resource'}
+
ERFORM
+
if ($allowed) {
&update_paste_buffer($coursenum,$coursedom);
my %lt=&Apache::lonlocal::texthash(
@@ -3017,18 +3027,6 @@ 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 '.$crstype.' Documents'));
- }
- }
- unless ($env{'form.pagepath'}) {
- $containertag = ' ';
- $uploadtag = ' ';
- }
$r->print(<
@@ -3043,55 +3041,21 @@ ERFORM
HIDDENFORM
}
-# --------------------------------------------------------- Main tab structure
-
- my $activeClass = 1;
- my $active = '';
- my %tabtitles = (
- main => {
- Course => &mt('Main Course Documents'),
- Community => &mt('Main Community Documents'),
- },
- supplemental => {
- Course => &mt('Supplemental Course Documents'),
- Community => &mt('Supplemental Community Documents'),
- },
- );
+
+# Generate the tabs
+ &startContentScreen($r,($supplementalflag?'supdocs':'docs'));
+
+
+#
+
+ my $savefolderpath;
+
if ($allowed) {
- $r->print('');
- if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'}eq"" || ($env{'form.pagepath'}))) {
- if($activeClass == 1){
- $active = 'class="active"';
- $activeClass = 0;
- }
- }
- $r->print(''.$tabtitles{'main'}{$crstype}.' ');
- $active = '';
- if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
- if($activeClass == 1){
- $active = 'class="active"';
- }
- }
- $r->print(''.$tabtitles{'supplemental'}{$crstype}.' ');
- $r->print(' ');
- } else {
- $r->print(' ');
- }
- $r->print(''
- .'
');
-# --------------------------------------------------------- Standard documents
- my $savefolderpath;
- $active = 'style="display: none;"';
- if($activeClass == 0){
- $active = 'style="display: block;"';
- }
- if ($allowed) {
- $r->print('
');
my $folder=$env{'form.folder'};
- if ($folder eq '' || $folder=~/^supplemental/) {
+ if ($folder eq '' || $supplementalflag) {
$folder='default';
$savefolderpath = $env{'form.folderpath'};
- $env{'form.folderpath'}='default&'.&escape($tabtitles{'main'}{$crstype});
+ $env{'form.folderpath'}='default&'.&escape(&mt('Content'));
$uploadtag = '
';
}
@@ -3120,14 +3084,14 @@ HIDDENFORM
my $recoverform=(<
- $lt{'reco'}
+
RFORM
my $imspform=(<
- $lt{'imsf'}
+
IMSPFORM
@@ -3137,7 +3101,7 @@ IMSPFORM
$uploadtag
- $lt{'navc'}
+
$help{'Navigate_Content'}
NNFORM
@@ -3146,7 +3110,7 @@ NNFORM
$uploadtag
- $lt{'sipa'}
+
$help{'Simple Page'}
NSPFORM
@@ -3156,7 +3120,7 @@ NSPFORM
$uploadtag
- $lt{'sipr'}
+
$help{'Simple Problem'}
@@ -3167,7 +3131,7 @@ NSPROBFORM
$uploadtag
- $lt{'drbx'}
+
NDBFORM
@@ -3176,7 +3140,7 @@ NDBFORM
$uploadtag
- $lt{'scuf'}
+
$help{'Score_Upload_Form'}
NEXUFORM
@@ -3186,7 +3150,7 @@ NEXUFORM
$uploadtag
- $lt{'bull'}
+
$help{'Bulletin Board'}
NBFORM
@@ -3197,7 +3161,7 @@ NBFORM
$uploadtag
- $lt{'mypi'}
+
$help{'My Personal Information Page'}
NAMFORM
@@ -3207,7 +3171,7 @@ NAMFORM
$uploadtag
- $lt{'abou'}
+
NASOFORM
@@ -3218,7 +3182,7 @@ NASOFORM
$uploadtag
- $lt{'rost'}
+
$help{'Course Roster'}
NROSTFORM
@@ -3236,7 +3200,7 @@ my $newfolderb;
- $lt{'newp'}
+
$help{'Adding_Pages'}
NPFORM
@@ -3247,7 +3211,7 @@ NPFORM
- $lt{'newf'} $help{'Adding_Folders'}
+ $lt{'newf'} $help{'Adding_Folders'}
NFFORM
@@ -3257,7 +3221,7 @@ NFFORM
$uploadtag
- $lt{'syll'}
+
$help{'Syllabus'}
@@ -3269,76 +3233,79 @@ NSYLFORM
$uploadtag
- $lt{'grpo'}
+
$help{'Group Portfolio'}
NGFFORM
@specialdocumentsforma=(
- {' '=>$newpageform},
- {' '=>$newsylform},
- {' '=>$newgroupfileform},
- );
-
- }
- push @specialdocumentsforma, ({' '=>$newnavform},
- {' '=>$newsmppageform},
- {' '=>$newsmpproblemform},
- {' '=>$newdropboxform},
- {' '=>$newexuploadform},
- {' '=>$newbulform},
- {' '=>$newaboutmeform},
- {' '=>$newaboutsomeoneform},
- {' '=>$newrosterform},);
+ {' '=>$newpageform},
+ {' '=>$newsylform},
+ {' '=>$newgroupfileform},
+ );
+
+ my @importdoc = (
+ {' '=>$extresourcesform},
+ {' '=>$imspform},);
+ $fileuploadform = &create_form_ul(&create_list_elements(@importdoc)) . ' ' . $fileuploadform;
+
+ push @specialdocumentsforma, ({' '=>$newnavform},
+ {' '=>$newsmppageform},
+ {' '=>$newsmpproblemform},
+ {' '=>$newdropboxform},
+ {' '=>$newexuploadform},
+ {' '=>$newbulform},
+ {' '=>$newaboutmeform},
+ {' '=>$newaboutsomeoneform},
+ {' '=>$newrosterform},);
- $specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
+ $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
+ }
if($env{'form.pagepath'}) {
@specialdocumentsforma=(
- {' '=>$newsmpproblemform},
- {' '=>$newexuploadform}
+ {' '=>$newsmpproblemform},
+ {' '=>$newexuploadform}
);
- $specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
+ $specialdocumentsform= &create_form_ul(&create_list_elements(@specialdocumentsforma));
}
my @tools = (
- {' '=>$extresourcesform},
- {' '=>$imspform},
- {' '=>$recoverform},
+# {' '=>$extresourcesform},
+# {' '=>$imspform},
+ {' '=>$recoverform},
);
my %orderhash = (
- '00' => ['Newfolder',$newfolderform],
- 'aa' => ['Upload Document',$fileuploadform],
+ 'aa' => ['Import Documents',$fileuploadform],
'bb' => ['Published Resources',$simpleeditdefaultform],
'cc' => ['Special Documents',$specialdocumentsform],
- 'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
+ 'dd' => ['Tools', &create_form_ul(&create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
);
-my $tid='1';
+unless($env{'form.pagepath'}) {
+ $orderhash{'00'} = ['Newfolder',$newfolderform];
+}
+
$hadchanges=0;
- my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
- if ($error) {
- $r->print(''.$error.'
');
- }
- if ($hadchanges) {
- &mark_hash_old();
- }
+ unless ($supplementalflag) {
+ my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+ if ($error) {
+ $r->print(''.$error.'
');
+ }
+ if ($hadchanges) {
+ &mark_hash_old();
+ }
- &changewarning($r,'');
-$r->print(&generate_edit_table($tid,\%orderhash));
+ &changewarning($r,'');
+ $r->print(&generate_edit_table('1',\%orderhash));
+ }
-$r->print(' ');
}
- if ($env{'form.pagepath'}) {
- }
-# ----------------------------------------------------- Supplemental documents
- $active = 'style="display: none;"';
- if($activeClass == 1){
- $active = 'style="display: block;"';
- }
- $r->print('
');
+
+# Supplemental documents start here
+
my $folder=$env{'form.folder'};
- unless ($folder=~/^supplemental/) {
+ unless ($supplementalflag) {
$folder='supplemental';
}
if ($folder =~ /^supplemental$/ &&
@@ -3373,14 +3340,14 @@ $r->print('
');
SUPDOCFORM
- $supupdocform .= create_form_ul(Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."";
+ $supupdocform .= &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."";
my $supnewfolderform=(<
- $lt{'newf'}
+
$help{'Adding_Folders'}
SNFFORM
@@ -3391,7 +3358,7 @@ SNFFORM
- $lt{'extr'} $help{'Adding_External_Resource'}
+ $help{'Adding_External_Resource'}
SNEFORM
@@ -3401,7 +3368,7 @@ SNEFORM
- $lt{'syll'}
+
$help{'Syllabus'}
SNSFORM
@@ -3412,40 +3379,43 @@ SNSFORM
- $lt{'mypi'}
+
$help{'My Personal Information Page'}
SNAMFORM
my @specialdocs = (
- {' '=>$supnewextform},
- {' '=>$supnewsylform},
- {' '=>$supnewaboutmeform},
+ {' '
+ =>$supnewsylform},
+ {' '
+ =>$supnewaboutmeform},
);
+my @supimportdoc = (
+ {' '
+ =>$supnewextform},
+ );
+$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)) . ' ' . $supupdocform;
my %suporderhash = (
'00' => ['Supnewfolder', $supnewfolderform],
- 'ee' => ['Upload Document',$supupdocform],
- 'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))]
+ 'ee' => ['Import Documents',$supupdocform],
+ 'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
);
-
- my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
- if ($error) {
- $r->print(''.$error.'
');
+ if ($supplementalflag) {
+ my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+ if ($error) {
+ $r->print(''.$error.'
');
+ }
+ $r->print(&generate_edit_table('2',\%suporderhash));
}
- my $tid='2';
- $r->print(&generate_edit_table($tid,\%suporderhash));
- } else {
+ } elsif ($supplementalflag) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
if ($error) {
$r->print(''.$error.'
');
}
}
-
-$r->print(' ');
-$r->print('
');
-
+ &endContentScreen($r);
if ($allowed) {
$r->print('
@@ -3457,7 +3427,7 @@ $r->print('');
');
}
} else {
- unless ($upload_result eq 'phasetwo') {
+ unless ($uploadphase) {
# -------------------------------------------------------- This is showdoc mode
$r->print("".&mt('Uploaded Document').' - '.
&Apache::lonnet::gettitle($r->uri).' '.
@@ -3470,30 +3440,73 @@ $r->print('');
return OK;
}
+sub embedded_form_elems {
+ my ($phase,$primaryurl,$newidx) = @_;
+ my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
+ return <
+
+
+
+
+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 '
'."\n".
+ ' '."\n".
+ ''.&mt('Return to Editor').
+ '
';
+}
+
sub generate_admin_options {
- my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;
- my %lt=&Apache::lonlocal::texthash(
+ my ($help_ref,$env_ref) = @_;
+ my %lt=&Apache::lonlocal::texthash(
'vc' => 'Verify Content',
'cv' => 'Check/Set Resource Versions',
'ls' => 'List Symbs',
- 'sl' => 'Show Log'
+ 'sl' => 'Show Log',
+ 'imse' => 'IMS Export',
+ 'dcd' => 'Dump Course Documents to Construction Space: available on other servers'
);
my %help = %{$help_ref};
my %env = %{$env_ref};
my $dumpbut=&dumpbutton();
my $exportbut=&exportbutton();
my @list = (
- {' '=>"$lt{'vc'} $help{'Verify_Content'}"},
- {' '=>"$lt{'cv'} $help{'Check_Resource_Versions'}"},
+ {' '
+ => "$help{'Verify_Content'}"},
+ {' '
+ =>"$help{'Check_Resource_Versions'}"},
);
if($dumpbut ne ''){
- push @list, {' '=>$dumpbut};
+ push @list, {' '=>$dumpbut};
}
- push @list, ({' '=>$exportbut},
- {' '=>"$lt{'ls'} "},
- {' '=>"$lt{'sl'} "},
+ push @list, ({' '
+ =>$exportbut},
+ {' '
+ =>" "},
+ {' '
+ =>""},
);
- return '';
+ return '';
}
@@ -3508,7 +3521,7 @@ sub generate_edit_table {
if($env{'form.active'} ne ''){
$activetab = $env{'form.active'};
}
- $form = '';
+ $form = '
';
$form .= '
';
foreach my $name (sort(keys(%orderhash))){
if($name ne '00'){
@@ -3517,7 +3530,9 @@ sub generate_edit_table {
}elsif($activetab eq $name){
$active = 'class="active"';
}
- $form .= ''.&mt(${$orderhash{$name}}[0]).' ';
+ $form .= ''.&mt(${$orderhash{$name}}[0]).' ';
} else {
$form .= ''.${$orderhash{$name}}[1].' ';
@@ -3527,14 +3542,14 @@ sub generate_edit_table {
$form .= '';
foreach my $field (keys(%orderhash)){
if($field ne '00'){
- if($activetab eq '' || $activetab ne $field){
+ if($activetab eq '' || $activetab ne $field){
$active = 'style="display: none;"';
- }elsif($activetab eq $field){
+ }elsif($activetab eq $field){
$active = 'style="display:block;"';
- }
- $form .= '
'.${$orderhash{$field}}[1]
- .'
';
+ }
+ $form .= '
'.${$orderhash{$field}}[1]
+ .'
';
}
}
$form .= '
';
@@ -3542,54 +3557,6 @@ sub generate_edit_table {
return $form;
}
-sub concept_test_builder {
- my ($r,$cdom,$cnum) = @_;
- &Apache::londocsgci::setdefaults();
- my $js = '
-
-';
- my $starthash = {
- add_entries => {'onload' => "javascript:setInitialVisibility();"},
- };
-
- $r->print(&Apache::loncommon::start_page('Assemble Test',$js,$starthash));
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/coursedocs',
- text=>"Assemble Test"});
- if ($env{'form.phase'} eq 'storemap') {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/coursedocs?phase=storemap',
- text=>"Validate Test"});
- &Apache::londocsgci::evaluate();
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- ('Build Concept Test','Concept_Test_Assembly'));
- $r->print(&Apache::londocsgci::store('edit',$cdom,$cnum));
- } elsif ($env{'form.phase'} eq 'storeparms') {
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>'/adm/coursedocs?phase=storeparms',
- text=>"Set Availability"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- ('Build Concept Test','Concept_Test_Assembly'));
- $r->print(&Apache::londocsgci::store_dates_parms($cdom,$cnum));
- $r->print(&Apache::loncommon::end_page());
- return;
- } else {
- $r->print(&Apache::lonhtmlcommon::breadcrumbs
- ('Build Concept Test','Concept_Test_Assembly'));
- }
- &Apache::londocsgci::load();
- &Apache::londocsgci::listresources($r,'edit',$cdom,$cnum);
- $r->print(&Apache::loncommon::end_page());
- return;
-}
-
sub editing_js {
my ($udom,$uname) = @_;
my $now = time();
@@ -3617,6 +3584,18 @@ sub editing_js {
p_ctr2b => '?[_98]'
);
+ my $crstype = &Apache::loncommon::course_type();
+ my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
+ my $docs_pagepath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.pagepath'},'<>&"');
+ my $main_container_page;
+ if ($docs_folderpath eq '') {
+ if ($docs_pagepath ne '') {
+ $main_container_page = 1;
+ }
+ }
+ my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents';
+ my $toplevelsupp = 'supplemental&Supplemental%20'.$crstype.'%20Documents';
+
return <
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.