--- loncom/interface/lonfeedback.pm	2012/12/19 05:18:31	1.361
+++ loncom/interface/lonfeedback.pm	2013/10/04 03:04:45	1.368
@@ -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.368 2013/10/04 03:04:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -468,18 +468,18 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             my $numhidden = keys(%notshown);
             if ($numhidden > 0) {
                 my $colspan = $maxdepth+1;
-                $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">'.
-                         '<a href="/adm/feedback?allposts=1&amp;symb='.$escsymb;
+                $discussion.="\n".'<tr><td bgcolor="#CCCCCC" colspan="'.$colspan.'">';
+                my $href = '/adm/feedback?allposts=1&amp;symb='.$escsymb;
                 if ($newpostsflag) {
-                    $discussion .= '&amp;previous='.$prevread;
+                    $href .= '&amp;previous='.$prevread;
                 }
-		$discussion .= &group_args($group);
-                $discussion .= '">'.&mt('Show all posts').'</a> '.&mt('to display').' '.
-                         $numhidden.' ';
+		$href .= &group_args($group);
                 if ($showunmark) {
-                    $discussion .= &mt('posts previously marked read');
+                    $discussion .= &mt('[_1]Show all posts[_2] to display [quant,_3,post] previously marked read',
+                                       '<a href="'.$href.'">','</a>',$numhidden);
                 } else {
-                    $discussion .= &mt('previously viewed posts');
+                    $discussion .= &mt('[_1]Show all posts[_2] to display [quant,_3,post] previously viewed',
+                                       '<a href="'.$href.'">','</a>',$numhidden);
                 }
                 $discussion .= '<br/></td></tr>';
             }
@@ -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);
 
@@ -2582,7 +2582,7 @@ sub print_showposters {
     my $table_start =&Apache::loncommon::start_data_table();
     $r->print(<<END);
 $start_page
- <form name="pickpostersform" method="post">
+ <form name="pickpostersform" method="post" action="">
  <br />
     $table_start
       <tr>
@@ -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));
 
@@ -3990,7 +3990,7 @@ sub handler {
           $discinfo{$lastkey} = $env{'form.navtime'};
       }
       my $textline = '<b>'.
-                     &mt('Marked "New" posts as read in a total of [_1] resources/bulletin boards.',
+                     &mt('Marked "New" posts as read in a total of [_1] resources/discussion boards.',
                          $numitems).
                      '</b>';
       if ($numitems > 0) {
@@ -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("<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;