version 1.47, 2011/11/14 00:20:31
|
version 1.48, 2011/12/23 17:21:18
|
Line 118 sub phaseone {
|
Line 118 sub phaseone {
|
my ($main,$suffix,$is_meta) = &get_file_info($fn); |
my ($main,$suffix,$is_meta) = &get_file_info($fn); |
|
|
if (-e $resfn) { |
if (-e $resfn) { |
$r->print('<form action="/adm/retrieve" method="post">'. |
$r->print('<form action="/adm/retrieve?inhibitmenu=yes" method="post">'. |
'<input type="hidden" name="filename" value="/priv/'.$udom.'/'.$uname.$fn.'" />'. |
'<input type="hidden" name="filename" value="/priv/'.$udom.'/'.$uname.$fn.'" />'. |
'<input type="hidden" name="phase" value="two" />'. |
'<input type="hidden" name="phase" value="two" />'. |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
Line 154 sub phaseone {
|
Line 154 sub phaseone {
|
'<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>'); |
'<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>'); |
|
|
if (!$is_meta) { |
if (!$is_meta) { |
$r->print('<td><a href="'.$urldir.$filename.'.meta" target="cat">'. |
$r->print('<td>'. |
&mt('Metadata Version').' '.$version.'</a></td>'); |
&Apache::loncommon::modal_link($urldir.$filename.'.meta', |
|
&mt('Metadata Version [_1]',$version),550,450).'</td>'); |
} |
} |
if ($is_meta |
if ($is_meta |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
$r->print( |
$r->print('<td>'. |
'<td><a target="cat" href="/adm/diff?filename=/priv/'. |
&Apache::loncommon::modal_link( |
$udom,'/'.$uname.$fn. |
'/adm/diff?filename=/priv/'.$udom,'/'.$uname.$fn. |
'&versiontwo=priv&versionone='.$version. |
'&versiontwo=priv&versionone='.$version, |
'">'.&mt('Diffs with Version').' '.$version. |
&mt('Diffs with Version [_1]',$version),550,450). |
'</a></td>'); |
'</td>'); |
} |
} |
$r->print(&Apache::loncommon::end_data_table_row()); |
$r->print(&Apache::loncommon::end_data_table_row()); |
} |
} |
Line 177 sub phaseone {
|
Line 178 sub phaseone {
|
'<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>' |
'<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>' |
); |
); |
if (!$is_meta) { |
if (!$is_meta) { |
$r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target="cat">'. |
$r->print('<td>', |
&mt('Metadata current version').'</a></td>'); |
&Apache::loncommon::modal_link($urldir.$main.'.'.$suffix.'.meta', |
|
&mt('Metadata current version'),550,450).'</td>'); |
} |
} |
if ($is_meta |
if ($is_meta |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') { |
$r->print( |
$r->print('<td>'. |
'<td><a target="cat" href="/adm/diff?filename=/priv/'. |
&Apache::loncommon::modal_link( |
|
'/adm/diff?filename=/priv/'. |
$udom.'/'.$uname.$fn. |
$udom.'/'.$uname.$fn. |
'&versiontwo=priv'. |
'&versiontwo=priv', |
'">'.&mt('Diffs with current Version').'</a></td>'); |
&mt('Diffs with current Version'),550,450). |
|
'</td>'); |
} |
} |
$r->print(&Apache::loncommon::end_data_table_row(). |
$r->print(&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table(). |
&Apache::loncommon::end_data_table(). |
Line 202 sub phaseone {
|
Line 206 sub phaseone {
|
$r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>'); |
$r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>'); |
} |
} |
|
|
my $dir = &Apache::loncommon::authorspace($fn) |
|
.&File::Basename::dirname($fn) |
|
.'/'; |
|
$r->print('<br />' |
|
.&Apache::loncommon::head_subbox( |
|
&Apache::lonhtmlcommon::start_funclist() |
|
.&Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="/priv/'.$udom.'/'.$uname.$fn.'">' |
|
.&mt('Back to Resource') |
|
.'</a>') |
|
.&Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="'.$dir.'">' |
|
.&mt('Back to Directory') |
|
.'</a>') |
|
.&Apache::lonhtmlcommon::end_funclist() |
|
) |
|
); |
|
} |
} |
|
|
# ---------------------------------- Interface for presenting specified version |
# ---------------------------------- Interface for presenting specified version |
Line 259 sub phasetwo {
|
Line 246 sub phasetwo {
|
.&mt('ok') |
.&mt('ok') |
.'</span>'); |
.'</span>'); |
print $logfile "Copied sucessfully.\n\n"; |
print $logfile "Copied sucessfully.\n\n"; |
|
$r->print(&Apache::lonhtmlcommon::scripttag('parent.location.reload();')); |
} else { |
} else { |
my $error=$!; |
my $error=$!; |
$r->print('<span class="LC_error">' |
$r->print('<span class="LC_error">' |
Line 266 sub phasetwo {
|
Line 254 sub phasetwo {
|
.'</span>'); |
.'</span>'); |
print $logfile "Copy failed: $error\n\n"; |
print $logfile "Copy failed: $error\n\n"; |
} |
} |
$r->print('</p>' |
|
.'<p><a href="/priv/'.$udom.'/'.$uname.$fn.'">' |
|
.&mt('Back to Resource') |
|
.'</a></p>'); |
|
} else { |
} else { |
$r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>'); |
$r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>'); |
&phaseone($r,$fn,$uname,$udom); |
&phaseone($r,$fn,$uname,$udom); |