[LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm

[goltermann]

goltermann		Thu May 10 11:56:06 2012 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm 
  Log:
  discussion/feedback
  - put quoted message in a pick box
  - changed order of buttons, "add attachment" button is now below already attached files
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.353 loncom/interface/lonfeedback.pm:1.354
--- loncom/interface/lonfeedback.pm:1.353	Sun Apr 29 22:55:20 2012
+++ loncom/interface/lonfeedback.pm	Thu May 10 11:56:06 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.353 2012/04/29 22:55:20 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.354 2012/05/10 11:56:06 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1935,7 +1935,11 @@
       unless (&contains_block_html($quote)) {
           &newline_to_br(\$quote);
       }
-      $quote='<blockquote>'.&Apache::lontexconvert::msgtexconverted($quote).'</blockquote>';
+        $quote=&Apache::lonhtmlcommon::start_pick_box().
+               &Apache::lonhtmlcommon::row_title(&mt('Quote')).
+               &Apache::lontexconvert::msgtexconverted($quote).
+               &Apache::lonhtmlcommon::row_closure(1).
+               &Apache::lonhtmlcommon::end_pick_box();
   }
   my $header='';
   unless ($env{'form.modal'}) {
@@ -1963,18 +1967,21 @@
   }
   $r->print(<<END);
 $options
+<br>
+END
+$r->print(&Apache::lonhtmlcommon::start_pick_box());
+$r->print(<<END);
 $quote
 <p>
 $textareaheader
 </p>
-<br>
 <p>
 $latexHelp
 </p>
 <p>
 END
 
-    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject')));
     $r->print('<input type="text" name="subject" size="30" value="'.
               $subject.'" /></p>');
@@ -2018,10 +2025,8 @@
         $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
     }
     $r->print(<<END);
-<p>
 <input type="hidden" name="sendit" value="1" />
 <input type="button" value="$send" onclick='gosubmit();' />
-</p>
 </form>
 END
     if ($env{'form.editdisc'} || $env{'form.replydisc'}) {
@@ -2036,7 +2041,6 @@
             $attachnum += @currnewattach;
         }
         my $blockblog = &Apache::loncommon::blocking_status('blogs');
-        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
         if ($attachnum > 0) {
             if (@currnewattach > 0) {
                 $newattachmsg .= '<br /><b>'.&mt('New attachments').'</b><br />';
@@ -2056,9 +2060,10 @@
                 $r->print("<br /><b>$lt{'reta'}</b>:$attachmsg<br />\n");
             }
             if ($newattachmsg) {
-                $r->print("$newattachmsg<br />");
+                $r->print("$newattachmsg");
             }
         }
+        $r->print(&generate_attachments_button($postidx,$attachnum,$ressymb,$now,\@currnewattach,\@currdelold,$numoldver,'',$blockblog));
     }
     $r->print(&generate_preview_button().
 	      &Apache::loncommon::end_page());
@@ -3486,7 +3491,7 @@
 $start_page
 $toolarge
 <form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
- <br />
+
  <h1>$lt{'clic'}</h1>
 END
     $r->print(&Apache::lonhtmlcommon::start_pick_box());