--- loncom/interface/lonparmset.pm 2006/05/09 20:25:06 1.301
+++ loncom/interface/lonparmset.pm 2006/05/15 23:40:54 1.305
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.301 2006/05/09 20:25:06 www Exp $
+# $Id: lonparmset.pm,v 1.305 2006/05/15 23:40:54 albertel 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
@@ -125,6 +126,7 @@ sub parmval_by_symb {
my @outpar=();
# ----------------------------------------------------- Cascading lookup scheme
my $map=(&Apache::lonnet::decode_symb($symb))[0];
+ $map = &Apache::lonnet::deversion($map);
my $symbparm=$symb.'.'.$what;
my $mapparm=$map.'___(all).'.$what;
@@ -403,6 +405,8 @@ sub storeparm_by_symb_inner {
# ---------------------------------------------------------- Construct prefixes
$spnam=~s/\_([^\_]+)$/\.$1/;
my $map=(&Apache::lonnet::decode_symb($symb))[0];
+ $map = &Apache::lonnet::deversion($map);
+
my $symbparm=$symb.'.'.$spnam;
my $mapparm=$map.'___(all).'.$spnam;
@@ -2073,7 +2077,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 +3309,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 {
@@ -3379,7 +3386,7 @@ 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($row_start); } else { $makenewrow=1; }
@@ -3409,10 +3416,17 @@ 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('