--- loncom/interface/lonfeedback.pm	2012/06/22 20:33:15	1.358
+++ 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.358 2012/06/22 20:33:15 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);
 
@@ -2698,7 +2698,7 @@ sub fail_redirect {
 					    'only_body' => 1,}));
   $r->print(<<ENDFAILREDIR);
 <img align="right" src="$logo" />
-<b>$lt{'sorr'}</b>
+<p class="LC_warning">$lt{'sorr'}</p>
 ENDFAILREDIR
   $r->print(&Apache::loncommon::end_page());
 }
@@ -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));
 
@@ -3981,8 +3981,6 @@ sub handler {
       my $feedurl = '/adm/navmaps';
       if ($env{'form.navurl'}) { $feedurl .= '?'.$env{'form.navurl'}; }
       my %lt = &Apache::lonlocal::texthash(
-          'mnpa' => 'Marked "New" posts as read in a total of',
-          'robb' => 'resources/bulletin boards.',
           'twnp' => 'There are currently no resources or discussion boards with unread discussion postings.'
       );       
       foreach my $res (@resources) {
@@ -3991,7 +3989,10 @@ sub handler {
           my $lastkey = $ressymb.'_lastread';
           $discinfo{$lastkey} = $env{'form.navtime'};
       }
-      my $textline = "<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>";
+      my $textline = '<b>'.
+                     &mt('Marked "New" posts as read in a total of [_1] resources/bulletin boards.',
+                         $numitems).
+                     '</b>';
       if ($numitems > 0) {
           &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',
 			     \%discinfo,$env{'user.domain'},$env{'user.name'});
@@ -4422,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') {
@@ -4449,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("<br /><a href='$feedurl'>".&mt("Return and reload")."</a>");
+          $r->print(
+              '<br />'
+             .&Apache::loncommon::confirmwrapper($confirm_msg)
+             .&Apache::lonhtmlcommon::actionbox(
+                  ["<a href='$feedurl'>".&mt("Return and reload")."</a>"])
+          );
       }
       $r->print(&Apache::loncommon::end_page());
       return OK;