--- loncom/interface/lonfeedback.pm	2014/02/11 18:04:47	1.369
+++ loncom/interface/lonfeedback.pm	2015/09/30 21:04:04	1.371
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.369 2014/02/11 18:04:47 bisitz Exp $
+# $Id: lonfeedback.pm,v 1.371 2015/09/30 21:04:04 musolffc 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 = "&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
                }
            }
@@ -1500,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;'.
@@ -1900,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">
 //<!--
@@ -1937,6 +1942,7 @@ END
     $anonscript
 //-->
 </script>
+<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 END
 
   my ($textareaheader,$textareaclass);
@@ -2044,7 +2050,8 @@ END
     } else {
         $r->print(<<END);
 <p>
-$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" />
+$lt{'atta'} $attachmaxtext: <input type="file" name="attachment" class="flUpload" />
+<input type="hidden" id="free_space" value="131072" />
 </p>
 END
     }
@@ -2133,6 +2140,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'};
@@ -2226,7 +2238,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 {
@@ -3488,6 +3500,7 @@ sub modify_attachments {
    document.modattachments.submit();
  }
 </script> 
+<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 END
 
     # Breadcrumbs
@@ -3529,7 +3542,10 @@ END
     $r->print('<b>'.$subject.'</b>');
     $r->print(&Apache::lonhtmlcommon::row_closure());
     $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'}));
-    $r->print('<input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" />  '.$attachmaxtext);
+    $r->print('<input type="file" name="addnewattach" class="flUpload" />'
+        .'<input type="hidden" id="free_space" value="131072" />'
+        .'<input type="button" name="upload" value="Upload" '
+        .'onclick="this.form.submit()" />  '.$attachmaxtext);
     if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){
         $r->print(&Apache::lonhtmlcommon::row_closure());
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Attachments')));