$lt{'title'}:
@@ -4937,16 +5425,48 @@ FUFORM SEDFFORM + my $importcrsresform; + my ($numdirs,$pickfile) = + &Apache::loncommon::import_crsauthor_form('crsresimportform','coursepath','coursefile', + "resize_scrollbox('contentscroll','1','0');", + undef,'res'); + if ($pickfile) { + $importcrsresform=(<
' => $pathitem."$lt{'srch'}" },
{ '
' => "$lt{'impo'}$help{'Importing_LON-CAPA_Resource'}" },
{ '
' => "$lt{'lnks'}" },
- { '
' => $importpubform }
- );
+ { '' => $importpubform },
+ );
+ if ($pickfile) {
+ 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'});
+ my $exttoolform =
+ &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem,
+ $help{'Adding_External_Tool'},undef,
+ undef,'tool',$coursedom,$coursenum,
+ \%ltitools);
if ($allowed) {
my $folder = $env{'form.folder'};
if ($folder eq '') {
@@ -5124,7 +5644,224 @@ NROSTFORM
$help{'Web_Page'}
NWEBFORM
-
+
+ my @ids=&Apache::lonnet::current_machine_ids();
+ my %select_menus;
+ my $numauthor = 0;
+ my $numcrsdirs = 0;
+ my $toppath = "/priv/$env{'user.domain'}/$env{'user.name'}";
+ if ($env{'user.author'}) {
+ $numauthor ++;
+ $select_menus{'author'}->{'text'} = &Apache::lonnet::plaintext('au');
+ if (grep(/^\Q$env{'user.home'}\E$/,@ids)) {
+ my $is_home = 1;
+ my %subdirs;
+ &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
+ $select_menus{'author'}->{'default'} = '/';
+ $select_menus{'author'}->{'select2'}->{'/'} = '/';
+ my @ordered = ('/');
+ foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
+ $select_menus{'author'}->{'select2'}->{$relpath} = $relpath;
+ push(@ordered,$relpath);
+ }
+ $select_menus{'author'}->{'order'} = \@ordered;
+ } else {
+ $select_menus{'author'}->{'select2'}->{'switch'} = &mt('Switch server required');
+ $select_menus{'author'}->{'default'} = 'switch';
+ $select_menus{'author'}->{'order'} = ['switch'];
+ }
+ }
+ my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
+ ['active'],['ca','aa']);
+ my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'};
+ my %by_roletype;
+ if (keys(%roleshash)) {
+ foreach my $entry (keys(%roleshash)) {
+ my ($auname,$audom,$roletype) = split(/:/,$entry);
+ my $key = $entry;
+ $key =~ s/:/___/g;
+ $by_roletype{$roletype}{$auname.'___'.$audom} = 1;
+ $select_menus{$key}->{'text'} = &Apache::lonnet::plaintext($roletype)." ($audom/$auname)";
+ my $rolehome = &Apache::lonnet::homeserver($auname,$audom);
+ if (grep(/^\Q$rolehome\E$/,@ids)) {
+ my $is_home = 1;
+ my (%subdirs,@ordered);
+ my $toppath="/priv/$audom/$auname";
+ &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
+ $select_menus{$key}->{'default'} = '/';
+ $select_menus{$key}->{'select2'}->{'/'} = '/';
+ my @ordered = ('/');
+ foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
+ $select_menus{$key}->{'select2'}->{$relpath} = $relpath;
+ push(@ordered,$relpath);
+ }
+ $select_menus{$key}->{'order'} = \@ordered;
+ } else {
+ $select_menus{$key}->{'select2'}->{'switch'} = &mt('Switch server required');
+ $select_menus{$key}->{'default'} = 'switch';
+ $select_menus{$key}->{'order'} = ['switch'];
+ }
+ $numauthor ++;
+ }
+ }
+ my ($pickdir,$showtitle);;
+ if ($numauthor) {
+ my @order;
+ my $defrole;
+ if ($env{'user.author'}) {
+ push(@order,'author');
+ $defrole = 'author';
+ }
+ if (keys(%by_roletype)) {
+ foreach my $possrole ('ca','aa') {
+ if (ref($by_roletype{$possrole}) eq 'HASH') {
+ foreach my $author (sort { lc($a) cmp lc($b) } (keys(%{$by_roletype{$possrole}}))) {
+ unless ($defrole) {
+ $defrole = $author;
+ }
+ push(@order,$author.'___'.$possrole);
+ }
+ }
+ }
+ }
+ $select_menus{'course'}->{'text'} = &mt('Course Resource');
+ if (grep(/^\Q$crshome\E$/,@ids)) {
+ my $is_home = 1;
+ my %subdirs;
+ my $toppath="/priv/$coursedom/$coursenum";
+ &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs);
+ $numcrsdirs = keys(%subdirs);
+ $select_menus{'course'}->{'default'} = '/';
+ $select_menus{'course'}->{'select2'}->{'/'} = '/';
+ my @ordered = ('/');
+ foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
+ $select_menus{'course'}->{'select2'}->{$relpath} = $relpath;
+ push(@ordered,$relpath);
+ }
+ $select_menus{'course'}->{'order'} = \@ordered;
+ } else {
+ $select_menus{'course'}->{'select2'}->{'switch'} = &mt('Switch server required');
+ $select_menus{'course'}->{'default'} = 'switch';
+ $select_menus{'course'}->{'order'} = ['switch'];
+ }
+ push(@order,'course');
+ $pickdir = $lt{'loca'}.
+ &Apache::loncommon::linked_select_forms('courseresform',''.$lt{'dire'}, + $defrole,'authorrole','authorpath', + \%select_menus,\@order,'toggleCrsResTitle();', + '','priv').'
'; + $showtitle = 'none'; + } else { + my $is_home; + $showtitle = 'inline'; + if (grep(/^\Q$crshome\E$/,@ids)) { + $is_home = 1; + $pickdir .= ''; + my $toppath="/priv/$coursedom/$coursenum'}"; + my %subdirs; + &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs); + $numcrsdirs = keys(%subdirs); + if ($numcrsdirs) { + $pickdir .= &mt('Directory: ').''; + } else { + $pickdir .= ''."\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=(<
'=>$extresourcesform}
);
+ if (keys(%ltitools)) {
+ push(@importdoc,
+ {''=>$exttoolform},
+ );
+ }
unless ($container eq 'page') {
push(@importdoc,
{'
'=>$imspform}
@@ -5206,7 +5948,7 @@ NGFFORM
{'
'=>$newsmpproblemform},
{'
'=>$newdropboxform},
{'
'=>$newexuploadform},
-
+ {''=>$crsresform},
);
$gradingform = &create_form_ul(&create_list_elements(@gradingforma));
@@ -5233,7 +5975,7 @@ unless ($container eq 'page') {
$hadchanges=0;
unless (($supplementalflag || $toolsflag)) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
- $supplementalflag,\%orderhash,$iconpath,$pathitem);
+ $supplementalflag,\%orderhash,$iconpath,$pathitem,\%ltitools);
if ($error) {
$r->print(''.$error.'
'); } @@ -5300,6 +6042,12 @@ SNFFORM &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, $help{'Adding_External_Resource'}); + my $supexttoolform = + &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, + $help{'Adding_External_Tool'}, + undef,undef,'tool',$coursedom, + $coursenum,\%ltitools); + my $supnewsylform=(<'
- =>$supextform},
- {'
'
+ =>$supextform});
+ if (keys(%ltitools)) {
+ push(@supimportdoc,
+ {''
+ =>$supexttoolform});
+ }
+ push(@supimportdoc,
+ {''
=>$supupdocform},
- );
+ );
$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc));
my %suporderhash = (
@@ -5366,7 +6120,7 @@ my %suporderhash = (
);
if ($supplementalflag) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype,
- $supplementalflag,\%suporderhash,$iconpath,$pathitem);
+ $supplementalflag,\%suporderhash,$iconpath,$pathitem,\%ltitools);
if ($error) {
$r->print(''.$error.'
'); } else { @@ -5413,7 +6167,9 @@ 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; } @@ -5467,7 +6223,6 @@ sub decompression_info { unshift(@hiddens,$pathitem); foreach my $item (@hiddens) { if ($env{'form.'.$item}) { - my $value = $env{'form.'.$item}; $hiddenelem .= ''."\n"; } @@ -5536,7 +6291,7 @@ sub remove_archive { $archiveidx = $position-1; } $env{'form.cmd'} = 'remove_'.$archiveidx; - my ($title,$url,@rrest) = + my ($title,$url,@rrest) = split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$archiveidx]]); if ($url eq $env{'form.archiveurl'}) { if (&handle_edit_cmd($docuname,$docudom)) { @@ -5755,8 +6510,8 @@ END } sub editing_js { - my ($udom,$uname,$supplementalflag) = @_; - my %lt = &Apache::lonlocal::texthash( + my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti,$londocroot) = @_; + my %js_lt = &Apache::lonlocal::texthash( p_mnf => 'Name of New Folder', t_mnf => 'New Folder', p_mnp => 'Name of New Page', @@ -5766,23 +6521,26 @@ sub editing_js { p_msb => 'Title for the Problem', p_mdb => 'Title for the Drop Box', p_mbb => 'Title for the Discussion Board', - p_mwp => 'Title for Web Page', + p_mwp => 'Title for Web Page', + p_mnr => 'Title for the Resource', p_mab => "Enter user:domain for User's Personal Information Page", p_mab2 => 'Personal Information Page of ', p_mab_alrt1 => 'Not a valid user:domain', p_mab_alrt2 => 'Please enter both user and domain in the format user:domain', p_chn => 'New Title', p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!', - p_rmr2a => 'Remove[_99]', - p_rmr2b => '?[_99]', - p_rmr3a => 'Remove those [_2]', - p_rmr3b => 'items?[_2]', + p_rmr2a => 'Remove', + p_rmr2b => '?', + p_rmr3a => 'Remove those', + p_rmr3b => 'items?', + p_rmr4 => 'WARNING: Removing a resource uploaded to a course cannot be undone via "Undo Delete".', + p_rmr5 => 'Push "Cancel" and then use "Cut" instead if you might need to undo this change.', p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!', p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.', - p_ctr2a => 'Cut[_98]', - p_ctr2b => '?[_98]', - p_ctr3a => 'Cut those[_2]', - p_ctr3b => 'items?[_2]', + p_ctr2a => 'Cut', + p_ctr2b => '?', + p_ctr3a => 'Cut those', + p_ctr3b => 'items?', rpck => 'Enter number to pick (e.g., 3)', imsfile => 'You must choose an IMS package for import', imscms => 'You must select which Course Management System was the source of the IMS package', @@ -5793,8 +6551,11 @@ sub editing_js { noor => 'No actions selected or changes to settings specified.', noch => 'No changes to settings specified.', noac => 'No actions selected.', + nofi => 'No file selected', + tinc => 'Title in course', + sunm => 'Sub-directory name', ); - + &js_escape(\%js_lt); my $crstype = &Apache::loncommon::course_type(); my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"'); my $main_container_page; @@ -5814,8 +6575,20 @@ sub editing_js { my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller); $res = &Apache::lonnet::clutter($res); if (&Apache::lonnet::is_on_map($res)) { - $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='. + my ($url,$anchor); + if ($res =~ /^([^#]+)#([^#]+)$/) { + $url = $1; + $anchor = $2; + if (($caller =~ m{^([^#]+)\Q#$anchor\E$})) { + $caller = $1.&escape('#').$anchor; + } + } + $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='. &HTML::Entities::encode($caller,'<>&"'); + if ($anchor ne '') { + $backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"'); + } + $backtourl = &Apache::loncommon::escape_single($backtourl); } else { $backtourl = '/adm/navmaps'; } @@ -5829,16 +6602,22 @@ sub editing_js { } my $fieldsets = "'ext','doc'"; + if ($posslti) { + $fieldsets .= ",'tool'"; + } unless ($main_container_page) { $fieldsets .=",'ims'"; } if ($supplementalflag) { $fieldsets = "'suppext','suppdoc'"; + if ($posslti) { + $fieldsets .= ",'supptool'"; + } } return <