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.92 and 1.95

version 1.92, 2006/06/22 20:09:41	version 1.95, 2006/09/13 21:43:26
Line 195 sub startpage {	Line 195 sub startpage {

my $formaction='/priv/'.$uname.$thisdisfn.'/';	my $formaction='/priv/'.$uname.$thisdisfn.'/';
$formaction=~s\|/+\|/\|g;	$formaction=~s\|/+\|/\|g;
my $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').	my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring').
'<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font> '.	'<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font> '.
'<form name="dirs" method="post" action="'.$formaction.	'<form name="dirs" method="post" action="'.$formaction.
'" target="_parent"><tt><b>'.	'" target="_parent"><tt><b>'.
Line 364 sub dircontrols {	Line 364 sub dircontrols {
updc => 'Upload a new document'	updc => 'Upload a new document'
);	);
$r->print(<<END);	$r->print(<<END);
<table cellspacing="4" cellpadding="4" width="100%">	<table id="LC_cstr_controls">
<tr>	<tr>
<td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'acti'}</b></font></td>	<th>$lt{'acti'}</th>
<td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'updc'}</b></font></td>	<th>$lt{'updc'}</th>
<td bgcolor="#DDDDDD" align="center"><font face="Arial, Helvetica, sans-serif" size="-1"><b>$lt{'crea'}</b></font></td>	<th>$lt{'crea'}</th>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="#ccddaa" valign="top" align="center">	<td>
<form name="curractions" method="post" action="">	<form name="curractions" method="post" action="">
<select name="dirtask" onchange="currdiract(this.form)">	<select name="dirtask" onchange="currdiract(this.form)">
<option>$lt{'sela'}</option>	<option>$lt{'sela'}</option>
Line 390 sub dircontrols {	Line 390 sub dircontrols {
<input type="hidden" name="postdata" value="" />	<input type="hidden" name="postdata" value="" />
</form>	</form>
</td>	</td>
<td bgcolor="#ccddaa" valign="top" align="center">	<td>
<form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">	<form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />	<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
<input type="file" name="upfile" size="20" />	<input type="file" name="upfile" size="20" />
<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />	<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
</form>	</form>
</td>	</td>
<td bgcolor="#ccddaa" align="center">	<td>
<form name="fileaction" method="post" action="/adm/cfile" target="_parent">	<form name="fileaction" method="post" action="/adm/cfile" target="_parent">
<span style="white-space: nowrap">	<span style="white-space: nowrap">
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />	<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
Line 571 sub putresource {	Line 571 sub putresource {
my $css_class='LC_browser_file';	my $css_class='LC_browser_file';
my $title=' ';	my $title=' ';
my $publish_button=&mt('Publish');	my $publish_button=&mt('Publish');
	my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';
# my $action_buttons=	# my $action_buttons=
# '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.	# '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.
# $uname.'/'.$thisdisfn.'/'.$filename.'">'.	# $uname.'/'.$thisdisfn.'/'.$filename.'">'.
Line 585 sub putresource {	Line 586 sub putresource {
$same=1;	$same=1;
} else {	} else {
if (&Apache::londiff::are_different_files($resdir.'/'.$filename,	if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
'/home/'.$uname.'/public_html/'.$thisdisfn.'/'.$filename)) {	$cstr_dir.'/'.$filename)) {
$same=0;	$same=0;
} else {	} else {
$same=1;	$same=1;
}	}
}	}
	my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
	my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
	my $meta_same = 1;
	if ($meta_rmtime < $meta_cmtime
	&& &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
	$cstr_dir.'/'.$filename.'.meta')) {
	$meta_same = 0;
	}
$publish_button=&mt('Re-publish');	$publish_button=&mt('Re-publish');
	my $rights_status =
	&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
	&mt(&getSourceRightString($targetdir.'/'.$filename));
	$title = '<a href="/res/'.$targetdir.'/'.$filename.
	'.meta" target="cat">'.
	&getTitleString($targetdir.'/'.$filename).'</a>';
	&Apache::lonnet::logthis("same $same meta $meta_same");
if ($same) {	if ($same) {
$pubstatus = 'published';
$status=&mt('Published').'<br />'.
&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
&mt(&getSourceRightString($targetdir.'/'.$filename));
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {	if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
$pubstatus = 'obsolete';	$pubstatus = 'obsolete';
$status=&mt('Obsolete');	$status=&mt('Obsolete');
}	} else {
	if (!$meta_same) {
	$pubstatus = 'metamodified';
	} else {
	$pubstatus = 'published';
	}
	$status=&mt('Published').
	'<br />'. $rights_status;
	}
# } else {	# } else {
# $action_buttons='';	# $action_buttons='';
# }	# }
$title='<a href="/res/'.$targetdir.'/'.$filename.
'.meta" target="cat">'.
&getTitleString($targetdir.'/'.$filename).'</a>';
} else {	} else {
$pubstatus = 'modified';	$pubstatus = 'modified';
$status=&mt('Modified').'<br />'.	$status=&mt('Modified').
&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.	'<br />'. $rights_status;
&mt(&getSourceRightString($targetdir.'/'.$filename));
# $action_buttons='';	# $action_buttons='';
$title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.
&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>';
}	}
}	}

$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.	$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.
($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';	($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';

	if (!$meta_same) {
	$title = &mt('Metadata Modified').'<br />'.$title.
	'<br /><a href="/adm/diff?filename=/~'.$uname.
	$thisdisfn.'/'.$filename.'.meta'.
	'&versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';
	$title.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
	$thisdisfn.'/'.$filename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';
	}
$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.	$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
$thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';	$thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
}	}

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

Removed from v.1.92
changed lines
	Added in v.1.95