--- loncom/interface/slotrequest.pm 2009/10/31 05:39:25 1.105
+++ loncom/interface/slotrequest.pm 2010/10/31 15:32:10 1.109
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.105 2009/10/31 05:39:25 raeburn Exp $
+# $Id: slotrequest.pm,v 1.109 2010/10/31 15:32:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -562,7 +562,11 @@ sub release_reservation {
if ($mgr eq 'F') {
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
} else {
- $msg = &mt('Released Reservation: [_1]',$description);
+ $msg = ''.&mt('Released reservation: [_1]',$description).'
';
+ my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+ my $subject = &mt('Reservation change: [_1]',$description);
+ my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description);
+ $msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'release');
}
return (1,$msg);
}
@@ -629,7 +633,6 @@ sub get_slot {
my $description1=&get_description($slot_name,\%slot);
%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $description2=&get_description($env{'form.slotname'},\%slot);
- $r->print('
'.&mt('Already have a reservation: [_1].',$description1).'
');
if ($slot_name ne $env{'form.slotname'}) {
$r->print(<
@@ -638,19 +641,21 @@ sub get_slot {
STUFF
- $r->print('
'
- .&mt('You can either [_1]Change[_2] your reservation from [_3] to [_4] or'
- ,''
- ,''.$description1.''
- ,''.$description2.'')
- .'
'
- );
+ $r->print('
'.&mt('Reservation currently unchanged').'
'.
+ '
');
+ if ($slot_name ne '') {
+ $r->print(&mt('To complete the transaction you [_1]must[_2] confirm you want the change to [_3] to be processed.'
+ ,'','',''.$description2.'').' '
+ .'
'
+ .&mt('or').'
'.&mt('you will continue with the reservation you already had: [_1]'
+ ,''.$description1.'').'