--- loncom/interface/lonfeedback.pm	2009/11/04 17:45:49	1.278
+++ loncom/interface/lonfeedback.pm	2009/12/07 15:46:16	1.281
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.278 2009/11/04 17:45:49 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.281 2009/12/07 15:46:16 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -569,7 +569,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                  <table border="0" cellpadding="0" cellspacing="4">
                   <tr>
                    <td>
-                    <font size="-1"><b>$lt{'cuse'}</b>:</td>
+                    <font size="-1"><b>$lt{'cuse'}</b>:</font></td>
                    <td>&nbsp;</td>
                    <td><font size="-1">
 END
@@ -591,7 +591,7 @@ END
                    </font></td>
                    <td>&nbsp;</td>
                    <td align="left">
-                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b>
+                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</b></font>
                    </td>
                   </tr>
                  </table>
@@ -815,7 +815,7 @@ sub action_links_bar {
                            &mt('Preferences on what is marked as NEW').
                            '</a><br /><a href="/adm/feedback?markread=1&amp;symb='.$escsymb;
             $discussion .= &group_args($group);
-            $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a>';
+            $discussion .= '">'.&mt('Mark NEW posts no longer new').'</a></td>';
         } else {
             $discussion .= '<td>&nbsp;</td>';
         }
@@ -1255,7 +1255,7 @@ sub build_posting_display {
                             }
                             $$discussionitems[$idx] .= '<td align="left">&nbsp;&nbsp;'.
                                 '<b>'.$subject.'</b>&nbsp;&nbsp;'.
-                                $sender.'</b> '.$vgrlink.' ('.
+                                '<b>'.$sender.'</b> '.$vgrlink.' ('.
                                 &Apache::lonlocal::locallocaltime($posttime).')</td>';
                             if ($$dischash{$toggkey}) {
                                 $$discussionitems[$idx].='<td align="right">&nbsp;&nbsp;'.
@@ -1484,7 +1484,6 @@ sub mail_screen {
   }
 
   my %lt = &Apache::lonlocal::texthash(
-            'plch' => 'Please check at least one of the following feedback types:',
             'myqu' => 'My question/comment/feedback:',
             'title' => 'Title',
             'reta' => 'Retained attachments',
@@ -1700,7 +1699,6 @@ END
 END
   }
   $r->print(<<END);
-$lt{'plch'}
 $options<hr />
 $quote
 <p>$lt{'myqu'}</p>
@@ -2138,17 +2136,17 @@ $start_page
 <br /><br />
 <table border="0">
  <tr>
-  <td><b>$lt{'soor'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'sprs'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'spur'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'spse'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'spgr'}</b></td>
-  <td>&nbsp;</td>
-  <td><b>$lt{'psub'}</b></td>
+  <th>$lt{'soor'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'sprs'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spur'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spse'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'spgr'}</th>
+  <th>&nbsp;</th>
+  <th>$lt{'psub'}</th>
  </tr>
  <tr>
   <td align="center" valign="top">
@@ -2645,12 +2643,12 @@ sub screen_header {
     }
     if ($msgoptions) {
         $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'
-                   .' '.&mt('Send Feedback').'</h2>'
+                   .' '.&mt('Send Feedback').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</p>'
                    .$msgoptions;
     }
     if ($discussoptions) { 
 	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'
-                        .' '.&mt('Discussion Contributions').'</h2>'
+                        .' '.&mt('Discussion Contributions').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</p>'
                         .$discussoptions;
     }
     return $msgoptions.$discussoptions;
@@ -2951,7 +2949,19 @@ sub show_preview {
     );
 }
 
-
+sub contains_block_html {
+	my ($message)=@_;
+	return ($message =~ m/
+		<(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div) 
+		  [\s]*
+		 ([\w]+\=['"][\w]+['"])*
+		  [\s]*
+		(
+		  [\s]*[\/]>|
+		  >.*<\/\1[\s]*>
+		)/x );
+}
+	
 sub newline_to_br {
     my ($message)=@_;
     my $newmessage;
@@ -3043,7 +3053,7 @@ $toolarge
  <table class="LC_data_table">
   <tr>
    <td colspan="2">
-    <b>Subject:</b> $subject</b><br /><br />
+    <b>Subject:</b> <b>$subject</b><br /><br />
 END
     if ($idx) {
         if ($attachmenturls) {