--- loncom/interface/lonfeedback.pm	2013/01/18 13:22:26	1.364
+++ loncom/interface/lonfeedback.pm	2015/06/09 21:22:56	1.370
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.364 2013/01/18 13:22:26 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.370 2015/06/09 21:22:56 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -336,12 +336,15 @@ sub list_discussion {
         'aner' => 'An error occurred opening the manifest file.',
         'difo' => 'Discussion for',
         'aerr' => 'An error occurred opening the export file for posting',
+        'discussions' => 'DISCUSSIONS'
+    );
+    my %js_lt = &Apache::lonlocal::texthash(
         'aysu' => 'Are you sure you want to delete this post?',
         'dpwn' => 'Deleted posts will no longer be visible to you and other students',
         'bwco' => 'but will continue to be visible to your instructor',
         'depo' => 'Deleted posts will no longer be visible to you or anyone else.',
-        'discussions' => 'DISCUSSIONS'
     );
+    &js_escape(\%js_lt);
 
     my $currdisp = $lt{'allposts'};
     my $currmark = $lt{'onmark'};
@@ -447,12 +450,12 @@ imscp_v1p1.xsd http://www.imsglobal.org/
            prevparm = "&amp;previous="+previous
        }
        if (caller == 'studentdelete') {
-           if (confirm("$lt{'aysu'}\\n$lt{'dpwn'},\\n$lt{'bwco'}")) {
+           if (confirm("$js_lt{'aysu'}\\n$js_lt{'dpwn'},\\n$js_lt{'bwco'}")) {
                document.location.href = "/adm/feedback?hide="+symbparm+prevparm+groupparm
            }
        } else {
            if (caller == 'seeiddelete') {
-               if (confirm("$lt{'aysu'}\\n$lt{'depo'}")) {
+               if (confirm("$js_lt{'aysu'}\\n$js_lt{'depo'}")) {
                    document.location.href = "/adm/feedback?deldisc="+symbparm+prevparm+groupparm
                }
            }
@@ -468,18 +471,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>';
             }
@@ -562,7 +565,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                     my $postingfile;
                     my $postingfilename = $tempexport.'/'.$postfilename;
                     if ($postingfile = Apache::File->new('>'.$postingfilename)) {
-                        print $postingfile '<html><head><title>Discussion Post</title></head><body>'.
+                        print $postingfile '<html><head><title>'.&mt('Discussion Post').'</title></head><body>'.
                                            $imsitems{$alldiscussion{$post}}{'title'}.' '.
                                            $imsitems{$alldiscussion{$post}}{'sender'}.
                                            $imsitems{$alldiscussion{$post}}{'timestamp'}.'<br /><br />'.
@@ -702,13 +705,17 @@ END
                     open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                     close(OUTPUT);
                     chdir $cwd;
-                    $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive','<a href="'.$imszipfile.'">').'</a><br />';
+                    $discussion .= &mt('Download the zip file from [_1]Discussion Posting Archive[_2]',
+                                           '<a href="'.$imszipfile.'">','</a>').'<br />';
                     if ($copyresult) {
-                        $discussion .= &mt('The following errors occurred during export').' - <br />'.$copyresult;
+                        $discussion .= '<span class="LC_error">'.
+                                       &mt('The following errors occurred during export:').
+                                       '</span><br />'.$copyresult;
                     }
                 }
             } else {
-                $discussion .= '<br />'.&mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.').'<br />';
+                $discussion .= '<p class="LC_error">'.
+                               &mt('Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.').'</p>';
             }
             return $discussion;
         }
@@ -1496,6 +1503,7 @@ sub build_posting_display {
                                     } else {
                                         $novote = &mt('No voting for hidden posts.');
                                     }
+                                    &html_escape(\$novote);
                                     $$discussionitems[$idx].=
                                         '<a href="javascript:alert('."'$novote'".');" style="text-decoration: none;">'.
                                         '<img border="0" src="/res/adm/pages/thumbsup_novote.png" alt="'.$novote.'" />&nbsp;'.
@@ -1896,6 +1904,7 @@ END
   my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1,($env{'form.modal'}?'popup':0));
   my $send=&mt('Send');
   my $alert = &mt('Please select a feedback type.');
+  &js_escape(\$alert);
   my $js= <<END;
 <script type="text/javascript">
 //<!--
@@ -2129,6 +2138,11 @@ sub print_display_options {
         'yhni' => 'You have not indicated that you wish to change any of the discussion settings',
         'ywbr' => 'You will be returned to the previous page if you click OK.'
     );
+    my %js_lt = &Apache::lonlocal::texthash(
+        'yhni' => 'You have not indicated that you wish to change any of the discussion settings',
+        'ywbr' => 'You will be returned to the previous page if you click OK.'
+    );
+    &js_escape(\%js_lt);
 
     my $dispchangeA = $lt{'unread'};
     my $dispchangeB = $lt{'unmark'};
@@ -2222,7 +2236,7 @@ function setDisp() {
     if (chktotal > 0) { 
         document.modifydisp.submit()
     } else {
-        if(confirm("$lt{'yhni'}. \\n$lt{'ywbr'}"))      {
+        if(confirm("$js_lt{'yhni'}. \\n$js_lt{'ywbr'}"))      {
             if (prev > 0) {
                 location.href = "$feedurl?previous=$previous"
             } else {
@@ -2582,7 +2596,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>
@@ -3990,7 +4004,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,7 +4437,7 @@ ENDREDIR
                                                 $cdom,$cnum);
           $contrib{'deleted'} =~ s/^\.//;
           $contrib{'deleted'} =~ s/\.$//;
-          my $confirm_msg = '';
+          my $confirm_msg;
           if ($contrib{'deleted'} ne '') {
               if (&Apache::lonnet::store({'deleted' => ''},$symb,$env{'request.course.id'},
                                           $cdom,$cnum) eq 'ok') {
@@ -4451,12 +4465,12 @@ ENDREDIR
                                             $uname,$udom,$env{'request.course.id'},
                                             'undelete');
                   }
-                  $confirm_msg .= &Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries"));
+                  $confirm_msg = &Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries"));
               } else {
-                  $confirm_msg .= &Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1);
+                  $confirm_msg = &Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1);
               }
           } else {
-              $confirm_msg .= &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 />'
