--- loncom/interface/lonfeedback.pm 2012/12/19 05:18:31 1.361
+++ loncom/interface/lonfeedback.pm 2013/01/18 13:22:26 1.364
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.361 2012/12/19 05:18:31 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.364 2013/01/18 13:22:26 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1952,7 +1952,7 @@ END
my %onload = ('onload' => 'window.focus();setposttype();');
my %parms=('add_entries' => \%onload);
- if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+ if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
my $start_page=
&Apache::loncommon::start_page('Resource Feedback and Discussion',$js,\%parms);
@@ -3490,7 +3490,7 @@ END
my $brcrum = [{'href' => '',
'text' => 'Discussion Post Attachments'}];
my %parms=('only_body' => 1);
- if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+ if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
my $start_page =
&Apache::loncommon::start_page('Discussion Post Attachments',$js,\%parms);
@@ -3908,7 +3908,7 @@ sub handler {
'text' => 'Discussion Post Versions'}];
my %parms=();
- if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
+ if ($env{'form.modal'} ne 'yes') { $parms{'bread_crumbs'} = $brcrum; }
$r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,\%parms));
@@ -4423,6 +4423,7 @@ ENDREDIR
$cdom,$cnum);
$contrib{'deleted'} =~ s/^\.//;
$contrib{'deleted'} =~ s/\.$//;
+ my $confirm_msg = '';
if ($contrib{'deleted'} ne '') {
if (&Apache::lonnet::store({'deleted' => ''},$symb,$env{'request.course.id'},
$cdom,$cnum) eq 'ok') {
@@ -4450,14 +4451,19 @@ ENDREDIR
$uname,$udom,$env{'request.course.id'},
'undelete');
}
- $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries")));
+ $confirm_msg .= &Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries"));
} else {
- $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1));
+ $confirm_msg .= &Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1);
}
} else {
- $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1));
+ $confirm_msg .= &Apache::lonhtmlcommon::confirm_success(&mt("No entries to undelete"),1);
}
- $r->print("
".&mt("Return and reload")."");
+ $r->print(
+ '
'
+ .&Apache::loncommon::confirmwrapper($confirm_msg)
+ .&Apache::lonhtmlcommon::actionbox(
+ ["".&mt("Return and reload").""])
+ );
}
$r->print(&Apache::loncommon::end_page());
return OK;