--- loncom/interface/lonfeedback.pm	2006/12/08 00:28:59	1.231
+++ loncom/interface/lonfeedback.pm	2006/12/08 22:35:56	1.233
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.231 2006/12/08 00:28:59 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.233 2006/12/08 22:35:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,6 +74,9 @@ sub discussion_visible {
 
 sub list_discussion {
     my ($mode,$status,$ressymb,$imsextras,$group)=@_;
+    unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
+    unless ($ressymb) { return ''; }
+    $ressymb=&wrap_symb($ressymb);
     my $outputtarget=$env{'form.grade_target'};
     if (defined($env{'form.export'})) {
 	if($env{'form.export'}) {
@@ -85,7 +88,12 @@ sub list_discussion {
             $outputtarget = 'export';
         }
     }
-    if (not &discussion_visible($status)) { return ''; }
+    if (not &discussion_visible($status)) {
+        if ($mode ne 'board') {
+            &Apache::lonenc::check_encrypt(\$ressymb); 
+            return &send_message_link($ressymb);
+        }
+    }
     if ($group ne '' && $mode eq 'board') {
         if (&check_group_priv($group,'vgb') ne 'ok') {
             return '';
@@ -94,7 +102,10 @@ sub list_discussion {
 
     my ($blocked,$blocktext) = &blocking_posts('boards',1);
     if ($blocked) {
-        return $blocktext;
+        if ($mode ne 'board') {
+            &Apache::lonenc::check_encrypt(\$ressymb);
+            return $blocktext.'<br />'.&send_message_link($ressymb);
+        }
     }
 
     my @bgcols = ("#cccccc","#eeeeee");
@@ -107,9 +118,6 @@ sub list_discussion {
 	$crs.='_'.$env{'request.course.sec'};
     }
     $crs=~s/\_/\//g;
-    unless ($ressymb) { $ressymb=&Apache::lonnet::symbread(); }
-    unless ($ressymb) { return ''; }
-    $ressymb=&wrap_symb($ressymb);
     my $encsymb=&Apache::lonenc::check_encrypt($ressymb);
     my $viewgrades=(&Apache::lonnet::allowed('vgr',$crs)
 		  && ($ressymb=~/\.(problem|exam|quiz|assess|survey|form|task)$/));
@@ -722,26 +730,45 @@ END
             }
 	}
     } else {
-	$discussion.='<table bgcolor="#BBBBBB"><tr><td>';
+        $discussion.='<table class="LC_feedback_link"><tr><td>';
         if (&discussion_open($status) &&
             &Apache::lonnet::allowed('pch',
     	        $env{'request.course.id'}.
 	        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 	    if ($outputtarget ne 'tex') {
-		$discussion.='<a href="/adm/feedback?replydisc='.
-		    &escape($ressymb).':::" '.$target.'>'.
-		    '<img alt="" src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" border="0" />'.
-		    &mt('Post Discussion').'</a><br />';
+		$discussion.= &send_feedback_link($ressymb,$target).
+                              '<br />';
             }
 	}
-	$discussion.='<a href="/adm/feedback?sendmessageonly=1&amp;symb='.
-	    &escape($ressymb).
-	    '"><img alt="" src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" border="0" />'.
-		    &mt('Send Message').'</a></td></tr></table>';
+        if ($outputtarget ne 'tex') {
+	    $discussion.= &send_message_link($ressymb);
+        }
+        $discussion.='</td></tr></table>';
     }
     return $discussion;
 }
 
+sub send_feedback_link {
+    my ($ressymb,$target) = @_;
+    my $output = '<span class="LC_feedback_link">'.
+                 ' <a href="/adm/feedback?replydisc='.
+                 &escape($ressymb).':::" '.$target.'>'.
+                 '<img alt="" src="'.
+                 &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
+                 '" border="0" />'.&mt('Post Discussion').'</a></span>';
+    return $output;
+}
+
+sub send_message_link {
+    my ($ressymb) = @_;
+    my $output = '<span class="LC_feedback_link">'.
+                 '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
+                 &escape($ressymb).'"><img alt="" src="'.
+                 &Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').
+                 '" border="0" />'.&mt('Send Message').'</a></span>';
+    return $output;
+}
+
 sub action_links_bar {
     my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
     my $discussion = '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
@@ -1728,6 +1755,7 @@ END
     if ($env{'form.editdisc'} || $env{'form.replydisc'}) {
         my $now = time;
         my $ressymb = $symb;
+        &Apache::lonenc::check_encrypt(\$ressymb);
         my $postidx = '';
         if ($env{'form.editdisc'}) {
             $postidx = $idx;
@@ -2471,7 +2499,7 @@ sub redirect_back {
           $feedurl .= '?group='.$group.$refarg;
       }
   } 
-  $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my %onload;
   if ($env{'environment.remote'} ne 'off') {
@@ -2528,7 +2556,7 @@ sub no_redirect_back {
 				      
   my $end_page = &Apache::loncommon::end_page();
 
-  $feedurl=&Apache::lonenc::check_encrypt($feedurl);
+  &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDNOREDIRTWO);
 $start_page
@@ -3755,11 +3783,13 @@ ENDREDIR
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;
 # Unable to give feedback
+          &Apache::lonenc::check_encrypt(\$feedurl);
 	  &no_redirect_back($r,$feedurl);
 	  return OK;
       }
 # --------------------------------------------------- Print login screen header
       unless ($env{'form.sendit'}) {
+          &Apache::lonenc::check_encrypt(\$feedurl);
 	  &Apache::loncommon::content_type($r,'text/html');
 	  $r->send_http_header;
 	  my $options=&screen_header($feedurl,$symb);