--- loncom/interface/lonfeedback.pm	2010/09/21 04:58:17	1.273.4.11
+++ loncom/interface/lonfeedback.pm	2010/08/14 15:24:46	1.298
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.273.4.11 2010/09/21 04:58:17 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.298 2010/08/14 15:24:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,7 @@ use Apache::lonnavmaps;
 use Apache::lonenc();
 use Apache::lonrss();
 use HTML::LCParser();
+#use HTML::Tidy::libXML;
 use Apache::lonspeller();
 use Apache::longroup;
 use Cwd;
@@ -57,7 +58,7 @@ sub discussion_open {
         return 1;
     }
 # It was not explicitly open, check if the problem is available.
-# If the problem is not available, close the discussion
+# If the problem is not available, close the discussion 
     if (defined($status) &&
 	!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
 	  || $status eq 'OPEN')) {
@@ -100,7 +101,7 @@ sub list_discussion {
     if (not &discussion_visible($status)) {
         if ($mode ne 'board') {
             &Apache::lonenc::check_encrypt(\$ressymb); 
-            return '<br />'.&send_message_link($ressymb);
+            return '<br /><div class="LC_feedback_link">'.&send_message_link($ressymb)."</div>";
         }
     }
     if ($group ne '' && $mode eq 'board') {
@@ -112,9 +113,12 @@ sub list_discussion {
     my ($blocked,$blocktext) = 
         &Apache::loncommon::blocking_status('boards');
     if ($blocked) {
+        $blocktext = '<br /><div class="LC_feedback_link"><span class="LC_feedback_link">'.$blocktext."</span>";
         &Apache::lonenc::check_encrypt(\$ressymb);
         if ($mode ne 'board') {
-            $blocktext.='<br />'.&send_message_link($ressymb);
+            $blocktext.=&send_message_link($ressymb).'</div>';
+        }else{
+            $blocktext.="</div>";
         }
         return $blocktext; 
     }
@@ -180,7 +184,6 @@ sub list_discussion {
     my $cnum = $env{'course.'.$cid.'.num'};
     my $crstype = &Apache::loncommon::course_type();
 
-
 # Get information about students and non-students in course for filtering display of posts
     my %roleshash = ();
     my %roleinfo = ();
@@ -279,10 +282,6 @@ sub list_discussion {
     my %anonhash=();
     my $anoncnt=0;
     my $target='';
-    unless ($env{'browser.interface'} eq 'textual' ||
-	    $env{'environment.remote'} eq 'off' ) {
-	$target='target="LONcom"';
-    }
 
     my $now = time;
     $discinfo{$visitkey} = $visit;
@@ -323,6 +322,7 @@ sub list_discussion {
         'dpwn' => 'Deleted posts will no longer be visible to you and other students',
         'bwco' => 'but will continue to be visible to your instructor',
         'depo' => 'Deleted posts will no longer be visible to you or anyone else.',
+        'discussions' => 'DISCUSSIONS'
     );
 
     my $currdisp = $lt{'allposts'};
@@ -374,8 +374,7 @@ sub list_discussion {
 # Print the discusssion
         if ($outputtarget eq 'tex') {
             $discussion.='<tex>{\tiny \vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}'.
-                         '\textbf{DISCUSSIONS}\makebox[2 cm][b]{\hrulefill}'.
-                         '\vskip 0 mm\noindent\textbf{'.$lt{'cuse'}.'}:\vskip 0 mm'.
+                         '\textbf{'.$lt{'discussions'}.'}\makebox[2 cm][b]{\hrulefill}\vskip 0 mm'.
                          '\noindent\textbf{'.$lt{'disa'}.'}: \textit{'.$currdisp.'}\vskip 0 mm'.
                          '\noindent\textbf{'.$lt{'npce'}.'}: \textit{'.$currmark.'}}</tex>';
         } elsif ($outputtarget eq 'export') {
@@ -410,7 +409,6 @@ sub list_discussion {
             if ($manifestfile = Apache::File->new('>'.$manifestfilename)) {
                 $manifestok=1;
                 print $manifestfile qq|<?xml version="1.0" encoding="UTF-8"?>
-
 <manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1" xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2" 
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 identifier="MANIFEST-$ressymb" xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1 
@@ -423,8 +421,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             }
 	} else {
             my $colspan=$maxdepth+1;
-            $discussion.= qq|
-<script>
+            $discussion.= &Apache::lonhtmlcommon::scripttag(qq|
    function verifydelete (caller,symb,idx,newflag,previous,groupparm) {
        var symbparm = symb+':::'+idx
        var prevparm = ""
@@ -443,8 +440,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
            }
        }
    }
-</script>
-            |;
+            |);
 	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
                          "\n".'<table class="LC_discussion">';
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
@@ -522,7 +518,6 @@ imscp_v1p1.xsd http://www.imsglobal.org/
 			$threadinsert='<br /><strong>Reply: '.$thisdepth.'</strong>';
 		    }
 		    $discussionitems[$alldiscussion{$post}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
-		    $discussionitems[$alldiscussion{$post}]=~s/<a([^>]+)>(Edit|Hide|Delete|Reply|Submissions)<\/a>//g;
                     $discussionitems[$alldiscussion{$post}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
 
 		    $discussionitems[$alldiscussion{$post}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$post}];
@@ -653,7 +648,7 @@ END
                 $discussion.='<td align="right">'.
               '<input type="hidden" name="discsymb" value="'.$ressymb.'" />'."\n".
               '<input type="button" name="readoptions" value="'.$storebutton.'"'.
-              ' onClick="this.form.submit();" />'."\n".
+              ' onclick="this.form.submit();" />'."\n".
               '</td>';
             }
             $discussion .= (<<END);
@@ -759,12 +754,15 @@ END
                     }
                 }
             }
-        } else {
+	} else {
             if ($outputtarget ne 'tex') {
-	        $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
+                $discussion.= '<span class="LC_feedback_link">'.&mt('This discussion is closed.').'</span>';
             }
         }
-        $discussion.=&send_message_link($ressymb).'</div>';
+        if ($outputtarget ne 'tex') {
+	    $discussion.= &send_message_link($ressymb);
+        }
+        $discussion.='</div>';
     }
     return $discussion;
 }
@@ -774,9 +772,9 @@ sub send_feedback_link {
     my $output = '<span class="LC_feedback_link">'.
                  ' <a href="/adm/feedback?replydisc='.
                  &escape($ressymb).':::" '.$target.'>'.
-                 '<img alt="" src="'.
+                 '<img alt="" class="LC_noBorder" src="'.
                  &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
-                 '" border="0" />'.&mt('Post Discussion').'</a></span>';
+                 '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span></a></span>';
     return $output;
 }
 
@@ -784,9 +782,9 @@ sub send_message_link {
     my ($ressymb) = @_;
     my $output = '<span class="LC_message_link">'.
                  '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
-                 &escape($ressymb).'"><img alt="" src="'.
-                 &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
-                 '" border="0" />'.&mt('Send Feedback').'</a></span>';
+                 &escape($ressymb).'"><img alt="" class="LC_noBorder" src="'.
+                 &Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').
+                 '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span></a></span>';
     return $output;
 }
 
@@ -805,20 +803,20 @@ sub action_links_bar {
         $discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
                       '<a href="/adm/feedback?cmd=threadedoff&amp;symb='.$escsymb;
         if ($newpostsflag) {
-            $discussion .= '&previous='.$prevread;
+            $discussion .= '&amp;previous='.$prevread;
         }
         $discussion .= &group_args($group);
         $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
                        <a href="/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
         if ($newpostsflag) {
-            $discussion .= '&previous='.$prevread;
+            $discussion .= '&amp;previous='.$prevread;
         }
         $discussion .= &group_args($group);
         $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.('&nbsp;' x2);
     }
     $discussion .='<a href="/adm/feedback?export='.$escsymb;
     if ($newpostsflag) {
-        $discussion .= '&previous='.$prevread;
+        $discussion .= '&amp;previous='.$prevread;
     }
     $discussion .= &group_args($group);
     $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
@@ -844,6 +842,7 @@ sub action_links_bar {
 sub postingform_display {
     my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
         $currnewattach,$currdelold,$group,$crstype) = @_;
+    if ($outputtarget eq 'tex') { return ''; }
     my $newattachmsg;
     my %lt = &Apache::lonlocal::texthash(
               'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
@@ -855,7 +854,12 @@ sub postingform_display {
     if ($crstype eq 'Community') {
         $lt{'note'} = &mt('Note: in anonymous discussion, your name is visible only to community facilitators');
     }
-    my $postingform = (<<ENDDISCUSS);
+    my ($postingform,$textareaclass);
+    if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+        $postingform = &Apache::lonhtmlcommon::htmlareaselectactive();
+        $textareaclass = 'class="LC_richDefaultOff"';
+    }
+    $postingform .= (<<ENDDISCUSS);
 <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> <input type="submit" name="discuss" value="$lt{'podi'}" />
 <input type="submit" name="anondiscuss" value="$lt{'poan'}" /> <input type="hidden" name="symb" value="$ressymb" />
 <input type="hidden" name="sendit" value="true" />
@@ -863,7 +867,7 @@ sub postingform_display {
 <br /><a name="newpost"></a>
 <font size="1">$lt{'note'}</font><br />
 <b>$lt{'title'}:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br /><br />
-<textarea name="comment" cols="80" rows="14">$comment</textarea>
+<textarea name="comment" cols="80" rows="14" id="comment" $textareaclass>$comment</textarea>
 ENDDISCUSS
     if ($env{'form.origpage'}) {
         $postingform .= '<input type="hidden" name="origpage" value="'.
@@ -885,28 +889,26 @@ ENDDISCUSS
         $postingform .= &add_blog_checkbox($crstype);
     }
     $postingform .= "</form>\n";
-    if ($outputtarget ne 'tex') {
-        $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
+    $postingform .= &generate_attachments_button('',$attachnum,$ressymb,
                                                      $now,$currnewattach,
                                                      $currdelold,'',$mode,
                                                      $blockblog);
-        if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
-            $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
-            if (@{$currnewattach} > 1) {
-                $newattachmsg .= '<ol>';
-                foreach my $item (@{$currnewattach}) {
-                    $item =~ m#.*/([^/]+)$#;
-                    $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
-                }
-                $newattachmsg .= '</ol>'."\n";
-            } else {
-                $$currnewattach[0] =~ m#.*/([^/]+)$#;
-                $newattachmsg .= '<a href="'.$$currnewattach[0].'">'.$1.'</a><br />'."\n";
-            }
-        }
-        $postingform .= $newattachmsg;
-        $postingform .= &generate_preview_button();
+    if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+        $newattachmsg = '<br /><b>'.$lt{'newa'}.'</b><br />';
+        if (@{$currnewattach} > 1) {
+             $newattachmsg .= '<ol>';
+             foreach my $item (@{$currnewattach}) {
+                $item =~ m#.*/([^/]+)$#;
+                $newattachmsg .= '<li><a href="'.$item.'">'.$1.'</a></li>'."\n";
+             }
+             $newattachmsg .= '</ol>'."\n";
+         } else {
+             $$currnewattach[0] =~ m#.*/([^/]+)$#;
+             $newattachmsg .= '<a href="'.$$currnewattach[0].'">'.$1.'</a><br />'."\n";
+         }
     }
+    $postingform .= $newattachmsg;
+    $postingform .= &generate_preview_button();
     return $postingform;
 }
 
@@ -1039,7 +1041,6 @@ 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'}}} = ();
@@ -1069,7 +1070,7 @@ sub build_posting_display {
                             } else {
                                 @{$$namesort{$lastname}{$firstname}} = ("$idx");
                             }
-                            if (&editing_allowed($escsymb.':::'.$idx,$group)) {
+                            if ((&editing_allowed($escsymb.':::'.$idx,$group)) && ($outputtarget ne 'tex')) {
                                 if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
                                     $sender.=' <a href="/adm/feedback?editdisc='.
                                          $escsymb.':::'.$idx;
@@ -1086,13 +1087,13 @@ sub build_posting_display {
                                     }
                                 }
                             } 
-			    if ($seeid) {
+			    if (($seeid) && ($outputtarget ne 'tex')) {
 			        if ($hidden) {
                                     unless ($studenthidden) {
 			                $sender.=' <a href="/adm/feedback?unhide='.
 				                $escsymb.':::'.$idx;
                                         if ($$newpostsflag) {
-                                            $sender .= '&previous='.$prevread;
+                                            $sender .= '&amp;previous='.$prevread;
                                         }
                                         $sender .= '">'.&mt('Make Visible').'</a>';
                                     }
@@ -1116,6 +1117,7 @@ sub build_posting_display {
 			    } else {
 				$sender='<i>'.$$anonhash{$key}.'</i>';
 			    }
+                            $sender = '<b>'.$sender.'</b>';
 # Set up for sorting by domain, then username for anonymous
                             unless (defined($$usernamesort{'__anon'})) {
                                 %{$$usernamesort{'__anon'}} = ();
@@ -1135,7 +1137,7 @@ sub build_posting_display {
                                 @{$$namesort{'__anon'}{'__anon'}} = ("$idx");
                             }
 		        }
-		        if (&discussion_open($status)) {
+		        if ((&discussion_open($status)) && ($outputtarget ne 'tex')) {
                             if (($group ne '') && 
                                 (&check_group_priv($group,'pgd') eq 'ok')) {
                                  $sender.=' <a href="/adm/feedback?replydisc='.
@@ -1152,16 +1154,16 @@ sub build_posting_display {
 			         $sender.=' <a href="/adm/feedback?replydisc='.
 			                  $escsymb.':::'.$idx;
                                 if ($$newpostsflag) {
-                                    $sender .= '&previous='.$prevread;
+                                    $sender .= '&amp;previous='.$prevread;
                                 }
                                 $sender .= '" '.$target.'>'.&mt('Reply').'</a>';
                             }
                         }
-		        if ($viewgrades) {
-			        $vgrlink=&Apache::loncommon::submlink('Submissions',
+		        if (($viewgrades) && ($outputtarget ne 'tex')) {
+			        $vgrlink=&Apache::loncommon::submlink(&mt('Submissions'),
                             $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb);
 		        }
-                        if ($$dischash{$readkey}=~/\.$idx\./) { 
+                        if (($$dischash{$readkey}=~/\.$idx\./) && ($outputtarget ne 'tex')) { 
                             $ctlink = '<label><b>'.&mt('Mark unread').'?</b>&nbsp;<input type="checkbox" name="postunread_'.$idx.'" /></label>';
                         } else {
                             $ctlink = '<label><b>'.&mt('Mark read').'?</b>&nbsp;<input type="checkbox" name="postread_'.$idx.'" /></label>';
@@ -1262,12 +1264,12 @@ sub build_posting_display {
                             if ($prevread > 0 && $prevread <= $posttime) {
                                 $$newitem{$idx} = 1;
                                 $$discussionitems[$idx] .= '
-                                 <table border="0" width="100%">
-                                  <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'</b></font></td>';
+                                  <table border="0" width="100%">
+                                  <tr><td align="left"><font color="#FF0000"><b>'.&mt('NEW').'&nbsp;</b></font></td>';
                             } else {
                                 $$newitem{$idx} = 0;
                                 $$discussionitems[$idx] .= '
-                                 <table border="0" width="100%">
+                                  <table border="0" width="100%">
                                   <tr><td align="left">&nbsp;</td>';
                             }
                             $$discussionitems[$idx] .= '<td align="left">&nbsp;&nbsp;'.
@@ -1684,10 +1686,21 @@ END
 </script>
 END
 
+  my ($textareaheader,$textareaclass);
+  if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+      $textareaheader = &Apache::lonhtmlcommon::htmlareaselectactive();
+      $textareaclass = 'class="LC_richDefaultOff"';
+  }
+
+  # Breadcrumbs
+  my $brcrum = [{'href' => '',
+                 'text' => 'Resource Feedback and Discussion'}];
+
   my %onload = ('onload' => 'window.focus();setposttype();');
   my $start_page=
       &Apache::loncommon::start_page('Resource Feedback and Discussion',$js,
-				     {'add_entries' => \%onload});
+                                     {'add_entries' => \%onload,
+                                      'bread_crumbs' => $brcrum,});
 
   if ($quote ne '') {
       $quote = &HTML::Entities::decode($quote);
@@ -1718,14 +1731,16 @@ END
   $r->print(<<END);
 $options<hr />
 $quote
-<p>$lt{'myqu'}</p>
+<p>$lt{'myqu'}
+$textareaheader
+</p>
 <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">$comment
+<textarea name="comment" id="comment" cols="60" rows="10" $textareaclass>$comment
 </textarea></p>
 END
     if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) {
@@ -1803,7 +1818,6 @@ END
         }
     }
     $r->print(&generate_preview_button().
-              &Apache::lonhtmlcommon::htmlareaselectactive('comment').
 	      &Apache::loncommon::end_page());
 
 }
@@ -2038,7 +2052,7 @@ sub print_sortfilter_options {
         $ccrole = 'co';
     }
     push(@courseroles,$ccrole);
-
+    
     if ($env{'request.course.sec'} !~ /^\s*$/) {  #Restrict section choice to current section 
         @sections = ('all',$env{'request.course.sec'});
         $numvisible = 2;
@@ -2413,7 +2427,7 @@ sub fail_redirect {
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   my %lt = &Apache::lonlocal::texthash(
-                 'sorr' => 'Sorry, no recipients  ...',
+                 'sorr' => 'Sorry, no recipients ...',
   );
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,
@@ -2464,7 +2478,7 @@ sub redirect_back {
           $userpicktag = '<input type="hidden" name="totposters" value="'.$numpicks.'" />';
       } else {
           if (ref($sectionpick) eq 'ARRAY') {
-              $feedurl .= '&sectionpick=';
+              $feedurl .= '&amp;sectionpick=';
               $sectag .=  '<input type="hidden" name="sectionpick" value="';
               foreach my $sec (@{$sectionpick}) {
                   $feedurl .= $sec.',';
@@ -2478,7 +2492,7 @@ sub redirect_back {
               $sectag = '<input type="hidden" name="sectionpick" value="'.$sectionpick.'" />';
           }
           if (ref($grouppick) eq 'ARRAY') {
-              $feedurl .= '&grouppick=';
+              $feedurl .= '&amp;grouppick=';
               $sectag .=  '<input type="hidden" name="grouppick" value="';
               foreach my $grp (@{$grouppick}) {
                   $feedurl .= $grp.',';
@@ -2492,7 +2506,7 @@ sub redirect_back {
               $grptag = '<input type="hidden" name="grouppick" value="'.$grouppick.'" />';
           }
           if (ref($rolefilter) eq 'ARRAY') {
-              $feedurl .= '&rolefilter=';
+              $feedurl .= '&amp;rolefilter=';
               $roletag .=  '<input type="hidden" name="rolefilter" value="';
               foreach my $role (@{$rolefilter}) {
                   $feedurl .= $role.',';
@@ -2502,7 +2516,7 @@ sub redirect_back {
               $roletag =~ s/,$//;
               $roletag .= '" />';
           } else {
-              $feedurl .= '&rolefilter='.$rolefilter;
+              $feedurl .= '&amp;rolefilter='.$rolefilter;
               $roletag = '<input type="hidden" name="rolefilter" value="'.$rolefilter.'" />';
           }
           $feedurl .= '&amp;statusfilter='.$statusfilter;
@@ -2526,10 +2540,6 @@ sub redirect_back {
   &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my %onload;
-  if ($env{'environment.remote'} ne 'off') {
-      $onload{'onload'} =
-	  "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
-  }
   my $start_page=
       &Apache::loncommon::start_page('Feedback sent',undef,
 				     {'redirect'    => [0,$feedurl],
@@ -2560,13 +2570,9 @@ ENDREDIR
 
 sub no_redirect_back {
   my ($r,$feedurl) = @_;
-  my $nofeed=&mt('Sorry, no feedback possible on this resource  ...');
+  my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
  
   my %onload;
-  if ($env{'environment.remote'} ne 'off') {
-      $onload{'onload'} = 
-	  "if (window.name!='loncapaclient') { self.window.close(); }";
-  }
 
   my %body_options = ('only_body'   => 1,
 		      'bgcolor'     => '#FFFFFF',
@@ -2642,22 +2648,15 @@ sub screen_header {
     }
     if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
         my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
-        my $realsymb = $symb;
-        if ($symb=~/^bulletin___/) {
-            my $filename=(&Apache::lonnet::decode_symb($symb))[2];
-            $filename=~s|^adm/wrapper/||;
-            $realsymb=&Apache::lonnet::symbread($filename);
-        }
-        if (!$blocked && &discussion_open(undef,$realsymb) &&
+        if (!$blocked && &discussion_open(undef,$symb) && 
 	    &Apache::lonnet::allowed('pch',
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 	    $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
-                $contribdisc.
-                '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
-                $anoncontrib.
-                ' <i>('.$namevis.')</i></label> '.
-
+		$contribdisc.
+	        '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
+		$anoncontrib.
+		' <i>('.$namevis.')</i></label> '.
 		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
             my $blockblog = &Apache::loncommon::blocking_status('blogs');
             if (!$blockblog) {
@@ -2666,7 +2665,7 @@ sub screen_header {
         }
     }
     if ($msgoptions) {
-        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'
+        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').'" />'
                    .' '.&mt('Send Feedback').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'</p>'
                    .$msgoptions;
     }
@@ -2692,9 +2691,7 @@ sub resource_output {
 }
 
 sub clear_out_html {
-  my ($message,$override,$ignore_htmlarea)=@_;
-  if (!$ignore_htmlarea
-      && !&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
+  my ($message,$override)=@_;
 # Always allow the <m>-tag
   my %html=(M=>1);
 # Check if more is allowed
@@ -2705,11 +2702,10 @@ sub clear_out_html {
       # <BLOCKQUOTE> <DIV .*> <DIV> <IMG> <M> <SPAN> <H1> <H2> <H3> <H4> <SUB>
       # <SUP> <TABLE> <TR> <TD> <TH> <TBODY>
       %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1,
-	     BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1,
-	     M=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1, 
+	     BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, PRE=>1, DIV=>1, IMG=>1,
+	     M=>1, CHEM=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1,  
 	     H1=>1, H2=>1, H3=>1, H4=>1, H5=>1, H6=>1, 
 	     TABLE=>1, TR=>1, TD=>1, TH=>1, TBODY=>1);
-
   }
 # Do the substitution of everything that is not explicitly allowed
   $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
@@ -2726,6 +2722,9 @@ sub assemble_email {
              'orig' => 'Original screen output (if applicable)',
              'corr' => 'Correct Answer(s) (if applicable)',
   );
+  if (&Apache::loncommon::course_type() eq 'Community') {
+      $lt{'prev'} = &mt('Previous attempts of member (if applicable)');
+  }
   my $email=<<"ENDEMAIL";
 $message
 ENDEMAIL
@@ -2952,7 +2951,7 @@ sub show_preview {
     &newline_to_br(\$message);
     $message=&Apache::lonspeller::markeduptext($message);
     $message=&Apache::lontexconvert::msgtexconverted($message);
-    my $subject=&clear_out_html($env{'form.subject'},undef,1);
+    my $subject=&clear_out_html($env{'form.subject'});
     $subject=~s/\n/\<br \/\>/g;
     $subject=&Apache::lontexconvert::msgtexconverted($subject);
 					
@@ -2975,17 +2974,29 @@ 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
+        <(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 tidy_html {
+	my ($message)=@_;
+# 	my $tidy = HTML::Tidy::libXML->new();
+# 	my $xhtml = $tidy->clean($message, 'utf-8', 1);
+# 	$xhtml =~ m/<body>(.*)<\/body>/is;
+# 	my $clean = $1;
+# 	# remove any empty block-level tags
+# 	$clean =~ s/<(table|p|div|tbody|blockquote|m|pre|algebra|center|ol|ul|span|h1|h2|h3|h4|h5|h6)\s*\/>//i;
+# 	$message=$clean;
+	return $message;
+}
+
 sub newline_to_br {
     my ($message)=@_;
     my $newmessage;
@@ -3044,11 +3055,15 @@ sub modify_attachments {
 </script> 
 END
 
+    # Breadcrumbs
+    my $brcrum = [{'href' => '',
+                   'text' => 'Discussion Post Attachments'}];
     my $start_page = 
-	&Apache::loncommon::start_page('Discussion Post Attachments',$js);
+	&Apache::loncommon::start_page('Discussion Post Attachments',$js,
+                                   {'bread_crumbs' => $brcrum,});
 
     my $orig_subject = &unescape($env{'form.subject'});
-    my $subject=&clear_out_html($orig_subject,undef,1);
+    my $subject=&clear_out_html($orig_subject);
     $subject=~s/\n/\<br \/\>/g;
     $subject=&Apache::lontexconvert::msgtexconverted($subject);
     my $timestamp=$env{'form.timestamp'};
@@ -3171,7 +3186,7 @@ sub generate_attachments_button {
 <br />
 <form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
 $lt{'clic'}:&nbsp;<input type="button" value="$att"
-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);
+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) {
         $response .= 'setblogvalue();';
@@ -3387,14 +3402,14 @@ sub sort_filter_names {
     }
     if (ref($status_types) eq 'HASH') {
         %{$status_types} = (
-                      all     => 'Roles of any status',
-                      Active  => 'Only active roles',
-                      Expired => 'Only past roles',
-                      Future  => 'Only future roles',
-                    );
+                     all     => 'Roles of any status',
+                     Active  => 'Only active roles',
+                     Expired => 'Only past roles',
+                     Future  => 'Only future roles',
+                   );
     }
 }
-
+  
 sub handler {
   my $r = shift;
   if ($r->header_only) {
@@ -3454,7 +3469,13 @@ sub handler {
       &Apache::loncommon::no_cache($r);
       $r->send_http_header;
 
-      $r->print(&Apache::loncommon::start_page('Discussion Post Versions'));
+      # Breadcrumbs
+      my $brcrum = [{'href' => '',
+                     'text' => 'Discussion Post Versions'}];
+
+      $r->print(&Apache::loncommon::start_page('Discussion Post Versions',undef,
+                                               {'bread_crumbs' => $brcrum,})
+      );
 
       my $crs='/'.$env{'request.course.id'};
       if ($env{'request.course.sec'}) {
@@ -3558,10 +3579,6 @@ sub handler {
       $r->send_http_header;
       my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
       my %onload;
-      if ($env{'environment.remote'} ne 'off') {
-	  $onload{'onload'} =
-	      "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
-      }
 
       my $start_page=
 	  &Apache::loncommon::start_page('New posts marked as read',undef,
@@ -3894,8 +3911,7 @@ ENDREDIR
       my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);
 
 # Actually send mail
-      my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'},
-						      undef,1),
+      my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}),
 				      $feedurl,$email,$citations,
 				      $attachmenturl,$usersymb,%to);
 
@@ -3904,7 +3920,7 @@ ENDREDIR
       if (  ($env{'form.discuss'} ne ''
 	     && $env{'form.discuss'} !~ /^(?:author|question|course|policy)/)
 	   || $env{'form.anondiscuss'} ne '') {
-	  my $subject = &clear_out_html($env{'form.subject'},undef,1);
+	  my $subject = &clear_out_html($env{'form.subject'});
 	  my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
 	  $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
 				  $subject);
@@ -3915,7 +3931,7 @@ ENDREDIR
 
       my $blog='';
       if ($env{'form.blog'}) {
-	  my $subject = &clear_out_html($env{'form.subject'},undef,1);
+	  my $subject = &clear_out_html($env{'form.subject'});
 	  $status.=&Apache::lonrss::addentry($env{'user.name'},
 				    $env{'user.domain'},
 				    'CourseBlog_'.$env{'request.course.id'},
@@ -4160,6 +4176,8 @@ None
 
 =item newline_to_br()
 
+=item tidy_html()
+
 =item generate_preview_button()
 
 =item modify_attachments()