--- loncom/interface/lonfeedback.pm	2012/03/17 04:55:10	1.350
+++ loncom/interface/lonfeedback.pm	2012/06/17 15:30:37	1.357
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.350 2012/03/17 04:55:10 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.357 2012/06/17 15:30:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -821,7 +821,7 @@ sub can_see_hidden {
 
 sub discussion_link {
    my ($ressymb,$linktext,$cmd,$item,$flag,$prev,$adds,$title)=@_;
-   my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
+   my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
    if ($flag) { $link .= '&previous='.$prev; }
    if ($adds) { $link .= $adds; }
    my $width=600;
@@ -1063,8 +1063,8 @@ sub build_posting_display {
                 next if ($contrib{$idx.':deleted'});
                 next if ($contrib{$idx.':hidden'});
                 unless ((($hiddens{$idx}) && (!$seehidden)) || ($deletions{$idx}) || (!$contrib{$idx.':message'})) {
+                    push(@theselikes,$likes{$symb.':'.$idx.':likes'});
                     if ($likes{$symb.':'.$idx.':likes'} ne '') {
-                        push(@theselikes,$likes{$symb.':'.$idx.':likes'});
                         if (ref($likes{$symb.':'.$idx.':likers'}) eq 'HASH') {
                             if (exists($likes{$symb.':'.$idx.':likers'}{$thisuser})) {
                                 $userlikes{$idx} = 1;
@@ -1457,13 +1457,24 @@ sub build_posting_display {
                                     $message.
                                     '</div></blockquote>';
                             if ($canvote) {
+                                my $ownpost;
+                                if (($uname eq $env{'user.name'}) &&
+                                    ($udom eq $env{'user.domain'})) {
+                                    $ownpost = 1;
+                                }   
 # Put in the like and unlike buttons
-                                if (($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) {
-                                    my $novote = &mt('No voting for your own posts');
+                                if ($ownpost || (($hiddens{$idx}) && ($seehidden))) { 
+                                    my $novote;
+                                    if ($ownpost) { 
+                                        $novote = &mt('No voting for your own posts.');
+                                    } else {
+                                        $novote = &mt('No voting for hidden posts.');
+                                    }
                                     $$discussionitems[$idx].=
                                         '<a href="javascript:alert('."'$novote'".');" style="text-decoration: none;">'.
                                         '<img border="0" src="/res/adm/pages/thumbsup_novote.png" alt="'.$novote.'" />&nbsp;'.
                                         '<img border="0" src="/res/adm/pages/thumbsdown_novote.png" alt="'.$novote.'" /></a>'; 
+
                                 } else {
                                     if ($userlikes{$idx}) {
                                         $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsup_gray.png" alt="'.&mt('You like this posting').'" />';
@@ -1796,6 +1807,7 @@ END
 					   $env{'course.'.$env{'request.course.id'}.'.domain'},
 					   $env{'course.'.$env{'request.course.id'}.'.num'});
       unless (($contrib{'hidden'}=~/\.$idx\./) || ($contrib{'deleted'}=~/\.$idx\./)) {
+          my $numoldver = 0;
           if ($contrib{$idx.':history'}) {
               if ($contrib{$idx.':history'} =~ /:/) {
                   my @oldversions = split(/:/,$contrib{$idx.':history'});
@@ -1804,36 +1816,25 @@ END
                   $numoldver = 1;
               }
           }
-          if ($env{'form.replydisc'}) {
-              if ($contrib{$idx.':history'}) {
-                  if ($contrib{$idx.':history'} =~ /:/) {
-                      my @oldversions = split(/:/,$contrib{$idx.':history'});
-                      $numoldver = @oldversions;
-                  } else {
-                      $numoldver = 1;
-                  }
+          if ($idx > 0) {
+              my (%msgversions,%subversions,$htmldecode);
+              $htmldecode = 0;
+              if ($env{'form.replydisc'}) {
+                  $htmldecode = 1;
               }
-              if ($idx > 0) {
-                  my %msgversions = ();
-                  &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+              &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+              &get_post_versions(\%subversions,$contrib{$idx.':subject'},$htmldecode,
+                                 $numoldver);
+              $subject = $subversions{$numoldver};
+              if ($env{'form.replydisc'}) {
                   $quote = $msgversions{$numoldver};
-              }
-              if ($idx > 0) {
-                  my %subversions = ();
-                  &get_post_versions(\%subversions,$contrib{$idx.':subject'},1,$numoldver);
-                  $subject = &mt('Re: ').$subversions{$numoldver};
-              }
-              $subject = &HTML::Entities::encode($subject,'<>&"');
-          } else {
-              $attachmenturls = $contrib{$idx.':attachmenturl'};
-              if ($idx > 0) {
-                  my %msgversions = ();
-                  &get_post_versions(\%msgversions,$contrib{$idx.':message'},0,$numoldver);
+                  $subject = &HTML::Entities::encode(&mt('Re: ').$subject,'<>&"');
+              } else {
                   $comment = $msgversions{$numoldver};
-                  my %subversions = ();
-                  &get_post_versions(\%subversions,$contrib{$idx.':subject'},0,$numoldver);
-                  $subject = $subversions{$numoldver}; 
               }
+          }
+          if ($env{'form.editdisc'}) {
+              $attachmenturls = $contrib{$idx.':attachmenturl'};
               if (defined($contrib{$idx.':replyto'})) {
                   $parentmsg = $contrib{$idx.':replyto'};
               }
@@ -1934,7 +1935,11 @@ END
       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'}) {
@@ -1962,24 +1967,27 @@ END
   }
   $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>');
     $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" '.
+    $r->print('<textarea name="comment" id="comment" cols="55" rows="10" '.
               $textareaclass.'>'.$comment.
               '</textarea>');
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
@@ -2017,10 +2025,8 @@ END
         $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'}) {
@@ -2035,7 +2041,6 @@ END
             $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 />';
@@ -2055,9 +2060,10 @@ END
                 $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());
@@ -3485,7 +3491,7 @@ END
 $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());
@@ -4127,11 +4133,21 @@ ENDREDIR
           if (&discussion_vote_available($status,$realsymb)) {
               my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
                                                    $cdom,$cnum);
+              my $ownpost;
               if (($contrib{$idx.':sendername'} eq $env{'user.name'}) && 
                   ($contrib{$idx.':senderdomain'} eq $env{'user.domain'})) {
-                  $result = &mt("Vote not registered. No voting for your own posts.");
+                  $ownpost = 1;
+              }
+              if ($ownpost || $contrib{$idx.':hidden'} || $contrib{$idx.':deleted'}) {
+                  $result = &mt('Vote not registered.').' ';
+              }
+              if ($ownpost) {
+                  $result .= &mt('No voting for your own posts.');
+              } elsif ($contrib{$idx.':hidden'}) {
+                  $result .= &mt('No voting for hidden posts.');
+              } elsif ($contrib{$idx.':deleted'}) {
+                  $result .= &mt('No voting for deleted posts.');
               } else {
-
 #
 # Likes and unlikes are in db-file "disclikes" of the course
 # The prefix is the $symb to identify the resource discussion,
@@ -4773,7 +4789,9 @@ None
 
 =item list_discussion()
 
-=item can_see_discussion()
+=item can_see_hidden()
+
+=item discussion_link()
 
 =item send_feedback_link()