loncom/publisher/lonpubdir.pm - diff

Return to lonpubdir.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpubdir.pm between versions 1.53 and 1.60

version 1.53, 2004/01/03 15:11:37	version 1.60, 2004/06/07 22:34:12
Line 222 ENDPUBDIRSCRIPT	Line 222 ENDPUBDIRSCRIPT
$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.	$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
'</h3>');	'</h3>');
}	}
$r->print(	my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/';
&Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv').'<br />');	$formaction=~s/\/+/\//g;
	$r->print('<form name="dirs" method="post" action="'.$formaction
	.'" target="_top">'.
	&Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv').
	&Apache::lonhtmlcommon::select_recent('construct','recent',
	'this.form.action=this.form.recent.value;this.form.submit()').
	'</form>');
	&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
}	}

#	#
Line 245 sub getTitleString {	Line 252 sub getTitleString {
return $title;	return $title;
}	}

	sub getCopyRightString {
	my $fullname = shift;
	return &Apache::lonnet::metadata($fullname, 'copyright');
	}
#	#
# Put out a directory table row:	# Put out a directory table row:
# putdirectory(r, base, here, dirname, modtime)	# putdirectory(r, base, here, dirname, modtime)
Line 268 sub putdirectory {	Line 278 sub putdirectory {
($dirname eq '.')) {	($dirname eq '.')) {
my $kaputt=0;	my $kaputt=0;
foreach (keys %{$bombs}) {	foreach (keys %{$bombs}) {
if ($_=~/^$resdir\/$disfilename\//) { $kaputt=1; last; }	if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
}	}
%Apache::lonpublisher::metadatafields=();	%Apache::lonpublisher::metadatafields=();
%Apache::lonpublisher::metadatakeys=();	%Apache::lonpublisher::metadatakeys=();
my $construct=$here;	my $construct=$here;
$construct=~s/^\/priv\/(\w+)$/\/home\/$1\/public_html/;	$construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(	&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
$construct.'/'.$dirname.'/default.meta'	$construct.'/'.$dirname.'/default.meta'
));	));
Line 281 sub putdirectory {	Line 291 sub putdirectory {
'<td><img src="'.	'<td><img src="'.
$Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.	$Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
'<td>'.&mt('Go to ...').'</td>'.	'<td>'.&mt('Go to ...').'</td>'.
'<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.	'<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_top">'.
$disfilename.'</a></td>'.	$disfilename.'</a></font></td>'.
'<td colspan="2">'.($kaputt?'<img src="/adm/lonMisc/bomb.gif" />':'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.	'<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
$Apache::lonpublisher::metadatafields{'subject'}.'</i> '.	$Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
$Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.	$Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.	'<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
Line 302 sub putresource {	Line 312 sub putresource {
my $status=&mt('Unpublished');	my $status=&mt('Unpublished');
my $bgcolor='#FFAA99';	my $bgcolor='#FFAA99';
my $title=' ';	my $title=' ';
	my $publish_button=&mt('Publish');
if (-e $resdir.'/'.$filename) {	if (-e $resdir.'/'.$filename) {
my ($rdev,$rino,$rmode,$rnlink,	my ($rdev,$rino,$rmode,$rnlink,
$ruid,$rgid,$rrdev,$rsize,	$ruid,$rgid,$rrdev,$rsize,
$ratime,$rmtime,$rctime,	$ratime,$rmtime,$rctime,
$rblksize,$rblocks)=stat($resdir.'/'.$filename);	$rblksize,$rblocks)=stat($resdir.'/'.$filename);
	$publish_button=&mt('Re-Publish');
if ($rmtime>=$cmtime) {	if ($rmtime>=$cmtime) {
$status=&mt('Published');	$status=&mt('Published').'<br />'.
$bgcolor='#CCFF88';	&mt(&getCopyRightString($targetdir.'/'.$filename));
	$bgcolor='#CCFF88';
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {	if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
$status=&mt('Obsolete');	$status=&mt('Obsolete');
$bgcolor='#AAAAAA';	$bgcolor='#AAAAAA';
}	}
$title='<a href="/res/'.$targetdir.'/'.$filename.	$title='<a href="/res/'.$targetdir.'/'.$filename.
'.meta" target=cat>'.	'.meta" target=cat>'.
getTitleString($targetdir.'/'.$filename, 'title').'</a>';	&getTitleString($targetdir.'/'.$filename).'</a>';
} else {	} else {
$status=&mt('Modified');	$status=&mt('Modified').'<br />'.
	&mt(&getCopyRightString($targetdir.'/'.$filename));
$bgcolor='#FFFF77';	$bgcolor='#FFFF77';
$title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.	$title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
getTitleString($targetdir.'/'.$filename,'title').'</a>';	&getTitleString($targetdir.'/'.$filename).'</a>';
if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {	if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
$status.='<br><a href="/adm/diff?filename=/~'.$uname.	$status.='<br /><a href="/adm/diff?filename=/~'.$uname.
$thisdisfn.'/'.$filename.	$thisdisfn.'/'.$filename.
'&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';	'&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
}	}
Line 336 sub putresource {	Line 350 sub putresource {
my $editlink='';	my $editlink='';
my $editlink2='';	my $editlink2='';
if ($filename=~/\.(xml\|html\|htm\|xhtml\|xhtm\|sty)$/) {	if ($filename=~/\.(xml\|html\|htm\|xhtml\|xhtm\|sty)$/) {
$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';	$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';
}	}
if ($filename=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library)$/) {	if ($filename=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library)$/) {
$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)';	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)';
$editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';
}	}
if ($filename=~/\.(zip\|tar\|bz2\|gz\|tar.gz\|tar.bz2\|tgz)$/) {	if ($filename=~/\.(zip\|tar\|bz2\|gz\|tar.gz\|tar.bz2\|tgz)$/) {
$editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.	$editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
Line 350 sub putresource {	Line 364 sub putresource {
'<td>'.($filename=~/[\#\~]$/?' ':	'<td>'.($filename=~/[\#\~]$/?' ':
'<img src="'.&Apache::loncommon::icon($filename).'" /></td>').	'<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
'<td><a target="_parent" href="/adm/publish?filename=/~'.	'<td><a target="_parent" href="/adm/publish?filename=/~'.
$uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.	$uname.$thisdisfn.'/'.$filename.'">'.$publish_button.'</a>'.
'</td>'.	'</td>'.
'<td>'.	'<td><font face="arial">'.
'<a href="'.$linkdir.'/'.$filename.'" target="_top">'.	'<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
$filename.'</a>'.$editlink2.$editlink.	$filename.'</a></font>'.$editlink2.$editlink.
'</td>'.	'</td>'.
'<td>'.$title.'</td>'.	'<td>'.$title.'</td>'.
'<td>'.$status.'</td>'.	'<td>'.$status.'</td>'.

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

Removed from v.1.53
changed lines
	Added in v.1.60