--- loncom/interface/lonparmset.pm 2006/05/09 15:09:27 1.300
+++ loncom/interface/lonparmset.pm 2006/05/11 19:04:31 1.304
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.300 2006/05/09 15:09:27 albertel Exp $
+# $Id: lonparmset.pm,v 1.304 2006/05/11 19:04:31 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -63,6 +63,7 @@ use Apache::lonhomework;
use Apache::lonxml;
use Apache::lonlocal;
use Apache::lonnavmaps;
+use Apache::lonrss;
# --- Caches local to lonparmset
@@ -2073,7 +2074,7 @@ sub crsenv {
}
# ------------------------- Re-init course environment entries for this session
- &Apache::lonnet::coursedescription($env{'request.course.id'}
+ &Apache::lonnet::coursedescription($env{'request.course.id'},
{'freshen_cache' => 1});
# -------------------------------------------------------- Get parameters again
@@ -3305,15 +3306,18 @@ sub components {
$issection='';
}
my $realm=''.&mt('All Resources').'';
+ my $realmdescription=&mt('all resources');
if ($middle=~/^(.+)\_\_\_\(all\)$/) {
$realm=''.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).'
('.$1.')';
- } elsif ($middle) {
+ $realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
+ } elsif ($middle) {
my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
$realm=''.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).'
('.$url.' in '.$map.' id: '.$id.')';
+ $realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
}
my $what=$part.'.'.$name;
return ($realm,$section,$name,$part,$typeflag,
- $what,$middle,$uname,$udom,$issection);
+ $what,$middle,$uname,$udom,$issection,$realmdescription);
}
sub standard_parameter_names {
@@ -3341,12 +3345,15 @@ sub parm_change_log {
my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
+ if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
+
my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
$env{'course.'.$env{'request.course.id'}.'.domain'});
- $r->print('
'.&mt('Time').' | '.&mt('User').' | '.&mt('Extent').' | '.&mt('Users').' | '. + &mt('Parameter').' | '.&mt('Part').' | '.&mt('New Value').' | '.&mt('Announce').' | '. + &Apache::loncommon::end_data_table_header_row()); foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) { - if ($bgcolor eq '#EEEEEE') { $bgcolor='#FFFFCC'; } else { $bgcolor='#EEEEEE'; } my @changes=keys(%{$parmlog{$id}{'logentry'}}); my $count=$#changes+1; my $time = @@ -3366,7 +3373,8 @@ sub parm_change_log { $parmlog{$id}{'exe_uname'}, $parmlog{$id}{'exe_udom'}); } - $r->print('||
---|---|---|---|---|---|---|---|---|---|
'.$time.' | + my $row_start=&Apache::loncommon::start_data_table_row(); + $r->print($row_start.''.$time.' | '.$about_me_link.
' '.$parmlog{$id}{'exe_uname'}. ':'.$parmlog{$id}{'exe_udom'}.''. @@ -3375,10 +3383,10 @@ sub parm_change_log { my %istype=(); foreach my $changed (reverse(sort(@changes))) { my $value=$parmlog{$id}{'logentry'}->{$changed}; - my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection)= + my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection,$realmdescription)= &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'}); if ($typeflag) { $istype{$parmname}=$value; } - if ($makenewrow) { $r->print(' | |||||||
'.$realm.' | '.$section.' | '. &standard_parameter_names($parmname).' | '. ($part?&mt('Part: [_1]',$part):&mt('All Parts')).' | '); @@ -3405,18 +3413,25 @@ sub parm_change_log { } $r->print(' | '); if ($stillactive) { + my $title=&mt('Changed [_1]',&standard_parameter_names($parmname)); + my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription, + (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value)); if (($uname) && ($udom)) { - $r->print('Notify Link | '); + $r->print(''. + &Apache::loncommon::messagewrapper('Notify User',$uname,$udom,$title,$description). + ' | '); } else { - $r->print('Blog Link | '); + $r->print(''. + &Apache::lonrss::course_blog_link($id,$title,$description). + ' | '); } } else { $r->print(''); } - $r->print(' |