--- loncom/publisher/londiff.pm 2011/10/30 14:59:57 1.32 +++ loncom/publisher/londiff.pm 2012/04/18 20:14:35 1.35 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.32 2011/10/30 14:59:57 raeburn Exp $ +# $Id: londiff.pm,v 1.35 2012/04/18 20:14:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -141,15 +141,19 @@ sub handler { ' '.$efn.''); if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { - $r->print('
' - .&mt('Co-Author [_1]' - ,&Apache::loncommon::plainname($cuname,$cudom) - .' ('.$cuname.':'.$cudom.')') - .'
' - ); + my $nameshown = &Apache::loncommon::plainname($cuname,$cudom). + ' ('.$cuname.':'.$cudom.')'; + $r->print(''); + if ($env{'request.role'} =~ /^ca\./) { + $r->print(&mt('Co-Author in Construction Space for: [_1]',$nameshown)); + } elsif ($env{'request.role'} =~ /^aa\./) { + $r->print(&mt('Assistant Author in Construction Space for: [_1]',$nameshown)); + } else { + $r->print(&mt('Resource Author is: [_1]',$nameshown)); + } + $r->print('
'); } - if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' || $efn =~ /\.meta$/) { $r->print('');
@@ -187,8 +191,7 @@ sub handler {
@f2=&get_split_file($fn,'local');
$r->print(''.&mt('Construction Space Version').'');
} else {
- my $fn=
- '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
+ my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname/";
if ($env{'form.versiontwo'}) {
my ($main,$suffix,$is_meta)=
&Apache::lonretrieve::get_file_info($efn);
@@ -230,7 +233,6 @@ sub handler {
} else {
$r->print(''.&mt('Binary File').'
');
}
- $r->print('