--- loncom/interface/lonfeedback.pm	2012/01/10 14:52:57	1.333
+++ 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.333 2012/01/10 14:52:57 www Exp $
+# $Id: lonfeedback.pm,v 1.340 2012/03/15 12:45:21 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1155,22 +1155,12 @@ sub build_posting_display {
                                 @{$$namesort{$lastname}{$firstname}} = ("$idx");
                             }
                             if ($outputtarget ne 'tex') {
+# Add karma stars
                                 my $karma=&userkarma($contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'});
                                 for (my $i=1;$i<=$karma;$i++) {
                                     $sender.='<img border="0" src="/res/adm/pages/star.gif" alt="'.&mt('Contributor Kudos').'" />';
                                 }
-                                unless ($likes{$symb.':'.$idx.':likers'}=~/\,\Q$thisuser\E\,/) {
-                                    $sender.='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsup.png" alt="'.&mt('Like').'" />','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
-                                }
-                                unless ($likes{$symb.':'.$idx.':unlikers'}=~/\,\Q$thisuser\E\,/) {
-                                    $sender.='&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"));
-                                }
-                                my $thislikes=$likes{$symb.':'.$idx.':likes'};
-                                if ($thislikes>0) { 
-                                    $sender.='&nbsp;('.&mt("[_1] likes",$thislikes).')';
-                                } elsif ($thislikes<0) {
-                                    $sender.='&nbsp;('.&mt("[_1] unlikes",abs($thislikes)).')';
-                                }
+# Can people edit this?
                                 if (&editing_allowed($escsymb.':::'.$idx,$group)) {
                                     if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
                                         $sender.=' '.
@@ -1366,13 +1356,32 @@ sub build_posting_display {
                             } elsif ($thislikes<$oneminus) {
                                 $likesize="75";
                             }
+# Actually glue in the message itself
                             $$discussionitems[$idx].= '<br /><blockquote>'.
                                     "<div style='font-size:$likesize%'>".
                                     $message.
                                     '</div></blockquote>';
+# Put in the like and unlike buttons
+                            unless ($likes{$symb.':'.$idx.':likers'}=~/\,\Q$thisuser\E\,/) {
+                                $$discussionitems[$idx].='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsup.png" alt="'.&mt('Like').'" />','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
+                            } else {
+                                $$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"));
+                            } else {
+                                $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsdown_gray.png" alt="'.&mt('You unlike this posting').'" />';
+                            }
+                            my $thislikes=$likes{$symb.':'.$idx.':likes'};
+                            if ($thislikes>0) {
+                                $$discussionitems[$idx].='&nbsp;('.&mt("[_1] likes",$thislikes).')';
+                            } elsif ($thislikes<0) {
+                                $$discussionitems[$idx].='&nbsp;('.&mt("[_1] unlikes",abs($thislikes)).')';
+                            }
+# If there is any history to this post, inform the reader
                             if ($contrib{$idx.':history'}) {
                                 my @postversions = ();
-                                $$discussionitems[$idx] .= &mt('This post has been edited by the author.');
+                                $$discussionitems[$idx] .= '&nbsp;&nbsp;'.&mt('This post has been edited by the author.');
                                 if ($seeid) {
                                     $$discussionitems[$idx] .= '&nbsp;&nbsp;'.
                                          &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
@@ -1599,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 = '';
@@ -1814,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">
@@ -1834,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) {
@@ -3325,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">
@@ -3343,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 = 
@@ -3372,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'}" />
@@ -3467,12 +3489,12 @@ sub generate_attachments_button {
     my $origpage = $ENV{'REQUEST_URI'};
     my $att=$attachnum.' '.&mt("attachments");
     my %lt = &Apache::lonlocal::texthash(
-                'clic' => 'Click to add/remove attachments',
+                'clic' => 'Add/remove attachments',
     ); 
     my $response = (<<END);
 <br />
 <form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
-$lt{'clic'}:&nbsp;<input type="button" value="$att"
+<input type="button" value="$lt{'clic'}"
 onclick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.value);
 END
     if (!$blockblog) {