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.280 and 1.283

version 1.280, 2007/06/29 21:08:07	version 1.283, 2007/07/03 00:17:42
Line 122 sub dumpbutton {	Line 122 sub dumpbutton {
my ($home,$other,%outhash)=&authorhosts();	my ($home,$other,%outhash)=&authorhosts();
my $type = &Apache::loncommon::course_type();	my $type = &Apache::loncommon::course_type();
if ($home+$other==0) { return ''; }	if ($home+$other==0) { return ''; }
my $output='</td><td bgcolor="#DDDDCC">';
if ($home) {	if ($home) {
return '</td><td bgcolor="#DDDDCC">'.	return '<div>'.
'<input type="submit" name="dumpcourse" value="'.	'<input type="submit" name="dumpcourse" value="'.
&mt('Dump '.$type.' DOCS to Construction Space').'" />'.	&mt('Dump '.$type.' DOCS to Construction Space').'" />'.
&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');	&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').
	'</div>';
} else {	} else {
return'</td><td bgcolor="#DDDDCC">'.	return '<div>'.
&mt('Dump '.$type.	&mt('Dump '.$type.
' DOCS to Construction Space: available on other servers');	' DOCS to Construction Space: available on other servers').
	'</div>';
}	}
}	}

Line 199 sub dumpcourse {	Line 200 sub dumpcourse {
$fail=1;	$fail=1;
}	}
if ($fail) {	if ($fail) {
$r->print('<font color="red">fail</font>');	$r->print('<span class="LC_error">'.&mt('fail').'</span>');
} else {	} else {
$r->print('<font color="green">ok</font>');	$r->print('<span class="LC_success">'.&mt('ok').'</span>');
}	}
}	}
} else {	} else {
Line 257 sub dumpcourse {	Line 258 sub dumpcourse {

sub exportbutton {	sub exportbutton {
my $type = &Apache::loncommon::course_type();	my $type = &Apache::loncommon::course_type();
return '</td><td bgcolor="#DDDDCC">'.	return '<div>'.
'<input type="submit" name="exportcourse" value="'.	'<input type="submit" name="exportcourse" value="'.
&mt('Export '.$type.' to IMS').'" />'.	&mt('Export '.$type.' to IMS').'" />'.
&Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');	&Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';
}	}

sub exportcourse {	sub exportcourse {
Line 379 sub exportcourse {	Line 380 sub exportcourse {
}	}
$display .= ' />'."\n";	$display .= ' />'."\n";
for (my $i=0; $i<$depth; $i++) {	for (my $i=0; $i<$depth; $i++) {
$display .= '<img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" /><img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" />'."\n";	$display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";
}	}
if ($curRes->is_sequence()) {	if ($curRes->is_sequence()) {
$display .= '<img src="/adm/lonIcons/navmap.folder.open.gif"> '."\n";	$display .= '<img src="/adm/lonIcons/navmap.folder.open.gif"> '."\n";
Line 958 sub breadcrumbs {	Line 959 sub breadcrumbs {
my $folderpath;	my $folderpath;
my $cpinfo='';	my $cpinfo='';
my $plain='';	my $plain='';
if ($env{'form.markedcopy_url'}) {
$cpinfo='&markedcopy_url='.
&escape($env{'form.markedcopy_url'}).
'&markedcopy_title='.
&escape($env{'form.markedcopy_title'});
}
my $randompick=-1;	my $randompick=-1;
my $isencrypted=0;	my $isencrypted=0;
my $ishidden=0;	my $ishidden=0;
Line 1187 sub docs_change_log {	Line 1182 sub docs_change_log {
$r->print(&Apache::loncommon::end_data_table());	$r->print(&Apache::loncommon::end_data_table());
}	}

	sub update_paste_buffer {
	my ($coursenum,$coursedom) = @_;

	return if (!defined($env{'form.markcopy'}));
	return if (!defined($env{'form.copyfolder'}));
	return if ($env{'form.markcopy'} < 0);

	my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
	$env{'form.copyfolder'});

	return if ($fatal);

	# Mark for copying
	my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
	if (&is_supplemental_title($title)) {
	($title) = &parse_supplemental_title($title);
	}
	&Apache::lonnet::appenv('docs.markedcopy_title' => $title,
	'docs.markedcopy_url' => $url);
	delete($env{'form.markcopy'});
	}

	sub print_paste_buffer {
	my ($r,$container) = @_;
	return if (!defined($env{'docs.markedcopy_url'}));

	$r->print(<<ENDPASTE);
	<p><form name="pasteform" action="/adm/coursedocs" method="post">
	ENDPASTE
	$r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');

	my $type;
	if ($env{'docs.markedcopy_url'} =~ m{^/adm/wrapper/ext}) {
	$type = &mt('External Resource');
	$r->print($type.': '.&Apache::map::qtescape($env{'docs.markedcopy_title'}));
	} else {
	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
	my $type = &Apache::loncommon::filedescription($extension);
	my $icon = '<img src="'.&Apache::loncommon::icon($extension).
	'" class="LC_icon" />';
	$r->print($icon.$type.': '. &parse_supplemental_title($env{'docs.markedcopy_title'}));
	}
	if ($container eq 'page') {
	$r->print(<<PAGEINFO);
	<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
	<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
	PAGEINFO
	} else {
	$r->print(<<FOLDERINFO);
	<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
	FOLDERINFO
	}
	$r->print('</form></p>');
	}

sub editor {	sub editor {
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;	my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_;
my $errtext='';	my $errtext='';
my $fatal=0;	my $fatal=0;
my $container='sequence';	my $container='sequence';
if ($env{'form.pagepath'}) {	if ($env{'form.pagepath'}) {
$container='page';	$container='page';
}	}
($errtext,$fatal)=	($errtext,$fatal) = &mapread($coursenum,$coursedom,$folder.'.'.$container);
&mapread($coursenum,$coursedom,$folder.'.'.$container);
if ($#LONCAPA::map::order<1) {	if ($#LONCAPA::map::order<1) {
my $idx=&LONCAPA::map::getresidx();	my $idx=&LONCAPA::map::getresidx();
if ($idx<=0) { $idx=1; }	if ($idx<=0) { $idx=1; }
$LONCAPA::map::order[0]=$idx;	$LONCAPA::map::order[0]=$idx;
$LONCAPA::map::resources[$idx]='';	$LONCAPA::map::resources[$idx]='';
}	}
if (defined($env{'form.markcopy'})) {
# Mark for copying
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
$env{'form.markedcopy_title'}=$title;
$env{'form.markedcopy_url'}=$url;
}
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder);	my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder);
$r->print($breadcrumbtrail);	$r->print($breadcrumbtrail);
if ($fatal) {	if ($fatal) {
$r->print('<p><font color="red">'.$errtext.'</font></p>');	$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
} else {	} else {
# ------------------------------------------------------------ Process commands	# ------------------------------------------------------------ Process commands

Line 1253 sub editor {	Line 1297 sub editor {
# store the changed version	# store the changed version
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);	($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
if ($fatal) {	if ($fatal) {
$r->print('<p><font color="red">'.$errtext.'</font></p>');	$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;	return;
}	}
}	}
Line 1293 sub editor {	Line 1337 sub editor {
# store the changed version	# store the changed version
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);	($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
if ($fatal) {	if ($fatal) {
$r->print('<p><font color="red">'.$errtext.'</font></p>');	$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;	return;
}	}
}	}

if ($env{'form.pastemarked'}) {	if ($env{'form.pastemarked'}) {
# paste resource to end of list	# paste resource to end of list
my $url=$env{'form.markedcopy_url'};	my $url=$env{'docs.markedcopy_url'};
my $title=$env{'form.markedcopy_title'};	my $title=$env{'docs.markedcopy_title'};
# Maps need to be copied first	# Maps need to be copied first
if (($url=~/\.(page\|sequence)$/) \|\| ($url=~/^\/uploaded\//)) {	if (($url=~/\.(page\|sequence)$/) \|\| ($url=~/^\/uploaded\//)) {
$title=&mt('Copy of').' '.$title;	$title=&mt('Copy of').' '.$title;
Line 1327 sub editor {	Line 1371 sub editor {
# Store the result	# Store the result
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);	($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
if ($fatal) {	if ($fatal) {
$r->print('<p><font color="red">'.$errtext.'</font></p>');	$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;	return;
}	}

Line 1384 sub editor {	Line 1428 sub editor {
($errtext,$fatal)=&storemap($coursenum,$coursedom,	($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);	$folder.'.'.$container);
if ($fatal) {	if ($fatal) {
$r->print('<p><font color="red">'.$errtext.'</font></p>');	$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;	return;
}	}
}	}
Line 1404 sub editor {	Line 1448 sub editor {
($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,	($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
$container,'londocs',@imports);	$container,'londocs',@imports);
if ($fatal) {	if ($fatal) {
$r->print('<p><font color="red">'.$errtext.'</font></p>');	$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;	return;
}	}
}	}
Line 1421 sub editor {	Line 1465 sub editor {
($errtext,$fatal)=&storemap($coursenum,$coursedom,	($errtext,$fatal)=&storemap($coursenum,$coursedom,
$folder.'.'.$container);	$folder.'.'.$container);
if ($fatal) {	if ($fatal) {
$r->print('<p><font color="red">'.$errtext.'</font></p>');	$r->print('<p><span class="LC_error">'.$errtext.'</span></p>');
return;	return;
}	}
} else {	} else {
$r->print('<p><font color="red">'.&mt('No map selected.').'</font></p>');	$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');

}	}
}	}
&log_differences($plain);	&log_differences($plain);
}	}
# ---------------------------------------------------------------- End commands	# ---------------------------------------------------------------- End commands
# ---------------------------------------------------------------- Print screen	# ---------------------------------------------------------------- Print screen
my $idx=0;	my $idx=0;
Line 1460 sub editor {	Line 1505 sub editor {
$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
}	}
$r->print("\n</table>\n");	$r->print("\n</table>\n");
if ($env{'form.markedcopy_url'}) {
$r->print(<<ENDPASTE);
<p><form name="pasteform" action="/adm/coursedocs" method="post">
<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
ENDPASTE
$r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');

my $type;	&print_paste_buffer($r,$container);
if ($env{'form.markedcopy_url'} =~ m{^/adm/wrapper/ext}) {
$type = &mt('External Resource');
$r->print($type.': '. $env{'form.markedcopy_title'});
} else {
my $extension = (split(/\./,$env{'form.markedcopy_url'}))[-1];
my $type = &Apache::loncommon::filedescription($extension);
my $icon = '<img src="'.&Apache::loncommon::icon($extension).
'" class="LC_icon" />';
$r->print($icon.$type.': '. $env{'form.markedcopy_title'});
}
if ($container eq 'page') {
$r->print(<<PAGEINFO);
<input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
<input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
PAGEINFO
} else {
$r->print(<<FOLDERINFO);
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
FOLDERINFO
}
$r->print('</form></p>');
}
}	}
}	}

Line 1554 sub process_file_upload {	Line 1571 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><font color="red">'.$errtext.'</font></p>';	$$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';
return 'failed';	return 'failed';
} else {	} else {
if ($parseaction eq 'parse') {	if ($parseaction eq 'parse') {
Line 1562 sub process_file_upload {	Line 1579 sub process_file_upload {
if ($total_embedded > 0) {	if ($total_embedded > 0) {
my $num = 0;	my $num = 0;
my $state = '	my $state = '
<input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" />	<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
<input type="hidden" name="cmd" value="upload_embedded" />	<input type="hidden" name="cmd" value="upload_embedded" />
<input type="hidden" name="newidx" value="'.$newidx.'" />	<input type="hidden" name="newidx" value="'.$newidx.'" />
<input type="hidden" name="primaryurl" value="'.&escape($url).'" />	<input type="hidden" name="primaryurl" value="'.&escape($url).'" />
Line 1650 sub process_secondary_uploads {	Line 1667 sub process_secondary_uploads {
return $filename;	return $filename;
}	}

	sub is_supplemental_title {
	my ($title) = @_;
	return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
	}

	sub parse_supplemental_title {
	my ($title) = @_;

	my ($foldertitle,$renametitle);
	if ($title =~ /&&&/) {
	$title = &HTML::Entites::decode($title);
	}
	if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
	$renametitle=$4;
	my ($time,$uname,$udom) = ($1,$2,$3);
	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
	my $name = &Apache::loncommon::plainname($uname,$udom);
	$name = &HTML::Entities::encode($name,'"<>&\'');
	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
	$name.': <br />'.$foldertitle;
	}
	if (wantarray) {
	return ($title,$foldertitle,$renametitle);
	}
	return $title;
	}

# --------------------------------------------------------------- An entry line	# --------------------------------------------------------------- An entry line

sub entryline {	sub entryline {
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;	my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
$title=&HTML::Entities::encode($title,'"<>&\'');
my $renametitle=$title;	my ($foldertitle,$pagetitle,$renametitle);
my $foldertitle=$title;	if (&is_supplemental_title($title)) {
my $pagetitle=$title;	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
my $orderidx=$LONCAPA::map::order[$index];	$pagetitle = $foldertitle;
if ($title=~ /^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/ ) {	} else {
$foldertitle=&Apache::lontexconvert::msgtexconverted($4);	$title=&HTML::Entities::encode($title,'"<>&\'');
$renametitle=$4;	$renametitle=$title;
$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.	$foldertitle=$title;
&Apache::loncommon::plainname($2,$3).': <br />'.	$pagetitle=$title;
$foldertitle;
}	}

	my $orderidx=$LONCAPA::map::order[$index];


$renametitle=~s/\\/\\\\/g;	$renametitle=~s/\\/\\\\/g;
$renametitle=~s/\&quot\;/\\\"/g;	$renametitle=~s/\&quot\;/\\\"/g;
my $line='<tr>';	my $line='<tr>';
Line 1675 sub entryline {	Line 1722 sub entryline {
if ($env{'form.folderpath'}) {	if ($env{'form.folderpath'}) {
$type = 'folder';	$type = 'folder';
$container = 'sequence';	$container = 'sequence';
$esc_path=&escape($path = $env{'form.folderpath'});	$esc_path=&escape($env{'form.folderpath'});
	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
}	}
if ($env{'form.pagepath'}) {	if ($env{'form.pagepath'}) {
$type = $container = 'page';	$type = $container = 'page';
$esc_path=&escape($path = $env{'form.pagepath'});	$esc_path=&escape($path = $env{'form.pagepath'});
	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
$symb=&escape($env{'form.pagesymb'});	$symb=&escape($env{'form.pagesymb'});
}	}
my $cpinfo='';	my $cpinfo='';
if ($env{'form.markedcopy_url'}) {
$cpinfo='&markedcopy_url='.
&escape($env{'form.markedcopy_url'}).
'&markedcopy_title='.
&escape($env{'form.markedcopy_title'});
}
if ($allowed) {	if ($allowed) {
my $incindex=$index+1;	my $incindex=$index+1;
my $selectbox='';	my $selectbox='';
Line 1740 sub entryline {	Line 1783 sub entryline {

if (!$nocopy) {	if (!$nocopy) {
$copylink=(<<ENDCOPY);	$copylink=(<<ENDCOPY);
<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb");'>	<a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");'>
<font size="-2" color="#000099">$lt{'cp'}</font></a>	<font size="-2" color="#000099">$lt{'cp'}</font></a>
ENDCOPY	ENDCOPY
}	}
if (!$nocut) {	if (!$nocut) {
$cutlink=(<<ENDCUT);	$cutlink=(<<ENDCUT);
<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb");'>	<a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder");'>
<font size="-2" color="#550044">$lt{'ct'}</font></a>	<font size="-2" color="#550044">$lt{'ct'}</font></a>
ENDCUT	ENDCUT
}	}
Line 1754 ENDCUT	Line 1797 ENDCUT
<form name="entry_$index" action="/adm/coursedocs" method="post">	<form name="entry_$index" action="/adm/coursedocs" method="post">
<input type="hidden" name="${type}path" value="$path" />	<input type="hidden" name="${type}path" value="$path" />
<input type="hidden" name="${type}symb" value="$symb" />	<input type="hidden" name="${type}symb" value="$symb" />
<input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
<input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
<input type="hidden" name="setparms" value="$orderidx" />	<input type="hidden" name="setparms" value="$orderidx" />
<input type="hidden" name="changeparms" value="0" />	<input type="hidden" name="changeparms" value="0" />
<td>	<td>
<table border='0' cellspacing='2' cellpadding='0'>	<table border='0' cellspacing='2' cellpadding='0'>
<tr>	<tr>
<td bgcolor="#DDDDDD">	<td bgcolor="#DDDDDD">
<a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a>	<a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="#DDDDDD">	<td bgcolor="#DDDDDD">
<a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a>	<a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
</td>	</td>
</tr>	</tr>
</table>	</table>
Line 1884 END	Line 1925 END
$path.$pagearg.'.page');	$path.$pagearg.'.page');
}	}
$url.='pagepath='.&escape($pagepath).	$url.='pagepath='.&escape($pagepath).
'&pagesymb='.&escape($symb).$cpinfo;	'&pagesymb='.&escape($symb).$cpinfo;
}	}
$line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.	$line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
'" border="0"></a></td>'.	'" class="LC_icon" /></a></td>'.
"<td bgcolor='#FFFFBB'>".($url?"<a href=\"$url\">":'').$title.	"<td bgcolor='#FFFFBB'>".($url?"<a href=\"$url\">":'').$title.
($url?'</a>':' <font size="-2">'.&mt('(re-initialize course to access)').'</font>')."</td>";	($url?'</a>':' <font size="-2">'.&mt('(re-initialize course to access)').'</font>')."</td>";
if (($allowed) && ($folder!~/^supplemental/)) {	if (($allowed) && ($folder!~/^supplemental/)) {
Line 1972 sub checkonthis {	Line 2013 sub checkonthis {
if (($errorcount) \|\|	if (($errorcount) \|\|
($warningcount)) {	($warningcount)) {
if ($errorcount) {	if ($errorcount) {
$r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.	$r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
$errorcount.' '.	$errorcount.' '.
&mt('error(s)').'</b></font> ');	&mt('error(s)').'</span> ');
}	}
if ($warningcount) {	if ($warningcount) {
$r->print('<font color="blue">'.	$r->print('<span class="LC_warning">'.
$warningcount.' '.	$warningcount.' '.
&mt('warning(s)').'</font>');	&mt('warning(s)').'</span>');
}	}
} else {	} else {
$r->print('<font color="green">'.&mt('ok').'</font>');	$r->print('<span class="LC_success">'.&mt('ok').'</span>');
}	}
$r->rflush();	$r->rflush();
}	}
Line 1994 sub checkonthis {	Line 2035 sub checkonthis {
}	}
}	}
} elsif ($result eq 'unavailable') {	} elsif ($result eq 'unavailable') {
$r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');	$r->print('<span class="LC_error">'.&mt('connection down').'</span>');
} elsif ($result eq 'not_found') {	} elsif ($result eq 'not_found') {
unless ($url=~/\$/) {	unless ($url=~/\$/) {
$r->print('<font color="red"><b>'.&mt('not found').'</b></font>');	$r->print('<span class="LC_error">'.&mt('not found').'</b></font>');
} else {	} else {
$r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');	$r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
}	}
} else {	} else {
$r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');	$r->print('<span class="LC_error">'.&mt('access denied').'</span>');
}	}
}	}
}	}
Line 2044 sub verifycontent {	Line 2085 sub verifycontent {
foreach (keys %hash) {	foreach (keys %hash) {
if ($hash{$_}=~/\.(page\|sequence)$/) {	if ($hash{$_}=~/\.(page\|sequence)$/) {
if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {	if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {
$r->print('<hr /><font color="red">'.	$r->print('<hr /><span class="LC_error">'.
&mt('The following sequence or page is included more than once in your '.$type.': ').	&mt('The following sequence or page is included more than once in your '.$type.': ').
&unescape($hash{$_}).'</font><br />'.	&unescape($hash{$_}).'</span><br />'.
&mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));	&mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
}	}
}	}
Line 2126 sub checkversions {	Line 2167 sub checkversions {
$env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {	$env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
$r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');	$r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
} else {	} else {
$r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</font></h1>');	$r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
}	}
&mark_hash_old();	&mark_hash_old();
}	}
Line 2357 sub changewarning {	Line 2398 sub changewarning {
'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".	'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.	'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
'<input type="hidden" name="orgurl" value="'.$url.	'<input type="hidden" name="orgurl" value="'.$url.
'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.	'" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
&mt($message,' <input type="hidden" name="'.	&mt($message,' <input type="hidden" name="'.
$env{'request.role'}.'" value="1" /><input type="button" value="'.	$env{'request.role'}.'" value="1" /><input type="button" value="'.
&mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').	&mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
$help{'Caching'}.'</font></h3></form>'."\n\n");	$help{'Caching'}.'</span></h3></form>'."\n\n");
}	}

# =========================================== Breadcrumbs for special functions	# =========================================== Breadcrumbs for special functions
Line 2443 sub handler {	Line 2484 sub handler {
my $uploadtag;	my $uploadtag;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['folderpath','pagepath',	['folderpath','pagepath',
'pagesymb','markedcopy_url',	'pagesymb']);
'markedcopy_title']);
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 2456 sub handler {	Line 2496 sub handler {
$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="'.$env{'form.pagepath'}.'" />'.	$uploadtag = '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
'<input type="hidden" name="pagesymb" value="'.$env{'form.pagesymb'}.'" />';	'<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />';
}	}
if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {	if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
$showdoc='/'.$1;	$showdoc='/'.$1;
Line 2619 sub handler {	Line 2659 sub handler {
);	);
# -----------------------------------------------------------------------------	# -----------------------------------------------------------------------------
if ($allowed) {	if ($allowed) {
	&update_paste_buffer($coursenum,$coursedom);
my $dumpbut=&dumpbutton();	my $dumpbut=&dumpbutton();
my $exportbut=&exportbutton();	my $exportbut=&exportbutton();
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
Line 2638 sub handler {	Line 2679 sub handler {
}	}
unless ($env{'form.pagepath'}) {	unless ($env{'form.pagepath'}) {
$containertag = '<input type="hidden" name="folderpath" value="" />';	$containertag = '<input type="hidden" name="folderpath" value="" />';
$uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';	$uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
}	}

$r->print(<<ENDCOURSEVERIFY);	$r->print(<<ENDCOURSEVERIFY);
<form name="renameform" method="post" action="/adm/coursedocs">	<form name="renameform" method="post" action="/adm/coursedocs">
<input type="hidden" name="title" />	<input type="hidden" name="title" />
<input type="hidden" name="cmd" />	<input type="hidden" name="cmd" />
<input type="hidden" name="markcopy" />	<input type="hidden" name="markcopy" />
$containertag	<input type="hidden" name="copyfolder" />
	$containertag
</form>	</form>
<form name="simpleedit" method="post" action="/adm/coursedocs">	<form name="simpleedit" method="post" action="/adm/coursedocs">
<input type="hidden" name="importdetail" value="" />	<input type="hidden" name="importdetail" value="" />
$uploadtag	$uploadtag
</form>	</form>
<form action="/adm/coursedocs" method="post" name="courseverify">	<form action="/adm/coursedocs" method="post" name="courseverify">
<table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">	<div class="LC_docs_course_commands">
<tr><td bgcolor="#DDDDCC">
<input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}	<div>
</td><td bgcolor="#DDDDCC">	<input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
<input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}	</div>
$dumpbut	<div>
$exportbut	<input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
</td><td bgcolor="#DDDDCC">	</div>
<input type="submit" name="listsymbs" value="$lt{'ls'}" />	$dumpbut
</td><td bgcolor="#DDDDCC">	$exportbut
<input type="hidden" name="folder" value="$env{'form.folder'}" />	<div>
<input type="submit" name="docslog" value="$lt{'sl'}" />	<input type="submit" name="listsymbs" value="$lt{'ls'}" />
</td></tr></table>	</div>
	<div>
	<input type="hidden" name="folder" value="$env{'form.folder'}" />
	<input type="submit" name="docslog" value="$lt{'sl'}" />
	</div>
	</div>
</form>	</form>
	<div style="clear: both; height: 0px;"> </div>
ENDCOURSEVERIFY	ENDCOURSEVERIFY
$r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',	$r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
&mt('Editing the Table of Contents for your '.$type)));	&mt('Editing the Table of Contents for your '.$type)));
Line 2747 $help{'Importing_LON-CAPA_Resource'}	Line 2795 $help{'Importing_LON-CAPA_Resource'}
<p>	<p>
<hr />	<hr />
$lt{'copm'}<br />	$lt{'copm'}<br />
<input type="text" size="40" name="importmap"><br />	<input type="text" size="40" name="importmap" /><br />
<nobr><input type=button	<nobr><input type=button
onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"	onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">	value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
$help{'Load_Map'}</nobr>	$help{'Load_Map'}</nobr>
</p>	</p>
</form>	</form>
Line 2773 value="$lt{'extr'}" /> $help{'Adding_Ext	Line 2821 value="$lt{'extr'}" /> $help{'Adding_Ext
<br /><form action="/adm/imsimportdocs" method="post" name="ims">	<br /><form action="/adm/imsimportdocs" method="post" name="ims">
<input type="hidden" name="folder" value="$folder" />	<input type="hidden" name="folder" value="$folder" />
<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />	<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
</nobr>
</form>	</form>
ENDFORM	ENDFORM
}	}
$r->print('</td><td bgcolor="#DDDDDD">');	$r->print('</td><td bgcolor="#DDDDDD">');
unless ($env{'form.pagepath'}) {	unless ($env{'form.pagepath'}) {
	my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
$r->print(<<ENDFORM);	$r->print(<<ENDFORM);
<br /><form action="/adm/coursedocs" method="post" name="newfolder">	<br /><form action="/adm/coursedocs" method="post" name="newfolder">
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />	<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />	<input type="hidden" name="importdetail" value="" />
<nobr>	<nobr>
<input name="newfolder" type="button"	<input name="newfolder" type="button"
Line 2790 value="$lt{'newf'}" />$help{'Adding_Fold	Line 2838 value="$lt{'newf'}" />$help{'Adding_Fold
</nobr>	</nobr>
</form>	</form>
<br /><form action="/adm/coursedocs" method="post" name="newpage">	<br /><form action="/adm/coursedocs" method="post" name="newpage">
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />	<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />	<input type="hidden" name="importdetail" value="" />
<nobr>	<nobr>
<input name="newpage" type="button"	<input name="newpage" type="button"
Line 2927 ENDBLOCK	Line 2975 ENDBLOCK
}	}
&editor($r,$coursenum,$coursedom,$folder,$allowed);	&editor($r,$coursenum,$coursedom,$folder,$allowed);
if ($allowed) {	if ($allowed) {
my $folderseq=	my $folderseq=
'/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.	'/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
'.sequence';	'.sequence';

$r->print(<<ENDSUPFORM);	my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
	$r->print(<<ENDSUPFORM);
<table cellspacing=4 cellpadding=4><tr>	<table cellspacing=4 cellpadding=4><tr>
<th bgcolor="#DDDDDD">$lt{'upls'}</th>	<th bgcolor="#DDDDDD">$lt{'upls'}</th>
<th bgcolor="#DDDDDD">$lt{'spec'}</th>	<th bgcolor="#DDDDDD">$lt{'spec'}</th>
Line 2951 $lt{'comment'}:<br />	Line 3000 $lt{'comment'}:<br />
<textarea cols=50 rows=4 name='comment'>	<textarea cols=50 rows=4 name='comment'>
</textarea>	</textarea>
<br />	<br />
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />	<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="cmd" value="upload_supplemental">	<input type="hidden" name="cmd" value="upload_supplemental">
<nobr>	<nobr>
<input type="submit" value="$lt{'upld'}">	<input type="submit" value="$lt{'upld'}">
Line 2961 $lt{'comment'}:<br />	Line 3010 $lt{'comment'}:<br />
</td>	</td>
<td bgcolor="#DDDDDD">	<td bgcolor="#DDDDDD">
<form action="/adm/coursedocs" method="post" name="supnewfolder">	<form action="/adm/coursedocs" method="post" name="supnewfolder">
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />	<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />	<input type="hidden" name="importdetail" value="" />
<nobr>	<nobr>
<input name="newfolder" type="button"	<input name="newfolder" type="button"
Line 2970 value="$lt{'newf'}" /> $help{'Adding_Fol	Line 3019 value="$lt{'newf'}" /> $help{'Adding_Fol
</nobr>	</nobr>
</form>	</form>
<br /><form action="/adm/coursedocs" method="post" name="supnewext">	<br /><form action="/adm/coursedocs" method="post" name="supnewext">
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />	<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail" value="" />	<input type="hidden" name="importdetail" value="" />
<nobr>	<nobr>
<input name="newext" type="button"	<input name="newext" type="button"
Line 2979 value="$lt{'extr'}" /> $help{'Adding_Ext	Line 3028 value="$lt{'extr'}" /> $help{'Adding_Ext
</nobr>	</nobr>
</form>	</form>
<br /><form action="/adm/coursedocs" method="post" name="supnewsyl">	<br /><form action="/adm/coursedocs" method="post" name="supnewsyl">
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />	<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail"	<input type="hidden" name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus" />	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
<nobr>	<nobr>
Line 2988 $help{'Syllabus'}	Line 3037 $help{'Syllabus'}
</nobr>	</nobr>
</form>	</form>
<br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">	<br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />	<input type="hidden" name="folderpath" value="$path" />
<input type="hidden" name="importdetail"	<input type="hidden" name="importdetail"
value="$plainname=/adm/$udom/$uname/aboutme" />	value="$plainname=/adm/$udom/$uname/aboutme" />
<nobr>	<nobr>
Line 3130 function finishpick() {	Line 3179 function finishpick() {
function changename(folderpath,index,oldtitle,container,pagesymb) {	function changename(folderpath,index,oldtitle,container,pagesymb) {
var title=prompt('New Title',oldtitle);	var title=prompt('New Title',oldtitle);
if (title) {	if (title) {
	this.document.forms.renameform.markcopy.value=-1;
this.document.forms.renameform.title.value=title;	this.document.forms.renameform.title.value=title;
this.document.forms.renameform.cmd.value='rename_'+index;	this.document.forms.renameform.cmd.value='rename_'+index;
if (container == 'sequence') {	if (container == 'sequence') {
Line 3145 function changename(folderpath,index,old	Line 3195 function changename(folderpath,index,old

function removeres(folderpath,index,oldtitle,container,pagesymb) {	function removeres(folderpath,index,oldtitle,container,pagesymb) {
if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {	if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
	this.document.forms.renameform.markcopy.value=-1;
this.document.forms.renameform.cmd.value='del_'+index;	this.document.forms.renameform.cmd.value='del_'+index;
if (container == 'sequence') {	if (container == 'sequence') {
this.document.forms.renameform.folderpath.value=folderpath;	this.document.forms.renameform.folderpath.value=folderpath;
Line 3157 function removeres(folderpath,index,oldt	Line 3208 function removeres(folderpath,index,oldt
}	}
}	}

function cutres(folderpath,index,oldtitle,container,pagesymb) {	function cutres(folderpath,index,oldtitle,container,pagesymb,folder) {
if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {	if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
this.document.forms.renameform.cmd.value='cut_'+index;	this.document.forms.renameform.cmd.value='cut_'+index;
this.document.forms.renameform.markcopy.value=index;	this.document.forms.renameform.markcopy.value=index;
	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
if (container == 'sequence') {	if (container == 'sequence') {
this.document.forms.renameform.folderpath.value=folderpath;	this.document.forms.renameform.folderpath.value=folderpath;
}	}
Line 3172 function cutres(folderpath,index,oldtitl	Line 3224 function cutres(folderpath,index,oldtitl
}	}
}	}

function markcopy(folderpath,index,oldtitle,container,pagesymb) {	function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
this.document.forms.renameform.markcopy.value=index;	this.document.forms.renameform.markcopy.value=index;
	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
if (container == 'sequence') {	if (container == 'sequence') {
this.document.forms.renameform.folderpath.value=folderpath;	this.document.forms.renameform.folderpath.value=folderpath;
}	}

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

Removed from v.1.280
changed lines
	Added in v.1.283