--- loncom/publisher/lonretrieve.pm 2008/11/20 18:03:55 1.36 +++ loncom/publisher/lonretrieve.pm 2009/05/14 15:11:00 1.40 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to retrieve an old version of a file # -# $Id: lonretrieve.pm,v 1.36 2008/11/20 18:03:55 bisitz Exp $ +# $Id: lonretrieve.pm,v 1.40 2009/05/14 15:11:00 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -120,7 +120,7 @@ sub phaseone { my ($main,$suffix,$is_meta) = &get_file_info($fn); if (-e $resfn) { - $r->print('
'. + $r->print(''. ''. ''. &Apache::loncommon::start_data_table(). @@ -156,7 +156,7 @@ sub phaseone { localtime($rmtime).''); if (!$is_meta) { - $r->print(''. + $r->print(''. &mt('Metadata Version').' '.$version.''); } if ($is_meta @@ -178,7 +178,7 @@ sub phaseone { ''.&mt('Currently published version').''.localtime($rmtime). ''); if (!$is_meta) { - $r->print(''. + $r->print(''. &mt('Metadata current version').''); } if ($is_meta @@ -198,7 +198,7 @@ sub phaseone { &mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.'). '

'); } - $r->print('
'); + $r->print(''); } else { $r->print('

'.&mt('No previous versions published.').'

'); } @@ -289,7 +289,7 @@ sub handler { if ($env{'form.filename'}) { $fn=$env{'form.filename'}; - $fn=~s/^http\:\/\/[^\/]+//; + $fn=~s/^https?\:\/\/[^\/]+//; } else { $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}. ' unspecified filename for retrieval', $r->filename); @@ -323,16 +323,17 @@ sub handler { $r->print(&Apache::loncommon::start_page('Retrieve Published Resources')); - - $r->print('

' + $r->print('

' .&mt('Retrieve previous versions of [_1]' ,''.$fn.'') - .'

'); + .'

'); if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { - $r->print('

'.&mt('Co-Author').': '.$uname. - &mt(' at ').$udom. - '

'); + $r->print('

' + .&mt('Co-Author [_1]' + ,&Apache::loncommon::plainname($uname,$udom) + .' ('.$uname.':'.$udom.')') + .'

'); }