--- loncom/interface/lonfeedback.pm	2012/03/07 00:02:10	1.337
+++ loncom/interface/lonfeedback.pm	2012/03/15 12:45:21	1.340
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.337 2012/03/07 00:02:10 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.340 2012/03/15 12:45:21 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1071,7 +1071,7 @@ sub build_posting_display {
                 my %subjects = ();
                 my %attachtxt = ();
                 my %allattachments = ();
-                my ($screenname,$plainname,$showaboutme);
+                my ($screenname,$plainname);
                 my $sender = &mt('Anonymous');
 # Anonymous users getting number within a discussion
 # Since idx is in static order, this should give the same sequence every time. 
@@ -1081,7 +1081,7 @@ sub build_posting_display {
 		    $$anonhash{$key}=&mt('Anonymous').' '.$anoncnt;
 		}
                 my ($message,$subject,$vgrlink,$ctlink);
-                &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,\$showaboutme,$numoldver);
+                &get_post_contents(\%contrib,$idx,$seeid,$outputtarget,\%messages,\%subjects,\%allattachments,\%attachtxt,$imsfiles,\$screenname,\$plainname,$numoldver);
 
 
 # Set up for sorting by subject
@@ -1111,18 +1111,12 @@ sub build_posting_display {
                             }
                         }
 		        if (!$contrib{$idx.':anonymous'} || $see_anonymous) {
-                            if ($showaboutme) {
-                                $sender = &Apache::loncommon::aboutmewrapper(
-                                              $plainname,
-                                              $contrib{$idx.':sendername'},
-                                              $contrib{$idx.':senderdomain'});
-                            } else {
-                                $sender = $plainname;
-                            }
-                            if ($see_anonymous) {
-                                $sender .= ' ('.$contrib{$idx.':sendername'}.':'.
-					   $contrib{$idx.':senderdomain'}.')';
-                            }
+			    $sender=&Apache::loncommon::aboutmewrapper(
+					 $plainname,
+					 $contrib{$idx.':sendername'},
+					 $contrib{$idx.':senderdomain'}).' ('.
+					 $contrib{$idx.':sendername'}.':'.
+					 $contrib{$idx.':senderdomain'}.')';
                             $sender = '<b>'.$sender.'</b>';
 			    if ($contrib{$idx.':anonymous'}) {
 			        $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
@@ -1374,7 +1368,7 @@ sub build_posting_display {
                                 $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsup_gray.png" alt="'.&mt('You like this posting').'" />';
                             }
                             unless ($likes{$symb.':'.$idx.':unlikers'}=~/\,\Q$thisuser\E\,/) {
-                                $$discussionitems[$idx].='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />','unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
+                                $$discussionitems[$idx].='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />',,'unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
                             } else {
                                 $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsdown_gray.png" alt="'.&mt('You unlike this posting').'" />';
                             }
@@ -1474,7 +1468,7 @@ sub filter_regexp {
 
 
 sub get_post_contents {
-    my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$showaboutme,$numver) = @_;
+    my ($contrib,$idx,$seeid,$type,$messages,$subjects,$allattachments,$attachtxt,$imsfiles,$screenname,$plainname,$numver) = @_;
     my $discussion = '';
     my $start=$numver;
     my $end=$numver + 1;
@@ -1492,20 +1486,13 @@ sub get_post_contents {
                                         $$contrib{$idx.':sendername'},
                                         $$contrib{$idx.':senderdomain'});
     $$screenname=$$contrib{$idx.':screenname'};
-    $$showaboutme = &Apache::lonnet::usertools_access($$contrib{$idx.':sendername'},
-                                                      $$contrib{$idx.':senderdomain'},
-                                                      'aboutme');
-    my $sender = $$plainname;
-    if ($$showaboutme) {
-        $sender = &Apache::loncommon::aboutmewrapper(
+
+    my $sender=&Apache::loncommon::aboutmewrapper(
                                  $$plainname,
                                  $$contrib{$idx.':sendername'},
-                                 $$contrib{$idx.':senderdomain'});
-    }
-    if ($seeid) {
-        $sender .= ' ('.$$contrib{$idx.':sendername'}.':'.
-                   $$contrib{$idx.':senderdomain'}.')';
-    }
+                                 $$contrib{$idx.':senderdomain'}).' ('.
+                                 $$contrib{$idx.':sendername'}.':'.
+                                 $$contrib{$idx.':senderdomain'}.')';
     my $attachmenturls = $$contrib{$idx.':attachmenturl'};
     my @postversions = ();
     if ($type eq 'allversions' || $type eq 'export') {
@@ -1621,11 +1608,16 @@ sub mail_screen {
   }
 
   my %lt = &Apache::lonlocal::texthash(
-            'myqu' => 'My question/comment/feedback:',
+            'myqu' => 'Question/comment/feedback:',
             'title' => 'Title',
             'reta' => 'Retained attachments',
             'atta' => 'Attachment',
            );
+  if($env{'form.editdisc'} || $env{'form.replydisc'}){
+    %lt = &Apache::lonlocal::texthash(
+            'myqu' => 'Post Discussion',
+    );
+  }
   my $restitle = &get_resource_title($caller_symb,$feedurl);
   my $quote='';
   my $subject = '';
@@ -1836,6 +1828,7 @@ END
   }
   $r->print(<<END);
 $start_page
+<h1>$lt{'myqu'}</h1>
 $header
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
@@ -1856,18 +1849,26 @@ END
   $r->print(<<END);
 $options
 $quote
-<p>$lt{'myqu'}
+<p>
 $textareaheader
 </p>
+<br>
 <p>
 $latexHelp
 </p>
 <p>
-$lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
-<p>
-<textarea name="comment" id="comment" cols="60" rows="10" $textareaclass>$comment
-</textarea></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>');
+$r->print(&Apache::lonhtmlcommon::row_closure());
+$r->print(&Apache::lonhtmlcommon::row_title(&mt('Message')));
+$r->print('<textarea name="comment" id="comment" cols="60" rows="10" $textareaclass>'."$comment".
+'</textarea>');
+$r->print(&Apache::lonhtmlcommon::row_closure(1));
+$r->print(&Apache::lonhtmlcommon::end_pick_box());
+
     if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) {
         if ($env{'form.origpage'}) {
             foreach my $attach (@currnewattach) {
@@ -3347,11 +3348,11 @@ sub modify_attachments {
 
     my %lt = &Apache::lonlocal::texthash(
                'subj' => 'Subject',
-               'thfo' => 'The following attachments were part of the most recent saved version of this posting.',
                'chth' => 'Check the checkboxes for any you wish to remove.',
                'thef' => 'The following attachments have been uploaded for inclusion with this posting.',
-               'adda' => 'Add a new attachment to this post.',
+               'adda' => 'Add a new attachment to this post',
                'stch' => 'Save Changes',
+               'clic' => 'Add/remove attachments',
              );
     my $js = <<END;
 <script type="text/javascript">
@@ -3365,7 +3366,7 @@ END
     # Breadcrumbs
     my $brcrum = [{'href' => '',
                    'text' => 'Discussion Post Attachments'}];
-    my %parms=();
+    my %parms=('only_body' => 1);
     if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
 
     my $start_page = 
@@ -3394,44 +3395,43 @@ $start_page
 $toolarge
 <form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
  <br />
- <table class="LC_data_table">
-  <tr>
-   <td colspan="2">
-    <b>Subject:</b> <b>$subject</b><br /><br />
+ <h1>$lt{'clic'}</h1>
 END
-    if ($idx) {
-        if ($attachmenturls) {
-            my @currold = keys(%currattach);
-            if (@currold > 0) {
-                $r->print($lt{'thfo'}.'<br />'.$lt{'chth'}.'<br />'."\n");  
-                foreach my $id (@currold) {
-                    my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); 
-                    $attachurl =~ m#/([^/]+)$#;
-                    $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject')));
+    $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);
+
+    if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Attachments')));
+        if ($idx) {
+            if ($attachmenturls) {
+                my @currold = keys(%currattach);
+                if (@currold > 0) {
+                    $r->print($lt{'thfo'}.'<br />'.$lt{'chth'}.'<br />'."\n");  
+                    foreach my $id (@currold) {
+                        my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); 
+                        $attachurl =~ m#/([^/]+)$#;
+                        $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
+                    }
+                    $r->print("<br />");
                 }
-                $r->print("<br />");
             }
         }
-    }
-    if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
-        $r->print($lt{'thef'}.'<br />'.$lt{'chth'}.'<br />'."\n");
-        foreach my $attach (@{$currnewattach}) {
-            $attach =~ m#/([^/]+)$#;
-            $r->print('<label><input type="checkbox" name="delnewattach" value="'.$attach.'" />&nbsp;'.$1.'</label><br />'."\n");
+        if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+            $r->print($lt{'chth'}.'<br />'."\n");
+            foreach my $attach (@{$currnewattach}) {
+                $attach =~ m#/([^/]+)$#;
+                $r->print('<label><input type="checkbox" name="delnewattach" value="'.$attach.'" />&nbsp;'.$1.'</label><br />'."\n");
+            }
         }
-        $r->print("<br />"); 
     }
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print(<<END);
-   </td></tr>
-   <tr>
-    <td>
-   $lt{'adda'}</td><td><input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" />    
-   </td>
-  </tr>
-  <tr>
-   <td colspan="2">$attachmaxtext</td>
-  </tr>
- </table>
 <input type="hidden" name="subject" value="$env{'form.subject'}" />
 <input type="hidden" name="comment" value="$env{'form.comment'}" />
 <input type="hidden" name="timestamp" value="$env{'form.timestamp'}" />
@@ -3487,6 +3487,7 @@ sub generate_attachments_button {
     my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,
         $numoldver,$mode,$blockblog) = @_;
     my $origpage = $ENV{'REQUEST_URI'};
+    my $att=$attachnum.' '.&mt("attachments");
     my %lt = &Apache::lonlocal::texthash(
                 'clic' => 'Add/remove attachments',
     ); 
@@ -3811,11 +3812,11 @@ sub handler {
           my %attachmsgs = ();
           my %allattachments = ();
           my %imsfiles = ();
-          my ($screenname,$plainname,$showaboutme);
+          my ($screenname,$plainname);
           my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
                            $env{'course.'.$env{'request.course.id'}.'.domain'},
                            $env{'course.'.$env{'request.course.id'}.'.num'});
-          $r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname,\$showaboutme));
+          $r->print(&get_post_contents(\%contrib,$idx,$seeid,'allversions',\%messages,\%subjects,\%allattachments,\%attachmsgs,\%imsfiles,\$screenname,\$plainname));
       }
       $r->print(&Apache::loncommon::end_page());
       return OK;