$lt{'title'}:
- + $pathitem
@@ -5011,11 +7311,17 @@ IMSFORM $checkbox
- + FUFORM + my $mapimportjs; + if ($canedit) { + $mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');"; + } else { + $mapimportjs = "javascript:alert('".&js_escape($lt{'er'})."');"; + } my $importpubform=(<
- $lt{'selm'}
- + onfocus="this.blur();$mapimportjs" $disabled /> + $lt{'selm'}
+ SEDFFORM + my ($importcrsresform,$checkcrsres); + if ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'}) { + $checkcrsres = 1; + } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'} ne '0') { + my %domdefs=&Apache::lonnet::get_domain_defaults($coursedom); + my $type = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + unless (($type eq 'community') || ($type eq 'placement')) { + $type = 'unofficial'; + if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'} ne '') { + $type = 'official'; + } elsif ($env{'course.'.$env{'request.course.id'}.'internal.textbook'} ne '') { + $type = 'textbook'; + } else { + $type = 'unofficial'; + } + } + if ($domdefs{$type.'crsauthor'}) { + $checkcrsres = 1; + } + } + if ($checkcrsres) { + my ($numdirs,$pickfile) = + &Apache::loncommon::import_crsauthor_form('coursepath','coursefile', + "resize_scrollbox('contentscroll','1','0');", + undef,'res'); + if ($pickfile) { + $importcrsresform=(<
' => $pathitem."$lt{'srch'}" },
+ { '' => $pathitem."$lt{'srch'}$help{'Search_LON-CAPA_Resource'}" },
{ '
' => "$lt{'impo'}$help{'Importing_LON-CAPA_Resource'}" },
- { '
' => "$lt{'lnks'}" },
- { '
' => $importpubform }
- );
+ { '' => ''.$lt{'lnks'}.''.$help{'Import_Stored_Links'} },
+ { '' => $importpubform },
+ );
+ if ($importcrsresform) {
+ push(@importpubforma,{ '
' => $importcrsresform});
+ }
$importpubform = &create_form_ul(&create_list_elements(@importpubforma));
my $extresourcesform =
&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
- $help{'Adding_External_Resource'});
+ $help{'Adding_External_Resource'},
+ undef,undef,undef,undef,undef,undef,$disabled);
+ my $exttoolform =
+ &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
+ $help{'Adding_External_Tool'},undef,
+ undef,'tool',$coursedom,$coursenum,
+ \%ltitools,$disabled);
if ($allowed) {
my $folder = $env{'form.folder'};
if ($folder eq '') {
$folder='default';
}
- my $output = &update_paste_buffer($coursenum,$coursedom,$folder);
- if ($output) {
- $r->print($output);
+ if ($canedit) {
+ my $output = &update_paste_buffer($coursenum,$coursedom,$folder);
+ if ($output) {
+ $r->print($output);
+ }
}
$r->print(<'."\n". + $lt{'dire'}. + '
'."\n"; + my %seltemplate_menus; + my @files = &Apache::lonhomework::get_template_list('problem'); + my @noexamplelink = ('blank.problem','blank.library','script.library'); + my $currentcategory = ''; + my @ordered = (''); + my %templatehelp; + my $defcategory = ''; + my @catorder = ($defcategory); + $seltemplate_menus{$defcategory}->{'order'} = ['']; + $seltemplate_menus{$defcategory}->{'text'} = ''; + foreach my $file (@files) { + if (ref($file) eq 'ARRAY') { + my ($path,$title,$category,$help) = @{$file}; + next if ($title !~ /\S/); + if (&js_escape($category) ne $currentcategory) { + $currentcategory = &js_escape($category); + push(@catorder,&js_escape($currentcategory)); + $seltemplate_menus{$currentcategory}->{'text'} = $category; + $seltemplate_menus{$currentcategory}->{'default'} = ''; + $seltemplate_menus{$currentcategory}->{'select2'}->{''} = ''; + push(@{$seltemplate_menus{$currentcategory}->{'order'}},''); + } + if ($path) { + $seltemplate_menus{$currentcategory}->{'select2'}->{&js_escape($path)} = $title; + push(@{$seltemplate_menus{$currentcategory}->{'order'}},&js_escape($path)); + if ($help) { + $templatehelp{$path} = $help; + } + } + } + } + + my $templates = $lt{'cate'}.' '. + &Apache::loncommon::linked_select_forms('courseresform','
'.$lt{'tmpl'}.' ', + $defcategory,'tempcategory','template', + \%seltemplate_menus,\@catorder, + "resize_scrollbox('contentscroll','1','0');", + "toggleExampleText();",'template').'
'; + my $templatepreview = ''. + ''.&mt('Example').''; + my $crsresform; + if (($env{'user.author'}) || ($checkcrsres)) { + $crsresform=(<
'=>$newwebpageform},
+ );
+ } else {
+ @specialdocumentsforma=(
{'
'=>$newpageform},
- {'
'=>$newsylform},
- {'
'=>$newnavform},
+ {''=>$newsylform},
+ {''=>$newnavform},
{'
'=>$newsmppageform},
{''=>$newwebpageform},
- );
+ );
+ }
$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
-
- my @importdoc = (
- {'
'=>$extresourcesform}
+ my @external = (
+ {''=>$extresourcesform}
);
+ if ($posslti) {
+ push(@external,
+ {'
'=>$exttoolform},
+ );
+ }
+ my $externalform = &create_form_ul(&create_list_elements(@external));
+
+ my @importdoc = ();
unless ($container eq 'page') {
push(@importdoc,
{'
'=>$imspform}
@@ -5301,41 +7857,50 @@ NGFFORM
@gradingforma=(
{'
'=>$newsmpproblemform},
{'
'=>$newdropboxform},
- {'
'=>$newexuploadform},
-
+ {''=>$newexuploadform}
);
+ if ($crsresform) {
+ push(@gradingforma,
+ {''=>$crsresform}
+ );
+ }
$gradingform = &create_form_ul(&create_list_elements(@gradingforma));
@communityforma=(
{'
'=>$newbulform},
{'
'=>$newaboutmeform},
{'
'=>$newaboutsomeoneform},
- {'
'=>$newrosterform},
- {'
'=>$newgroupfileform},
+ {''=>$newrosterform},
+ {''=>$newgroupfileform},
);
$communityform = &create_form_ul(&create_list_elements(@communityforma));
my %orderhash = (
'aa' => ['Upload',$fileuploadform],
- 'bb' => ['Import',$importpubform],
- 'cc' => ['Grading',$gradingform],
+ 'bb' => ['External',$externalform],
+ 'cc' => ['Import',$importpubform],
+ 'dd' => ['Assessment',$gradingform],
+ 'ff' => ['Other',$specialdocumentsform],
);
unless ($container eq 'page') {
$orderhash{'00'} = ['Newfolder',$newfolderform];
- $orderhash{'dd'} = ['Collaboration',$communityform];
- $orderhash{'ee'} = ['Other',$specialdocumentsform];
+ $orderhash{'ee'} = ['Collaboration',$communityform];
}
$hadchanges=0;
unless (($supplementalflag || $toolsflag)) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
- $supplementalflag,\%orderhash,$iconpath,$pathitem);
+ $supplementalflag,\%orderhash,$iconpath,$pathitem,
+ \%ltitools,$canedit,$hostname,\$navmap,$hiddentop);
+ undef($navmap);
if ($error) {
$r->print(''.$error.'
'); } if ($hadchanges) { - &mark_hash_old(); - } + unless (&is_hash_old()) { + &mark_hash_old(); + } + } &changewarning($r,''); } @@ -5347,7 +7912,7 @@ unless ($container eq 'page') { unless ($supplementalflag) { $folder='supplemental'; } - if ($folder =~ /^supplemental$/ && + if (($folder eq 'supplemental') && (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { $env{'form.folderpath'} = &supplemental_base(); } elsif ($allowed) { @@ -5365,8 +7930,10 @@ unless ($container eq 'page') { SUPDOCFORM @@ -5394,7 +7962,15 @@ SNFFORM my $supextform = &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, - $help{'Adding_External_Resource'}); + $help{'Adding_External_Resource'}, + undef,undef,undef,undef,undef,undef, + $disabled); + + my $supexttoolform = + &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, + $help{'Adding_External_Tool'}, + undef,undef,'tool',$coursedom, + $coursenum,\%ltitools,$disabled); my $supnewsylform=(<'
+ {''
=>$supnewsylform},
- {''
+ {''
=>$supnewaboutmeform},
{''=>$supwebpageform},
);
-my @supimportdoc = (
- {''
- =>$supextform},
- {'
'
+ my @supexternal = (
+ {''
+ =>$supextform});
+ if ($posslti) {
+ push(@supexternal,
+ {''
+ =>$supexttoolform});
+ }
+ my @supimportdoc = (
+ {''
=>$supupdocform},
- );
+ );
$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc));
my %suporderhash = (
'00' => ['Supnewfolder', $supnewfolderform],
- 'ee' => ['Upload',$supupdocform],
+ 'dd' => ['Upload',$supupdocform],
+ 'ee' => ['External',&create_form_ul(&create_list_elements(@supexternal))],
'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))]
);
if ($supplementalflag) {
- my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
- $supplementalflag,\%suporderhash,$iconpath,$pathitem);
- if ($error) {
- $r->print(''.$error.'
'); - } else { - if ($suppchanges) { - my %servers = &Apache::lonnet::internet_dom_servers($coursedom); - my @ids=&Apache::lonnet::current_machine_ids(); - foreach my $server (keys(%servers)) { - next if (grep(/^\Q$server\E$/,@ids)); - my $hashid=$coursenum.':'.$coursedom; - my $cachekey = &escape('suppcount').':'.&escape($hashid); - &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]); - } - &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); - undef($suppchanges); - } - } + $suppchanges = 0; + my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, + $supplementalflag,\%suporderhash,$iconpath,$pathitem, + \%ltitools,$canedit,$hostname); + if ($error) { + $r->print(''.$error.'
'); + } + if ($suppchanges) { + &Apache::lonnet::update_supp_caches($coursedom,$coursenum); + undef($suppchanges); + } } } elsif ($supplementalflag) { my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, - $supplementalflag,'',$iconpath,$pathitem); + $supplementalflag,'',$iconpath,$pathitem,'',$canedit, + $hostname); if ($error) { $r->print(''.$error.'
'); } @@ -5509,13 +8086,16 @@ my %suporderhash = ( &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).''); } } - $r->print(&Apache::loncommon::end_page()); + unless ($noendpage) { + $r->print(&Apache::loncommon::end_page()); + } return OK; } sub embedded_form_elems { my ($phase,$primaryurl,$newidx) = @_; my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); + $newidx =~s /\D+//g; return <