loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.433 and 1.456

version 1.433, 2010/08/16 00:30:47	version 1.456, 2011/07/21 03:31:12
Line 280 sub exportcourse {	Line 280 sub exportcourse {
my %discussiontime = &Apache::lonnet::dump('discussiontimes',	my %discussiontime = &Apache::lonnet::dump('discussiontimes',
$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});	$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
my $numdisc = keys(%discussiontime);	my $numdisc = keys(%discussiontime);
	my $numprobs = 0;
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {	if (!defined($navmap)) {
$r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package').	$r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package').
Line 310 sub exportcourse {	Line 311 sub exportcourse {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['archive','discussion']);	['archive','discussion']);

	my $format = $env{'form.format'};
my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');	my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');	my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
if (@exportitems == 0 && @discussions == 0) {	if (@exportitems == 0 && @discussions == 0) {
Line 331 sub exportcourse {	Line 333 sub exportcourse {
my $imsresources;	my $imsresources;
my $tempexport;	my $tempexport;
my $copyresult;	my $copyresult;
my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport);	my $testbank;
	my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport,$format,\$testbank);
if ($manifestok) {	if ($manifestok) {
&build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,$tempexport,\$copyresult,$ims_manifest);	&build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,$tempexport,\$copyresult,$ims_manifest,$format,$testbank);
close($ims_manifest);	close($ims_manifest);

#Create zip file in prtspool	#Create zip file in prtspool
Line 435 sub exportcourse {	Line 438 sub exportcourse {
if (($curRes->is_sequence()) \|\| ($curRes->is_page())) {	if (($curRes->is_sequence()) \|\| ($curRes->is_page())) {
$lastcontainer = $currelem;	$lastcontainer = $currelem;
$display .= 'onclick="javascript:propagateCheck('."'$currelem'".')"';	$display .= 'onclick="javascript:propagateCheck('."'$currelem'".')"';
	} elsif ($curRes->is_problem()) {
	$numprobs ++;
}	}
$display .= ' />'."\n";	$display .= ' />'."\n";
for (my $i=0; $i<$depth; $i++) {	for (my $i=0; $i<$depth; $i++) {
Line 519 function containerCheck(item) {	Line 524 function containerCheck(item) {
$r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',	$r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',
$scripttag));	$scripttag));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
	if ($numprobs > 0) {
	$display .= '<p><span class="LC_nobreak">'.
	&mt('Export format for LON-CAPA problems:').
	'<label><input type="radio" name="format" value="xml" checked="checked" />'.
	' '.&mt('XML').'</label>'.(' ' x3).
	'<label><input type="radio" name="format" value="html" />'.
	' '.&mt('HTML').'</label>'.(' ' x3).
	'<label><input type="radio" name="format" value="plaintext" />'.
	' '.&mt('Text').'</label></span></p>';
	}
$r->print($display.	$r->print($display.
'<p><input type="hidden" name="finishexport" value="1" />'.	'<p><input type="hidden" name="finishexport" value="1" />'.
'<input type="submit" name="exportcourse" value="'.	'<input type="submit" name="exportcourse" value="'.
Line 527 function containerCheck(item) {	Line 542 function containerCheck(item) {
}	}

sub create_ims_store {	sub create_ims_store {
my ($now,$manifestok,$outcome,$tempexport) = @_;	my ($now,$manifestok,$outcome,$tempexport,$format,$testbank) = @_;
$$tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';	$$tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
my $ims_manifest;	my $ims_manifest;
if (!-e $$tempexport) {	if (!-e $$tempexport) {
Line 571 sub create_ims_store {	Line 586 sub create_ims_store {
' <organizations default="ORG-'.$env{'request.course.id'}.'-'.$now.'">'."\n".	' <organizations default="ORG-'.$env{'request.course.id'}.'-'.$now.'">'."\n".
' <organization identifier="ORG-'.$env{'request.course.id'}.'-'.$now.'"'.	' <organization identifier="ORG-'.$env{'request.course.id'}.'-'.$now.'"'.
' structure="hierarchical">'."\n".	' structure="hierarchical">'."\n".
' <title>'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</title>'	' <title>'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</title>';
	if ($format eq 'plaintext') {
	my $testbankfilename = $$tempexport.'/testbank.txt';
	$$testbank = Apache::File->new('>'.$testbankfilename);
	}
} else {	} else {
$$outcome .= 'An error occurred opening the IMS manifest file.<br />'	$$outcome .= 'An error occurred opening the IMS manifest file.<br />'
;	;
Line 580 sub create_ims_store {	Line 599 sub create_ims_store {
}	}

sub build_package {	sub build_package {
my ($now,$navmap,$exportitems,$discussions,$outcome,$tempexport,$copyresult,$ims_manifest) = @_;	my ($now,$navmap,$exportitems,$discussions,$outcome,$tempexport,$copyresult,
	$ims_manifest,$format,$testbank) = @_;
# first iterator to look for dependencies	# first iterator to look for dependencies
my $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);	my $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
my $curRes;	my $curRes;
Line 619 sub build_package {	Line 639 sub build_package {
$count = 0;	$count = 0;
my $imsresources;	my $imsresources;
my $pkgdepth;	my $pkgdepth;
	my $currdirpath = 'Top';
while ($curRes = $it->next()) {	while ($curRes = $it->next()) {
if ($curRes == $it->BEGIN_MAP()) {	if ($curRes == $it->BEGIN_MAP()) {
$prevdepth = $depth;	$prevdepth = $depth;
Line 656 sub build_package {	Line 677 sub build_package {
'<title>'.$curRes->title().'</title>';	'<title>'.$curRes->title().'</title>';
print $ims_manifest "\n".$itementry;	print $ims_manifest "\n".$itementry;

unless ($curRes->is_sequence()) {	if ($curRes->is_sequence()) {
	$currdirpath = 'Top';
	my $pcslist = $curRes->map_hierarchy();
	if ($pcslist ne '') {
	foreach my $pc (split(/,/,$pcslist),$curRes->map_pc()) {
	next if ($pc <= 1);
	my $res = $navmap->getByMapPc($pc);
	if (ref($res)) {
	my $encloser = $res->title();
	if ($encloser) {
	if ($currdirpath) {
	$currdirpath .= ' -> ';
	}
	$currdirpath .= $encloser;
	}
	}
	}
	}
	} else {
my $content_file;	my $content_file;
my @hrefs = ();	my @hrefs = ();
&process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport);	&process_content($count,$curRes,$cdom,$cnum,$symb,\$content_file,\@hrefs,$copyresult,$tempexport,$format,$currdirpath,$testbank);
if ($content_file) {	if ($content_file) {
$imsresources .= "\n".	$imsresources .= "\n".
' <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.	' <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
Line 720 sub get_dependencies {	Line 759 sub get_dependencies {
}	}

sub process_content {	sub process_content {
my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport) = @_;	my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport,$format,$currdirpath,$testbank) = @_;
my $content_type;	my $content_type;
my $message;	my $message;
my @uploads = ();	my @uploads = ();
Line 777 sub process_content {	Line 816 sub process_content {
$canedit= 1;	$canedit= 1;
}	}
# only include problem code where current user is author	# only include problem code where current user is author
if ($canedit) {	if (($format eq 'html') \|\| ($format eq 'plaintext')) {
$$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');	my $title = $curRes->title;
} else {	$$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,$format,$currdirpath,$title,$testbank);
$$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit');	} elsif ($format eq 'xml') {
	if ($canedit) {
	$$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
	} else {
	$$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit');
	}
}	}
} elsif ($symb =~ m-uploaded/$cdom/$cnum-) {	} elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
$$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');	$$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
Line 800 sub process_content {	Line 844 sub process_content {
}	}

sub replicate_content {	sub replicate_content {
my ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller) = @_;	my ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller,$currdirpath,
	$title,$testbank) = @_;
my ($map,$ind,$url);	my ($map,$ind,$url);
if ($caller eq 'templateupload') {	if ($caller eq 'templateupload') {
$url = $symb;	$url = $symb;
Line 844 sub replicate_content {	Line 889 sub replicate_content {
} else {	} else {
$$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";	$$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
}	}
} elsif ($caller eq 'noedit') {	} elsif (($caller eq 'noedit') \|\| ($caller eq 'html') \|\|
	($caller eq 'plaintext')) {
# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this.	# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this.
	my %form = (
	grade_symb => $symb,
	grade_courseid => $cdom.'_'.$cnum,
	grade_domain => $env{'user.domain'},
	grade_username => $env{'user.name'},
	grade_imsexport => 1,
	instructor_comments => 'hide',
	);
	my $feedurl=&Apache::lonnet::clutter($url);
	my ($userview,$response)=&Apache::lonnet::ssi_body($feedurl,%form);
	if (ref($response)) {
	if ($response->is_success) {
	$content = $userview;
	$content =~ s/\Qonchange="javascript:setSubmittedPart('\E[^\']+\Q');"\E//g;
	$content =~ s/^\s*[\n\r]+$//;
	if ($caller eq 'plaintext') {
	my @lines = split(/[\n\r]+/,$content);
	my @tosave;
	my $foilcounter = 0;
	my @alphabet = ('a'..'z');
	my $mc_answer;
	foreach my $line (@lines) {
	next if ($line =~ /^\s*$/);
	if ($line =~ m{(\|\Q<\label>\E)\Q<br />Incorrect:<label>\E}) {
	$foilcounter ++;
	} elsif ($line =~ m{(\|\Q</label>\E)\Q<br />Correct:<b><label>\E}) {
	$foilcounter ++;
	$mc_answer = $alphabet[$foilcounter-1];
	} elsif ($line !~ m{\Q</label>\E(\|\Q</b>\E)\Q<br />\E}) {
	$line =~ s/^(\s+\|\s+)$//g;
	$line =~ s{^\Q<b>\E([^<]+)\Q</b>\E$}{1};
	$tosave[$foilcounter] .= $line.' ';
	}
	$content = join("\t",@tosave);
	if ($mc_answer) {
	$content .= "\t".$mc_answer."\n";
	}
	}
	if (@tosave) {
	my $qtype;
	if ($mc_answer) {
	$qtype = 'MC';
	}
	$content = $currdirpath."\t".$title."\t$qtype\t".join("\t",@tosave);
	if ($mc_answer) {
	$content .= "\t".$mc_answer;
	}
	$content .= "\n";
	}
	} else {
	$content = '<html><body>'.$content.'</body></html>';
	}
	if (($caller eq 'plaintext') && ($testbank)) {
	print $testbank $content;
	}
	} else {
	$content = 'Not the owner of this resource';
	}
	} else {
	$content = 'Not the owner of this resource';
	}
$repstatus = 'ok';	$repstatus = 'ok';
$content = 'Not the owner of this resource';
}	}
if ($repstatus eq 'ok') {	if ($repstatus eq 'ok') {
print $copiedfile $content;	print $copiedfile $content;
Line 905 sub extract_media {	Line 1011 sub extract_media {
$repstatus = 'ok';	$repstatus = 'ok';
}	}
} elsif ($caller eq 'uploaded') {	} elsif ($caller eq 'uploaded') {

$repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);	$repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);
}	}
if ($repstatus eq 'ok') {	if ($repstatus eq 'ok') {
Line 1150 sub docs_change_log {	Line 1255 sub docs_change_log {
&Apache::loncommon::restore_course_settings('docs_log',	&Apache::loncommon::restore_course_settings('docs_log',
\%saveable_parameters);	\%saveable_parameters);
if (!$env{'form.show'}) { $env{'form.show'}=10; }	if (!$env{'form.show'}) { $env{'form.show'}=10; }
	# FIXME: internationalization seems wrong here
my %lt=('hiddenresource' => 'Resources hidden',	my %lt=('hiddenresource' => 'Resources hidden',
'encrypturl' => 'URL hidden',	'encrypturl' => 'URL hidden',
'randompick' => 'Randomly pick',	'randompick' => 'Randomly pick',
Line 1238 sub docs_change_log {	Line 1344 sub docs_change_log {
$r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');	$r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {	foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {	if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
	# FIXME: internationalization seems wrong here
$r->print('<li>'.	$r->print('<li>'.
&mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',	&mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
$docslog{$id}{'logentry'}{'parameter_value_'.$parameter})	$docslog{$id}{'logentry'}{'parameter_value_'.$parameter})
Line 1521 sub editor {	Line 1628 sub editor {
$LONCAPA::map::resources[$idx]='';	$LONCAPA::map::resources[$idx]='';
}	}

my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order);	my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
if ($allowed) {
($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
&breadcrumbs($allowed,$crstype);	&breadcrumbs($allowed,$crstype);
$r->print($breadcrumbtrail);	$r->print($breadcrumbtrail);
} else {
	unless ($allowed) {
$randompick = -1;	$randompick = -1;
}	}

Line 1653 sub editor {	Line 1759 sub editor {
&Apache::loncommon::end_data_table_count();	&Apache::loncommon::end_data_table_count();

if ($shown) {	if ($shown) {
$r->print(&Apache::loncommon::start_data_table());	$r->print(&Apache::loncommon::start_scrollbox('900px','880px','400px')
	.&Apache::loncommon::start_data_table());
if ($allowed) {	if ($allowed) {
$r->print(&Apache::loncommon::start_data_table_header_row()	$r->print(&Apache::loncommon::start_data_table_header_row()
.'<th colspan="2">'.&mt('Move').'</th>'	.'<th colspan="2">'.&mt('Move').'</th>'
.'<th>'.&mt('Actions').'</th>'	.'<th>'.&mt('Actions').'</th>'
.'<th colspan="2">'.&mt('Document').'</th>');	.'<th colspan="2">'.&mt('Document').'</th>');
if ($folder !~ /^supplemental/) {	if ($folder !~ /^supplemental/) {
$->print('<th colspan="4">'.&mt('Settings').'</th>');	$r->print('<th colspan="4">'.&mt('Settings').'</th>');
}	}
$r->print(&Apache::loncommon::end_data_table_header_row());	$r->print(&Apache::loncommon::end_data_table_header_row());
}	}
$r->print($output	$r->print($output
.&Apache::loncommon::end_data_table()	.&Apache::loncommon::end_data_table()
	.&Apache::loncommon::end_scrollbox()
);	);
} else {	} else {
$r->print('<p class="LC_info">'	$r->print('<p class="LC_info">'
Line 1682 sub editor {	Line 1790 sub editor {
sub process_file_upload {	sub process_file_upload {
my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;	my ($upload_output,$coursenum,$coursedom,$allfiles,$codebase,$uploadcmd) = @_;
# upload a file, if present	# upload a file, if present
my $parseaction;	my ($parseaction,$showupload,$nextphase,$mimetype);
if ($env{'form.parserflag'}) {	if ($env{'form.parserflag'}) {
$parseaction = 'parse';	$parseaction = 'parse';
}	}
my $phase_status;
my $folder=$env{'form.folder'};	my $folder=$env{'form.folder'};
if ($folder eq '') {	if ($folder eq '') {
$folder='default';	$folder='default';
Line 1705 sub process_file_upload {	Line 1812 sub process_file_upload {
$LONCAPA::map::resources[1]='';	$LONCAPA::map::resources[1]='';
}	}
if ($fatal) {	if ($fatal) {
return 'failed';	$$upload_output = '<p><span class="LC_error">'.&mt('The uploaded file has not been stored as an error occurred reading the contents of the current folder.').'</span></p>';
	return;
}	}
my $destination = 'docs/';	my $destination = 'docs/';
if ($folder =~ /^supplemental/) {	if ($folder =~ /^supplemental/) {
Line 1716 sub process_file_upload {	Line 1824 sub process_file_upload {
} elsif ($folder =~ /^(default\|supplemental)_(\d+)$/) {	} elsif ($folder =~ /^(default\|supplemental)_(\d+)$/) {
$destination .= $2.'/';	$destination .= $2.'/';
}	}
# this is for a course, not a user, so set coursedoc flag	# this is for a course, not a user, so set context to coursedoc.
# probably the only place in the system where this should be "1"
my $newidx=&LONCAPA::map::getresidx();	my $newidx=&LONCAPA::map::getresidx();
$destination .= $newidx;	$destination .= $newidx;
my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination,	my $url=&Apache::lonnet::userfileupload('uploaddoc','coursedoc',$destination,
$parseaction,$allfiles,	$parseaction,$allfiles,
$codebase);	$codebase,undef,undef,undef,undef,
	undef,undef,\$mimetype);
	if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E.*/([^/]+)$}) {
	my $stored = $1;
	$showupload = '<p>'.&mt('Uploaded [_1]','<span class="LC_filename">'.
	$stored.'</span>').'</p>';
	} else {
	my ($filename) = ($env{'form.uploaddoc.filename'} =~ m{([^/]+)$});

	$$upload_output = '<p><span class="LC_error">'.&mt('Unable to save file [_1].','<span class="LC_filename">'.$filename.'</span>').'</span></p>';
	return;
	}
my $ext='false';	my $ext='false';
if ($url=~m{^http://}) { $ext='true'; }	if ($url=~m{^http://}) { $ext='true'; }
$url = &LONCAPA::map::qtunescape($url);	$url = &LONCAPA::map::qtunescape($url);
Line 1739 sub process_file_upload {	Line 1857 sub process_file_upload {
($errtext,$fatal)=&storemap($coursenum,$coursedom,	($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);	$folder.'.'.$container);
if ($fatal) {	if ($fatal) {
$$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';	$$upload_output = '<p><span class="LC_error">'.$errtext.'</span></p>';
return 'failed';	return;
} else {	} else {
if ($parseaction eq 'parse') {	if ($parseaction eq 'parse' && $mimetype eq 'text/html') {
	$$upload_output = $showupload;
my $total_embedded = scalar(keys(%{$allfiles}));	my $total_embedded = scalar(keys(%{$allfiles}));
if ($total_embedded > 0) {	if ($total_embedded > 0) {
my $num = 0;	my $uploadphase = 'upload_embedded';
my $state = '	my $primaryurl = &HTML::Entities::encode($url,'<>&"');
<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />	my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx);
<input type="hidden" name="cmd" value="upload_embedded" />	my ($embedded,$num) =
<input type="hidden" name="newidx" value="'.$newidx.'" />	&Apache::loncommon::ask_for_embedded_content(
<input type="hidden" name="primaryurl" value="'.&escape($url).'" />	'/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url});
<input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';	if ($embedded) {
$phase_status = 'phasetwo';	if ($num) {
	$$upload_output .=
$$upload_output .=	'<p>'.&mt('This file contains embedded multimedia objects, which need to be uploaded.').'</p>'.$embedded;
'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.	$nextphase = $uploadphase;
&Apache::loncommon::ask_for_embedded_content(	} else {
'/adm/coursedocs',$state,$allfiles,$codebase);	$$upload_output .= $embedded;
	}
	} else {
	$$upload_output .= &mt('Embedded item(s) already present, so no additional upload(s) required').'<br />';
	}
} else {	} else {
$$upload_output .= 'No embedded items identified<br />';	$$upload_output .= &mt('No embedded items identified').'<br />';
}	}
}	}
}	}
}	}
return $phase_status;	return $nextphase;
}

sub process_secondary_uploads {
my ($upload_output,$coursedom,$coursenum,$formname,$num,$newidx) = @_;
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 .= $newidx;
my ($url,$filename);
$url=&Apache::lonnet::userfileupload($formname.$num,1,$destination);
($filename) = ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/\Q$destination\E/(.+)$});
return $filename;
}	}

sub is_supplemental_title {	sub is_supplemental_title {
Line 1848 sub entryline {	Line 1952 sub entryline {
}	}
if ($env{'form.pagepath'}) {	if ($env{'form.pagepath'}) {
$type = $container = 'page';	$type = $container = 'page';
$esc_path=&escape($path = $env{'form.pagepath'});	$esc_path=&escape($env{'form.pagepath'});
$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
$symb=&escape($env{'form.pagesymb'});	$symb=&escape($env{'form.pagesymb'});
}	}
Line 2242 sub list_symbs {	Line 2346 sub list_symbs {
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
$r->print(&Apache::loncommon::start_page('Symb List'));	$r->print(&Apache::loncommon::start_page('Symb List'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
	&startContentScreen($r,'tools');
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {	if (!defined($navmap)) {
$r->print('<h2>'.&mt('Retrieval of List Failed').'</h2>'.	$r->print('<h2>'.&mt('Retrieval of List Failed').'</h2>'.
Line 2256 sub list_symbs {	Line 2361 sub list_symbs {
}	}
$r->print("\n</pre>\n");	$r->print("\n</pre>\n");
}	}
$r->print('<hr /><a href="/adm/coursedocs">'.&mt('Back to Course Editor').'</a>');
}	}


Line 2265 sub verifycontent {	Line 2369 sub verifycontent {
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
$r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));	$r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
	&startContentScreen($r,'tools');
$hashtied=0;	$hashtied=0;
undef %alreadyseen;	undef %alreadyseen;
%alreadyseen=();	%alreadyseen=();
Line 2283 sub verifycontent {	Line 2388 sub verifycontent {
}	}
}	}
&untiehash();	&untiehash();
$r->print(	$r->print('<p class="LC_success">'.&mt('Done').'</p>');
'<p class="LC_success">'.&mt('Done').'</p>'
.'<hr />'
.'<p><a href="/adm/coursedocs">'
.&mt('Back to Course Editor')
.'</a></p>'
);
}	}


Line 2304 sub checkversions {	Line 2403 sub checkversions {
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
$r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));	$r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
$r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));	$r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
	&startContentScreen($r,'tools');

my $header='';	my $header='';
my $startsel='';	my $startsel='';
my $monthsel='';	my $monthsel='';
Line 2614 sub init_breadcrumbs {	Line 2715 sub init_breadcrumbs {
bug=>'Instructor Interface'});	bug=>'Instructor Interface'});
}	}

	# subroutine to list form elements
	sub create_list_elements {
	my @formarr = @_;
	my $list = '';
	for my $button (@formarr){
	for my $picture(keys %$button) {
	$list .= &Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});
	}
	}
	return $list;
	}

	# subroutine to create ul from list elements
	sub create_form_ul {
	my $list = shift;
	my $ul = &Apache::lonhtmlcommon::htmltag('ul',$list, {class => 'LC_ListStyleNormal'});
	return $ul;
	}

	#
	# Start tabs
	#

	sub startContentScreen {
	my ($r,$mode)=@_;
	$r->print('<ul class="LC_TabContentBigger" id="mainnav">');
	$r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>    '.&mt('Content Overview').'    </b></a></li>');

	my $active = '';
	# does this user have privileges to modify docs?
	my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});

	my $onclick;
	my $href;

	if ($allowed) {
	$r->print('<li '.(($mode eq 'docs')?' class="active"':'').
	'><a href="/adm/coursedocs?forcestandard=1"><b>      '.&mt('Content Editor').'      </b></a></li>');
	}
	$r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>     '.&mt('Content Search').'     </b></a></li>');
	$r->print('<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>      '.&mt('Content Index').'      </b></a></li>');
	$r->print('<li '.(($mode eq 'supdocs')?' class="active"':'').
	'><a href="/adm/coursedocs?forcesupplement=1"><b>'.&mt('Supplemental Documents').'</b></a></li>');
	$r->print('</ul>');
	$r->print('<div class="LC_Box" style="clear:both;margin:0;">'
	.'<div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
	$r->print('<div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
	}

	#
	# End tabs
	#

	sub endContentScreen {
	my ($r)=@_;
	$r->print('</div></div></div>');
	}

	sub supplemental_base {
	return 'supplemental&'.&escape(&mt('Supplemental '.&Apache::loncommon::course_type().' Documents'));
	}

sub handler {	sub handler {
my $r = shift;	my $r = shift;
Line 2624 sub handler {	Line 2784 sub handler {
return OK if $r->header_only;	return OK if $r->header_only;
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();

	#
# --------------------------------------------- Initialize help topics for this	# --------------------------------------------- Initialize help topics for this
foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',	foreach my $topic ('Adding_Course_Doc','Main_Course_Documents',
'Adding_External_Resource','Navigate_Content',	'Adding_External_Resource','Navigate_Content',
Line 2669 sub handler {	Line 2829 sub handler {
&init_breadcrumbs('exportcourse','IMS Export');	&init_breadcrumbs('exportcourse','IMS Export');
&exportcourse($r);	&exportcourse($r);
} else {	} else {
# is this a standard course?	#
	# Done catching special calls
	# The whole rest is for course and supplemental documents
	# Get the parameters that may be needed
	#
	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
	['folderpath','pagepath',
	'pagesymb','forcesupplement','forcestandard']);

	# standard=1: this is a "new-style" course with an uploaded map as top level
	# standard=2: this is a "old-style" course, and there is nothing we can do

my $standard=($env{'request.course.uri'}=~/^\/uploaded\//);	my $standard=($env{'request.course.uri'}=~/^\/uploaded\//);
my $forcestandard = 0;
my $forcesupplement;	# Decide whether this should display supplemental or main content
	# supplementalflag=1: show supplemental documents
	# supplementalflag=0: show standard documents


	my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
	if (($env{'form.folderpath'}=~/^default/) \|\| $env{'form.folderpath'} eq "" \|\| ($env{'form.pagepath'})) {
	$supplementalflag=0;
	}
	if ($env{'form.forcesupplement'}) { $supplementalflag=1; }
	if ($env{'form.forcestandard'}) { $supplementalflag=0; }
	unless ($allowed) { $supplementalflag=1; }
	unless ($standard) { $supplementalflag=1; }

my $script='';	my $script='';
my $showdoc=0;	my $showdoc=0;
my $containertag;	my $containertag;
my $uploadtag;	my $uploadtag;

	# Where do we store these for when we come back?
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	my $stored_folderpath='docs_folderpath';
['folderpath','pagepath',	if ($supplementalflag) {
'pagesymb']);	$stored_folderpath='docs_sup_folderpath';
	}

# No folderpath, no pagepath, see if we have something stored	# No folderpath, no pagepath, see if we have something stored
if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {	if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
&Apache::loncommon::restore_course_settings('docs_folderpath',	&Apache::loncommon::restore_course_settings($stored_folderpath,
{'folderpath' => 'scalar'});	{'folderpath' => 'scalar'});
}	}

	# If we are not allowed to make changes, all we can see are supplemental docs
if (!$allowed) {	if (!$allowed) {
unless($env{'form.folderpath'} =~ /^supplemental/) {	$env{'form.pagepath'}='';
$env{'form.folderpath'} = '';	unless ($env{'form.folderpath'} =~ /^supplemental/) {
	$env{'form.folderpath'} = &supplemental_base();
}	}
}	}
	# If we still not have a folderpath, see if we can resurrect at pagepath
if (!$env{'form.folderpath'} && $allowed) {	if (!$env{'form.folderpath'} && $allowed) {
&Apache::loncommon::restore_course_settings('docs_folderpath',	&Apache::loncommon::restore_course_settings($stored_folderpath,
{'pagepath' => 'scalar'});	{'pagepath' => 'scalar'});
}	}
if ($env{'form.pagepath'}) {	# Make the zeroth entry in supplemental docs page paths, so we can get to top level
$env{'form.folderpath'}='';
}
if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {	if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
$env{'form.folderpath'} = 'supplemental&'.	$env{'form.folderpath'} = &supplemental_base()
&escape(&mt('Supplemental '.$crstype.' Documents')).'&'.	.'&'.
$env{'form.folderpath'};	$env{'form.folderpath'};
}	}
&Apache::loncommon::store_course_settings('docs_folderpath',	# If after all of this, we still don't have any paths, make them
	unless (($env{'form.pagepath'}) \|\| ($env{'form.folderpath'})) {
	if ($supplementalflag) {
	$env{'form.folderpath'}=&supplemental_base();
	} else {
	$env{'form.folderpath'}='default';
	}
	}

	# Store this
	&Apache::loncommon::store_course_settings($stored_folderpath,
{'pagepath' => 'scalar',	{'pagepath' => 'scalar',
'folderpath' => 'scalar'});	'folderpath' => 'scalar'});

if ($env{'form.folderpath'}) {	if ($env{'form.folderpath'}) {
my (@folderpath)=split('&',$env{'form.folderpath'});	my (@folderpath)=split('&',$env{'form.folderpath'});
$env{'form.foldername'}=&unescape(pop(@folderpath));	$env{'form.foldername'}=&unescape(pop(@folderpath));
Line 2718 sub handler {	Line 2916 sub handler {
$env{'form.pagename'}=&unescape(pop(@pagepath));	$env{'form.pagename'}=&unescape(pop(@pagepath));
$env{'form.folder'}=pop(@pagepath);	$env{'form.folder'}=pop(@pagepath);
$containertag = '<input type="hidden" name="pagepath" value="" />'.	$containertag = '<input type="hidden" name="pagepath" value="" />'.
'<input type="hidden" name="pagesymb" value="" />';	'<input type="hidden" name="pagesymb" value="" />';
$uploadtag = '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.	$uploadtag =
'<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />';	'<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
	'<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />'.
	'<input type="hidden" name="folderpath" value="" />';
} else {	} else {
my $folderpath=$env{'form.folderpath'};	my $folderpath=$env{'form.folderpath'};
if (!$folderpath) {	if (!$folderpath) {
Line 2739 sub handler {	Line 2939 sub handler {
if ($showdoc) { # got called in sequence from course	if ($showdoc) { # got called in sequence from course
$allowed=0;	$allowed=0;
} else {	} else {
if (($env{'form.folder'}=~/^(?:group\|default)_/) \|\|
($env{'form.folder'} =~ m:^\d+/(pages\|sequences)/:)) {
$forcestandard = 1;
}
$forcesupplement=($env{'form.folder'}=~/^supplemental_/);

if ($allowed) {	if ($allowed) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
$script=&Apache::lonratedt::editscript('simple');	$script=&Apache::lonratedt::editscript('simple');
}	}
}	}

# subroutine to list form elements
sub create_list_elements {
my @formarr = @_;
my $list = '';
for my $button (@formarr){
for my $picture(keys %$button) {
#my $link = Apache::lonhtmlcommon::htmltag('a' ,$button->{$picture}, {href => "test"});
$list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});
}
}
return $list;
}

# subroutine to create ul from list elements
sub create_form_ul {
my $list = shift;
my $ul = Apache::lonhtmlcommon::htmltag('ul',$list, {class => 'LC_ListStyleNormal'});
return $ul;
}

# get course data	# get course data
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};	my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
Line 2796 sub create_form_ul {	Line 2970 sub create_form_ul {

# Breadcrumbs	# Breadcrumbs
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
if ($allowed) {	unless ($showdoc) {
&Apache::lonhtmlcommon::add_breadcrumb({	&Apache::lonhtmlcommon::add_breadcrumb({
href=>"/adm/coursedocs",text=>"$crstype Editor"});	href=>"/adm/coursedocs",text=>"$crstype Contents"});

$r->print(&Apache::loncommon::start_page("$crstype Editor", $script,	$r->print(&Apache::loncommon::start_page("$crstype Contents", $script,
{'force_register' => $showdoc,})	{'force_register' => $showdoc,})
.&Apache::loncommon::help_open_menu('','',273,'RAT')	.&Apache::loncommon::help_open_menu('','',273,'RAT')
.&Apache::lonhtmlcommon::breadcrumbs(	.&Apache::lonhtmlcommon::breadcrumbs(
'Editing the Table of Contents for your '.$crstype,	'Editing the Table of Contents for your '.$crstype,
'Docs_Adding_Course_Doc')	'Docs_Adding_Course_Doc')
);	);
} elsif ($showdoc) {	} else {
$r->print(&Apache::loncommon::start_page("$crstype documents",undef,	$r->print(&Apache::loncommon::start_page("$crstype documents",undef,
{'force_register' => $showdoc,}));	{'force_register' => $showdoc,}));
} else {
my $folder=$env{'form.folder'};
if ($folder eq '' \|\| $folder eq 'supplemental') {
$env{'form.folderpath'} = 'supplemental&'.
&escape(&mt('Supplemental '.$crstype.' Documents'));
}
my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);
$r->print(&Apache::loncommon::start_page("Supplemental documents").
$breadcrumbtrail);
}	}

my %allfiles = ();	my %allfiles = ();
my %codebase = ();	my %codebase = ();
my ($upload_result,$upload_output);	my ($upload_result,$upload_output,$uploadphase);
if ($allowed) {	if ($allowed) {
if (($env{'form.uploaddoc.filename'}) &&	if (($env{'form.uploaddoc.filename'}) &&
($env{'form.cmd'}=~/^upload_(\w+)/)) {	($env{'form.cmd'}=~/^upload_(\w+)/)) {
# Process file upload - phase one - upload and parse primary file.	my $context = $1;
	# Process file upload - phase one - upload and parse primary file.
undef($hadchanges);	undef($hadchanges);
$upload_result = &process_file_upload(\$upload_output,$coursenum,	$uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
$coursedom,\%allfiles,	\%allfiles,\%codebase,$context);
\%codebase,$1);
if ($hadchanges) {	if ($hadchanges) {
&mark_hash_old();	&mark_hash_old();
}	}
if ($upload_result eq 'phasetwo') {	$r->print($upload_output);
$r->print($upload_output);	} elsif ($env{'form.phase'} eq 'upload_embedded') {
}	# Process file upload - phase two - upload embedded objects
} elsif ($env{'form.phasetwo'}) {	$uploadphase = 'check_embedded';
my %newname = ();	my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');
my %origname = ();	my $state = &embedded_form_elems($uploadphase,$primaryurl,
my %attribs = ();	$env{'form.newidx'});
my $updateflag = 0;	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $residx = $env{'form.newidx'};	my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $primary_url = &unescape($env{'form.primaryurl'});	my ($destination,$dir_root) = &embedded_destination();
# Process file upload - phase two - gather secondary files.	my $url_root = '/uploaded/'.$docudom.'/'.$docuname;
for (my $i=0; $i<$env{'form.phasetwo'}; $i++) {	my $actionurl = '/adm/coursedocs';
if ($env{'form.embedded_item_'.$i.'.filename'}) {	my ($result,$flag) =
my $javacodebase;	&Apache::loncommon::upload_embedded('coursedoc',$destination,
$newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);	$docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,
$origname{$i} = &unescape($env{'form.embedded_orig_'.$i});	$actionurl);
if (exists($env{'form.embedded_codebase_'.$i})) {	$r->print($result.&return_to_editor());
$javacodebase = &unescape($env{'form.embedded_codebase_'.$i});	} elsif ($env{'form.phase'} eq 'check_embedded') {
$origname{$i} =~ s#^\Q$javacodebase\E/##;	# Process file upload - phase three - modify references in HTML file
}	$uploadphase = 'modified_orightml';
my @attributes = ();	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
if ($env{'form.embedded_attrib_'.$i} =~ /:/) {	my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
@attributes = split(/:/,$env{'form.embedded_attrib_'.$i});	my ($destination,$dir_root) = &embedded_destination();
} else {	$r->print(&Apache::loncommon::modify_html_refs('coursedoc',$destination,
@attributes = ($env{'form.embedded_attrib_'.$i});	$docuname,$docudom,undef,
}	$dir_root).
foreach my $attr (@attributes) {	&return_to_editor());
push(@{$attribs{$i}},&unescape($attr));
}
if ($javacodebase) {
$codebase{$i} = $javacodebase;
$codebase{$i} =~ s#/$##;
$updateflag = 1;
}
}
unless ($newname{$i} eq $origname{$i}) {
$updateflag = 1;
}
}
# Process file upload - phase three - modify primary file
if ($updateflag) {
my ($content,$rtncode);
my $updateflag = 0;
my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);
if ($getstatus eq 'ok') {
foreach my $item (keys(%newname)) {
if ($newname{$item} ne $origname{$item}) {
my $attrib_regexp = '';
if (@{$attribs{$item}} > 1) {
$attrib_regexp = join('\|',@{$attribs{$item}});
} else {
$attrib_regexp = $attribs{$item}[0];
}
if ($content =~ m#($attrib_regexp\s=\s['"]?)\Q$origname{$item}\E(['"]?)#) {
}
$content =~ s#($attrib_regexp\s=\s['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi;
}
if (exists($codebase{$item})) {
$content =~ s/(codebase\s=\s["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i; #' stupid emacs
}
}
# Save edited file.
my $saveresult;
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $url = &Apache::lonnet::store_edited_file($primary_url,$content,$docudom,$docuname,\$saveresult);
} else {
&Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus);
}
}
}	}
}	}

unless ($showdoc \|\| $upload_result eq 'phasetwo') {	unless ($showdoc \|\| $uploadphase) {
# -----------------------------------------------------------------------------	# -----------------------------------------------------------------------------
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'uplm' => 'Upload a new main '.lc($crstype).' document',	'uplm' => 'Upload a new main '.lc($crstype).' document',
Line 2918 sub create_form_ul {	Line 3040 sub create_form_ul {
'upld' => 'Import Document',	'upld' => 'Import Document',
'srch' => 'Search',	'srch' => 'Search',
'impo' => 'Import',	'impo' => 'Import',
'book' => 'Import Bookmarks',	'wish' => 'Import from Wishlist',
'selm' => 'Select Map',	'selm' => 'Select Map',
'load' => 'Load Map',	'load' => 'Load Map',
'reco' => 'Recover Deleted Documents',	'reco' => 'Recover Deleted Documents',
Line 2930 sub create_form_ul {	Line 3052 sub create_form_ul {
'sipa' => 'Simple Course Page',	'sipa' => 'Simple Course Page',
'sipr' => 'Simple Problem',	'sipr' => 'Simple Problem',
'drbx' => 'Drop Box',	'drbx' => 'Drop Box',
'scuf' => 'Score Upload Form',	'scuf' => 'External Scores (handgrade, upload, clicker)',
'bull' => 'Discussion Board',	'bull' => 'Discussion Board',
'mypi' => 'My Personal Information Page',	'mypi' => 'My Personal Information Page',
'grpo' => 'Group Portfolio',	'grpo' => 'Group Portfolio',
Line 2969 CHBO	Line 3091 CHBO
$fileupload	$fileupload
<br />	<br />
$lt{'title'}:<br />	$lt{'title'}:<br />
<input type="text" size="50" name="comment" />	<input type="text" size="80" name="comment" />
$uploadtag	$uploadtag
<input type="hidden" name="cmd" value="upload_default" />	<input type="hidden" name="cmd" value="upload_default" />
<br />	<br />
Line 2977 CHBO	Line 3099 CHBO
$checkbox	$checkbox
</span>	</span>
FUFORM	FUFORM
#$list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});	$fileuploadform .= &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$fileuploada,{class => 'LC_menubuttons_inline_text'})).'</form>';
#$fileuploadform .= create_form_ul(create_list_elements(@fileuploada));
$fileuploadform .= create_form_ul(Apache::lonhtmlcommon::htmltag('li',$fileuploada,{class => 'LC_menubuttons_inline_text'}));
$fileuploadform .= (<<FUFORM);
</form>
FUFORM

my $simpleeditdefaultform=(<<SEDFFORM);	my $simpleeditdefaultform=(<<SEDFFORM);
<form action="/adm/coursedocs" method="post" name="simpleeditdefault">	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
Line 2991 SEDFFORM	Line 3108 SEDFFORM
my @simpleeditdefaultforma = (	my @simpleeditdefaultforma = (
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/vbkm.png" alt="'.$lt{book}.'" onclick="javascript:groupopen(0,1,1);" />' => "<a class='LC_menubuttons_link' href='javascript:groupopen(0,1,1);'>$lt{'book'}</a>" },	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" },
);	);
$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));	$simpleeditdefaultform .= &create_form_ul(&create_list_elements(@simpleeditdefaultforma));
$simpleeditdefaultform .=(<<SEDFFORM);	$simpleeditdefaultform .=(<<SEDFFORM);
<hr />	<hr />
<p>	<p>
Line 3007 SEDFFORM	Line 3124 SEDFFORM
</form>	</form>
SEDFFORM	SEDFFORM

my $extresourcesform=(<<ERFORM);	my $extresourcesform=(<<ERFORM);
<form action="/adm/coursedocs" method="post" name="newext">	<form action="/adm/coursedocs" method="post" name="newext">
$uploadtag	$uploadtag
<input type="hidden" name="importdetail" value="" />	<input type="hidden" name="importdetail" value="" />
<a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}	<a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
</form>	</form>
ERFORM	ERFORM


if ($allowed) {	if ($allowed) {
&update_paste_buffer($coursenum,$coursedom);	&update_paste_buffer($coursenum,$coursedom);
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
Line 3038 ERFORM	Line 3156 ERFORM
</form>	</form>
HIDDENFORM	HIDDENFORM
}	}
# --------------------------------------------------------- Main tab structure
	# Generate the tabs
my $activeClass = 1;	&startContentScreen($r,($supplementalflag?'supdocs':'docs'));
my $active = '';
my %tabtitles = (
main => {	#
Course => &mt('Main Course Documents'),
Community => &mt('Main Community Documents'),	my $savefolderpath;
},
supplemental => {
Course => &mt('Supplemental Course Documents'),
Community => &mt('Supplemental Community Documents'),
},
);
if ($allowed) {	if ($allowed) {
$r->print('<ul class="LC_TabContentBigger" id="mainnav">');
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('<li '.$active
. ' onmouseover="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"'
. ' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'main'}{$crstype}.'</b></a></li>');
$active = '';
if (!$forcestandard \|\| ($env{'form.folderpath'}=~/^supplemental/)) {
if($activeClass == 1){
$active = 'class="active"';
}
}
$r->print('<li '.$active
.' onmouseover="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');"'
.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'supplemental'}{$crstype}.'</b></a></li>');
$r->print('</ul>');
} else {
$r->print('<br />');
}
$r->print('<div class="LC_Box" style="clear:both;margin:0;">'
.'<div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
# --------------------------------------------------------- Standard documents
my $savefolderpath;
$active = 'style="display: none;"';
if($activeClass == 0){
$active = 'style="display: block;"';
}
if ($allowed) {
$r->print('<div class="LC_ContentBox" id="mainCourseDocuments" '.$active.'>');
my $folder=$env{'form.folder'};	my $folder=$env{'form.folder'};
if ($folder eq '' \|\| $folder=~/^supplemental/) {	if ($folder eq '' \|\| $supplementalflag) {
$folder='default';	$folder='default';
$savefolderpath = $env{'form.folderpath'};	$savefolderpath = $env{'form.folderpath'};
$env{'form.folderpath'}='default&'.&escape($tabtitles{'main'}{$crstype});	$env{'form.folderpath'}='default&'.&escape(&mt('Content'));
$uploadtag = '<input type="hidden" name="folderpath" value="'.	$uploadtag = '<input type="hidden" name="folderpath" value="'.
&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';	&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
}	}
Line 3119 HIDDENFORM	Line 3199 HIDDENFORM

my $recoverform=(<<RFORM);	my $recoverform=(<<RFORM);
<form action="/adm/groupsort" method="post" name="recover">	<form action="/adm/groupsort" method="post" name="recover">
<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1,0)">$lt{'reco'}</a>	<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
</form>	</form>
RFORM	RFORM

Line 3224 NROSTFORM	Line 3304 NROSTFORM

my $specialdocumentsform;	my $specialdocumentsform;
my @specialdocumentsforma;	my @specialdocumentsforma;
	my $gradingform;
	my @gradingforma;
	my $communityform;
	my @communityforma;
my $newfolderform;	my $newfolderform;
my $newfolderb;	my $newfolderb;

unless ($env{'form.pagepath'}) {	my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');

my $newpageform=(<<NPFORM);	my $newpageform=(<<NPFORM);
<form action="/adm/coursedocs" method="post" name="newpage">	<form action="/adm/coursedocs" method="post" name="newpage">
Line 3275 NGFFORM	Line 3358 NGFFORM
@specialdocumentsforma=(	@specialdocumentsforma=(
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'" onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'" onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
);	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
	);
}	$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma));
push @specialdocumentsforma, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},	my @importdoc = (
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},);
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},	$fileuploadform = &create_form_ul(&create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},	@gradingforma=(
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},);	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},

	);
	$gradingform = &create_form_ul(&create_list_elements(@gradingforma));

	@communityforma=(
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},
	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
	);
	$communityform = &create_form_ul(&create_list_elements(@communityforma));

$specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));

if($env{'form.pagepath'}) {

@specialdocumentsforma=(
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.&mt('Simple Problem').'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.&mt('Score Upload Form').'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}
);
$specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
}

my @tools = (	my @tools = (
# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},	# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},	# {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1,0)" />'=>$recoverform},	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
);	);

my @importdoc = (
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform},
);
$fileuploadform = create_form_ul(create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;
my %orderhash = (	my %orderhash = (
'00' => ['Newfolder',$newfolderform],
'aa' => ['Import Documents',$fileuploadform],	'aa' => ['Import Documents',$fileuploadform],
'bb' => ['Published Resources',$simpleeditdefaultform],	'bb' => ['Published Resources',$simpleeditdefaultform],
'cc' => ['Special Documents',$specialdocumentsform],	'cc' => ['Grading Resources',$gradingform],
'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)],	'ff' => ['Tools', &create_form_ul(&create_list_elements(@tools)).&generate_admin_options(\%help,\%env)],
);	);
my $tid='1';	unless ($env{'form.pagepath'}) {
	$orderhash{'00'} = ['Newfolder',$newfolderform];
	$orderhash{'dd'} = ['Community Resources',$communityform];
	$orderhash{'ee'} = ['Special Documents',$specialdocumentsform];
	}

$hadchanges=0;	$hadchanges=0;
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);	unless ($supplementalflag) {
if ($error) {	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
$r->print('<p><span class="LC_error">'.$error.'</span></p>');	if ($error) {
}	$r->print('<p><span class="LC_error">'.$error.'</span></p>');
if ($hadchanges) {	}
&mark_hash_old();	if ($hadchanges) {
}	&mark_hash_old();
	}

&changewarning($r,'');	&changewarning($r,'');
$r->print(&generate_edit_table($tid,\%orderhash));	$r->print(&generate_edit_table('1',\%orderhash));
	}

$r->print('</div>');
}	}
if ($env{'form.pagepath'}) {
}	# Supplemental documents start here
# ----------------------------------------------------- Supplemental documents
$active = 'style="display: none;"';
if($activeClass == 1){
$active = 'style="display: block;"';
}
$r->print('<div class="LC_ContentBox" id="supplCourseDocuments" '.$active.'>');
my $folder=$env{'form.folder'};	my $folder=$env{'form.folder'};
unless ($folder=~/^supplemental/) {	unless ($supplementalflag) {
$folder='supplemental';	$folder='supplemental';
}	}
if ($folder =~ /^supplemental$/ &&	if ($folder =~ /^supplemental$/ &&
(($env{'form.folderpath'} =~ /^default\&/) \|\| ($env{'form.folderpath'} eq ''))) {	(($env{'form.folderpath'} =~ /^default\&/) \|\| ($env{'form.folderpath'} eq ''))) {
$env{'form.folderpath'} = 'supplemental&'.	$env{'form.folderpath'} = &supplemental_base();
&escape(&mt('Supplemental '.$crstype.' Documents'));
} elsif ($allowed) {	} elsif ($allowed) {
$env{'form.folderpath'} = $savefolderpath;	$env{'form.folderpath'} = $savefolderpath;
}	}
Line 3377 $r->print('</div>');	Line 3459 $r->print('</div>');
<input type="hidden" name="folderpath" value="$path" />	<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="cmd" value="upload_supplemental" />	<input type="hidden" name="cmd" value="upload_supplemental" />
SUPDOCFORM	SUPDOCFORM
$supupdocform .= create_form_ul(Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";	$supupdocform .= &create_form_ul(&Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";

my $supnewfolderform=(<<SNFFORM);	my $supnewfolderform=(<<SNFFORM);
<form action="/adm/coursedocs" method="post" name="supnewfolder">	<form action="/adm/coursedocs" method="post" name="supnewfolder">
Line 3432 my @supimportdoc = (	Line 3514 my @supimportdoc = (
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
=>$supnewextform},	=>$supnewextform},
);	);
$supupdocform = create_form_ul(create_list_elements(@supimportdoc)) . '<hr/>' . $supupdocform;	$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr/>' . $supupdocform;
my %suporderhash = (	my %suporderhash = (
'00' => ['Supnewfolder', $supnewfolderform],	'00' => ['Supnewfolder', $supnewfolderform],
'ee' => ['Import Documents',$supupdocform],	'ee' => ['Import Documents',$supupdocform],
'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))]	'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
);	);
	if ($supplementalflag) {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
if ($error) {	if ($error) {
$r->print('<p><span class="LC_error">'.$error.'</span></p>');	$r->print('<p><span class="LC_error">'.$error.'</span></p>');
	}
	$r->print(&generate_edit_table('2',\%suporderhash));
}	}
my $tid='2';	} elsif ($supplementalflag) {
$r->print(&generate_edit_table($tid,\%suporderhash));
} else {
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);	my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
if ($error) {	if ($error) {
$r->print('<p><span class="LC_error">'.$error.'</span></p>');	$r->print('<p><span class="LC_error">'.$error.'</span></p>');
}	}
}	}

	&endContentScreen($r);
$r->print('</div>');
$r->print('</div></div>');


if ($allowed) {	if ($allowed) {
$r->print('	$r->print('
Line 3467 $r->print('</div></div>');	Line 3546 $r->print('</div></div>');
</form>');	</form>');
}	}
} else {	} else {
unless ($upload_result eq 'phasetwo') {	unless ($uploadphase) {
# -------------------------------------------------------- This is showdoc mode	# -------------------------------------------------------- This is showdoc mode
$r->print("<h1>".&mt('Uploaded Document').' - '.	$r->print("<h1>".&mt('Uploaded Document').' - '.
&Apache::lonnet::gettitle($r->uri).'</h1><p>'.	&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
Line 3480 $r->print('</div></div>');	Line 3559 $r->print('</div></div>');
return OK;	return OK;
}	}

	sub embedded_form_elems {
	my ($phase,$primaryurl,$newidx) = @_;
	my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
	return <<STATE;
	<input type="hidden" name="folderpath" value="$folderpath" />
	<input type="hidden" name="cmd" value="upload_embedded" />
	<input type="hidden" name="newidx" value="$newidx" />
	<input type="hidden" name="phase" value="$phase" />
	<input type="hidden" name="primaryurl" value="$primaryurl" />
	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 '<p><form name="backtoeditor" method="post" action="'.$actionurl.'" />'."\n".
	'<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" /></form>'."\n".
	'<a href="javascript:document.backtoeditor.submit();">'.&mt('Return to Editor').
	'</a></p>';
	}

sub generate_admin_options {	sub generate_admin_options {
my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;	my ($help_ref,$env_ref) = @_;
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'vc' => 'Verify Content',	'vc' => 'Verify Content',
'cv' => 'Check/Set Resource Versions',	'cv' => 'Check/Set Resource Versions',
'ls' => 'List Symbs',	'ls' => 'List Symbs',
Line 3510 sub generate_admin_options {	Line 3625 sub generate_admin_options {
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/document-properties.png" alt="'.$lt{sl}.'" onclick=\'javascript:injectData(document.courseverify, "dummy", "docslog", "'.$lt{'sl'}.'")\' />'	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/document-properties.png" alt="'.$lt{sl}.'" onclick=\'javascript:injectData(document.courseverify, "dummy", "docslog", "'.$lt{'sl'}.'")\' />'
=>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"},	=>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"},
);	);
return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.create_form_ul(create_list_elements(@list)).'</form>';	return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.&create_form_ul(&create_list_elements(@list)).'</form>';

}	}

Line 3569 sub editing_js {	Line 3684 sub editing_js {
t_mnf => 'New Folder',	t_mnf => 'New Folder',
p_mnp => 'Name of New Page',	p_mnp => 'Name of New Page',
t_mnp => 'New Page',	t_mnp => 'New Page',
p_mxu => 'Title for the Uploaded Score',	p_mxu => 'Title for the External Score',
p_msp => 'Name of Simple Course Page',	p_msp => 'Name of Simple Course Page',
p_msb => 'Title for the Problem',	p_msb => 'Title for the Problem',
p_mdb => 'Title for the Drop Box',	p_mdb => 'Title for the Drop Box',
Line 3589 sub editing_js {	Line 3704 sub editing_js {
);	);

my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
my $docs_folderpath = $env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'};	my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"');
my $docs_pagepath = $env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.pagepath'};	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 $toplevelmain = 'default&Main%20'.$crstype.'%20Documents';
my $toplevelsupp = 'supplemental&Supplemental%20'.$crstype.'%20Documents';	my $toplevelsupp = &supplemental_base();

return <<ENDNEWSCRIPT;	return <<ENDNEWSCRIPT;
function makenewfolder(targetform,folderseq) {	function makenewfolder(targetform,folderseq) {
Line 3827 function showPage(current, pageId, nav,	Line 3948 function showPage(current, pageId, nav,
if (storedpath == '') {	if (storedpath == '') {
storedpath = "$docs_pagepath";	storedpath = "$docs_pagepath";
}	}
	var storedpage = "$main_container_page";
var reg = new RegExp("^supplemental");	var reg = new RegExp("^supplemental");
if (pageId == 'mainCourseDocuments') {	if (pageId == 'mainCourseDocuments') {
if (reg.test(storedpath)) {	if (storedpage == 1) {
document.simpleedit.folderpath.value = '$toplevelmain';	document.simpleedit.folderpath.value = '';
document.uploaddocument.folderpath.value = '$toplevelmain';	document.uploaddocument.folderpath.value = '';
document.newext.folderpath.value = '$toplevelmain';	} else {
	if (reg.test(storedpath)) {
	document.simpleedit.folderpath.value = '$toplevelmain';
	document.uploaddocument.folderpath.value = '$toplevelmain';
	document.newext.folderpath.value = '$toplevelmain';
	} else {
	document.simpleedit.folderpath.value = storedpath;
	document.uploaddocument.folderpath.value = storedpath;
	document.newext.folderpath.value = storedpath;
	}
}	}
} else {	} else {
if (!reg.test(storedpath)) {	if (reg.test(storedpath)) {
	document.simpleedit.folderpath.value = storedpath;
	document.supuploaddocument.folderpath.value = storedpath;
	document.supnewext.folderpath.value = storedpath;
	} else {
document.simpleedit.folderpath.value = '$toplevelsupp';	document.simpleedit.folderpath.value = '$toplevelsupp';
document.supuploaddocument.folderpath.value = '$toplevelsupp';	document.supuploaddocument.folderpath.value = '$toplevelsupp';
document.supnewext.folderpath.value = '$toplevelsupp';	document.supnewext.folderpath.value = '$toplevelsupp';

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.433
changed lines
	Added in v.1.456