--- loncom/interface/lonfeedback.pm	2010/01/24 02:39:35	1.273.4.2
+++ loncom/interface/lonfeedback.pm	2010/01/25 03:30:23	1.273.4.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.273.4.2 2010/01/24 02:39:35 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.273.4.5 2010/01/25 03:30:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -567,7 +567,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
@@ -589,7 +589,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>
@@ -813,7 +813,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>';
         }
@@ -1014,6 +1014,7 @@ sub build_posting_display {
 					 $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> '.
 				    $screenname;
@@ -1021,6 +1022,7 @@ sub build_posting_display {
 			    if ($see_anonymous) {
 				$sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
 			    }
+                            $sender = '<b>'.$sender.'</b>';
 # Set up for sorting by domain, then username
                             unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) {
                                 %{$$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
@@ -1253,7 +1255,7 @@ sub build_posting_display {
                             }
                             $$discussionitems[$idx] .= '<td align="left">&nbsp;&nbsp;'.
                                 '<b>'.$subject.'</b>&nbsp;&nbsp;'.
-                                $sender.'</b> '.$vgrlink.' ('.
+                                $sender.' '.$vgrlink.' ('.
                                 &Apache::lonlocal::locallocaltime($posttime).')</td>';
                             if ($$dischash{$toggkey}) {
                                 $$discussionitems[$idx].='<td align="right">&nbsp;&nbsp;'.
@@ -1482,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',
@@ -1693,7 +1694,6 @@ END
 END
   }
   $r->print(<<END);
-$lt{'plch'}
 $options<hr />
 $quote
 <p>$lt{'myqu'}</p>
@@ -2131,17 +2131,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">
@@ -2639,12 +2639,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;
@@ -2942,6 +2942,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*>
+        )}xs
+    );
+}
 
 sub newline_to_br {
     my ($message)=@_;
@@ -3030,7 +3043,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) {