--- loncom/interface/lonfeedback.pm	2008/11/21 20:17:11	1.257
+++ loncom/interface/lonfeedback.pm	2010/01/24 03:13:55	1.273.4.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.257 2008/11/21 20:17:11 jms Exp $
+# $Id: lonfeedback.pm,v 1.273.4.3 2010/01/24 03:13:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,7 +110,7 @@ sub list_discussion {
         return $blocktext; 
     }
 
-    my @bgcols = ("#cccccc","#eeeeee");
+    my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
     unless ($env{'request.course.id'}) { return ''; }
@@ -169,6 +169,8 @@ sub list_discussion {
 
     my $cdom = $env{'course.'.$cid.'.domain'};
     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 = ();
@@ -434,7 +436,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
    }
 </script>
             |;
-	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" ><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
+                         "\n".'<table class="LC_discussion">';
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
                                              $newpostsflag,$group,
                                              $prevread,$markondisp);
@@ -547,7 +550,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                     }
                     $copyresult.=&replicate_attachments($imsitems{$alldiscussion{$post}}{'allattachments'},$tempexport);
                 } else {
-                    $discussion.='<td  bgcolor="'.$bgcols[$newitem{$alldiscussion{$post}}].
+                    $discussion.='<td class="'.$bgcols[$newitem{$alldiscussion{$post}}].
                        '" colspan="'.$colspan.'">'. $discussionitems[$alldiscussion{$post}].
                        '</td></tr>';
                 }
@@ -557,8 +560,8 @@ imscp_v1p1.xsd http://www.imsglobal.org/
             my $colspan=$maxdepth+1;
             $discussion .= <<END;
             <tr bgcolor="#FFFFFF">
-             <td colspan="$colspan" valign="top">
-              <table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">
+             <td colspan="$colspan" class="LC_disc_action_links_bar">
+              <table class="LC_disc_action_table">
                <tr>
                 <td align="left">
                  <table border="0" cellpadding="0" cellspacing="4">
@@ -596,7 +599,7 @@ END
                 my %sort_types = ();
                 my %role_types = ();
                 my %status_types = ();
-                &sort_filter_names(\%sort_types,\%role_types,\%status_types);
+                &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
 
                 $discussion .= '<td><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
                 if (defined($env{'form.totposters'})) {
@@ -625,7 +628,7 @@ END
                             $filterchoice .= '&nbsp;'.$role_types{$role}.',';
                         }
                         $filterchoice =~ s/,$//;
-                        $filterchoice .= '<br />&nbsp;&nbsp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
+                        $filterchoice .= '<br />'.('&nbsp;' x8);
                     }
                     if ($statusfilter) {
                         $filterchoice .= '<i>'.&mt('status').'</i>-&nbsp;'.$status_types{$statusfilter};
@@ -639,9 +642,9 @@ END
             if ($dischash{$toggkey}) {
                 my $storebutton = &mt('Save read/unread changes');
                 $discussion.='<td align="right">'.
-              '<input type="hidden" name="discsymb" value="'.$ressymb.'">'."\n".
+              '<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);
@@ -722,13 +725,13 @@ END
 			&postingform_display($mode,$ressymb,$now,$subject,
 					     $comment,$outputtarget,$attachnum,
 					     $currnewattach,$currdelold,
-					     $group);
+					     $group,$crstype);
                 }
             } else {
 	        $discussion.= 
 		    &postingform_display($mode,$ressymb,$now,$subject,
 					 $comment,$outputtarget,$attachnum,
-					 $currnewattach,$currdelold);
+					 $currnewattach,$currdelold,'',$crstype);
             }
 	}
     } else {
@@ -765,19 +768,19 @@ sub send_message_link {
     my $output = '<span class="LC_message_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>';
+                 &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
+                 '" border="0" />'.&mt('Send Feedback').'</a></span>';
     return $output;
 }
 
 sub action_links_bar {
     my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
-    my $discussion = '<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
-                     '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
+    my $discussion = '<tr><td class="LC_disc_action_links_bar" colspan="'.$colspan.'">'.
+                     '<table width="100%" class="LC_disc_action_table"><tr>'.
+                     '<td class="LC_disc_action_left">';
     my $escsymb=&escape($ressymb);
     if ($visible>2) {
-        $discussion .= '<td align="left">'.
-                       '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
+        $discussion .= '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
         if ($newpostsflag) {
             $discussion .= '&previous='.$prevread;
         }
@@ -789,16 +792,14 @@ sub action_links_bar {
         }
         $discussion .= &group_args($group);
         $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
-                       <a href= "/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
+                       <a href="/adm/feedback?cmd=sortfilter&amp;symb='.$escsymb;
         if ($newpostsflag) {
             $discussion .= '&previous='.$prevread;
         }
         $discussion .= &group_args($group);
-        $discussion .='">'.&mt('Sorting/Filtering options').'</a>&nbsp;&nbsp';
-    } else {
-        $discussion .= '<td align="left">';
+        $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.('&nbsp;' x2);
     }
-    $discussion .='<a href= "/adm/feedback?export='.$escsymb;
+    $discussion .='<a href="/adm/feedback?export='.$escsymb;
     if ($newpostsflag) {
         $discussion .= '&previous='.$prevread;
     }
@@ -806,7 +807,7 @@ sub action_links_bar {
     $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
     if ($newpostsflag) {
         if (!$markondisp) {
-            $discussion .='<td align="right"><a href="/adm/preferences?action=changediscussions';
+            $discussion .='<td class="LC_disc_action_right"><a href="/adm/preferences?action=changediscussions';
             $discussion .= &group_args($group);
             $discussion .= '">'.
                            &mt('Preferences on what is marked as NEW').
@@ -825,7 +826,7 @@ sub action_links_bar {
 
 sub postingform_display {
     my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
-        $currnewattach,$currdelold,$group) = @_;
+        $currnewattach,$currdelold,$group,$crstype) = @_;
     my $newattachmsg;
     my %lt = &Apache::lonlocal::texthash(
               'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
@@ -834,6 +835,9 @@ sub postingform_display {
              'poan' => 'Post Anonymous Discussion',
              'newa' => 'New attachments',
     );
+    if ($crstype eq 'Community') {
+        $lt{'note'} = &mt('Note: in anonymous discussion, your name is visible only to community facilitators');
+    }
     my $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" />
@@ -861,7 +865,7 @@ ENDDISCUSS
     }
     my $blockblog = &Apache::loncommon::blocking_status('blogs');
     if (!$blockblog) {
-        $postingform .= &add_blog_checkbox();
+        $postingform .= &add_blog_checkbox($crstype);
     }
     $postingform .= "</form>\n";
     if ($outputtarget ne 'tex') {
@@ -1247,7 +1251,7 @@ sub build_posting_display {
                                  <p><table border="0" width="100%">
                                   <tr><td align="left">&nbsp;</td>';
                             }
-                            $$discussionitems[$idx] .= '<td align ="left">&nbsp;&nbsp;'.
+                            $$discussionitems[$idx] .= '<td align="left">&nbsp;&nbsp;'.
                                 '<b>'.$subject.'</b>&nbsp;&nbsp;'.
                                 $sender.'</b> '.$vgrlink.' ('.
                                 &Apache::lonlocal::locallocaltime($posttime).')</td>';
@@ -1478,7 +1482,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',
@@ -1618,7 +1621,7 @@ END
       $comment = &unescape($env{'form.comment'});
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
   }
-  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
+  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet(undef,undef,1);
   my $send=&mt('Send');
   my $alert = &mt('Please select a feedback type.');
   my $js= <<END;
@@ -1684,17 +1687,18 @@ END
 END
   } elsif ($env{'form.editdisc'}) {
      $r->print(<<END);
-<input type="hidden" name="editdisc" value ="$env{'form.editdisc'}" />
-<input type="hidden" name="parentmsg" value ="$parentmsg" />
+<input type="hidden" name="editdisc" value="$env{'form.editdisc'}" />
+<input type="hidden" name="parentmsg" value="$parentmsg" />
 END
   }
   $r->print(<<END);
-$lt{'plch'}
 $options<hr />
 $quote
 <p>$lt{'myqu'}</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" wrap="hard">$comment
@@ -1795,7 +1799,7 @@ sub print_display_options {
         'actn' => 'Action',
         'deff' => 'Default for all discussions',
         'prca' => 'Preferences can be set for this discussion that determine ....',
-        'whpo' => 'Which posts are displayed when you display this bulletin board or resource, and',
+        'whpo' => 'Which posts are displayed when you display this discussion board or resource, and',
         'unwh' => 'Under what circumstances posts are identified as "NEW", and',
         'wipa' => 'Whether individual posts can be marked as read/unread',
         'allposts' => 'All posts',
@@ -1925,7 +1929,7 @@ END
 	&Apache::loncommon::end_page();
     $r->print(<<END);
 $start_page
-<form name="modifydisp" method="POST" action="/adm/feedback">
+<form name="modifydisp" method="post" action="/adm/feedback">
 $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li><li>$lt{'wipa'}</li></ol>
 <br />
 END
@@ -1960,7 +1964,7 @@ END
        <td>$lt{$disctogg}</td>
        <td><label><input type="checkbox" name="disctogg" onClick="discdispChk('2')" />$lt{'chgt'} "$toggchange"</label></td>
 END
-    my $save = &mt('Save Changes');
+    my $save = &mt('Save');
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
     $r->print(<<END);
@@ -1968,9 +1972,9 @@ END
 <br />
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="previous" value="$previous" />
-<input type="hidden" name="$dispchgA" value=""/>
-<input type="hidden" name="$dispchgB" value=""/>
-<input type="hidden" name="$markchg" value=""/>
+<input type="hidden" name="$dispchgA" value="" />
+<input type="hidden" name="$dispchgB" value="" />
+<input type="hidden" name="$markchg" value="" />
 <input type="hidden" name="$toggchg" value="" />
 <input type="button" name="sub" value="$save" onClick="javascript:setDisp()" />
 END
@@ -2003,6 +2007,13 @@ sub print_sortfilter_options {
     my $group_sel = '';
     my $numgroupvis = 5;
     my %sectioncount = &Apache::loncommon::get_sections();
+    my @courseroles = qw(st ad ep ta in);
+    my $crstype = &Apache::loncommon::course_type();
+    my $ccrole = 'cc';
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    }
+    push(@courseroles,$ccrole);
 
     if ($env{'request.course.sec'} !~ /^\s*$/) {  #Restrict section choice to current section 
         @sections = ('all',$env{'request.course.sec'});
@@ -2066,7 +2077,7 @@ sub print_sortfilter_options {
     my %sort_types = ();
     my %role_types = ();
     my %status_types = ();
-    &sort_filter_names(\%sort_types,\%role_types,\%status_types);
+    &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
 
     my $js = <<END;
 <script type="text/javascript">
@@ -2113,7 +2124,7 @@ END
 
     $r->print(<<END);
 $start_page
-<form name="modifyshown" method="POST" action="/adm/feedback">
+<form name="modifyshown" method="post" action="/adm/feedback">
 <b>$lt{'diso'}</b><br/> $lt{'prca'}
 <br /><br />
 <table border="0">
@@ -2152,25 +2163,26 @@ $start_page
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="rolefilter" multiple="true" size="5">
+   <select name="rolefilter" multiple="multiple" size="5">
     <option value="all">$role_types{'all'}</option>
     <option value="st">$role_types{'st'}</option>
-    <option value="cc">$role_types{'cc'}</option>
+    <option value="$ccrole">$role_types{$ccrole}</option>
     <option value="in">$role_types{'in'}</option>
     <option value="ta">$role_types{'ta'}</option>
     <option value="ep">$role_types{'ep'}</option>
+    <option value="ad">$role_types{'ad'}</option>
     <option value="cr">$role_types{'cr'}</option>
    </select>
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="sectionpick" multiple="true" size="$numvisible">
+   <select name="sectionpick" multiple="multiple" size="$numvisible">
     $section_sel
    </select>
   </td>
   <td>&nbsp;</td>
   <td align="center" valign="top">
-   <select name="grouppick" multiple="true" size="$numvisible">
+   <select name="grouppick" multiple="multiple" size="$numvisible">
     $group_sel
    </select>
   </td>
@@ -2475,7 +2487,8 @@ sub redirect_back {
   }
   my $grouptag;
   if ($group ne '') {
-      $grouptag = '<input type="hidden" name="group" value="'.$group.'" />';      my $refarg;
+      $grouptag = '<input type="hidden" name="group" value="'.$group.'" />';
+      my $refarg;
       if (exists($env{'form.ref'})) {
           $refarg = '&amp;ref='.$env{'form.ref'};
           $grouptag .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
@@ -2557,6 +2570,22 @@ ENDNOREDIRTWO
 
 sub screen_header {
     my ($feedurl,$symb) = @_;
+    my $crscontent = &mt('Question/Comment/Feedback about course content');
+    my $crspolicy = &mt('Question/Comment/Feedback about course policy');
+    my $contribdisc = &mt('Contribution to course discussion of resource');
+    my $anoncontrib = &mt('Anonymous contribution to course discussion of resource');
+    my $namevis = &mt('name only visible to course faculty');
+    my $crstype;
+    if ($env{'request.course.id'}) {
+        $crstype = &Apache::loncommon::course_type();
+        if ($crstype eq 'Community') {
+            $crscontent = &mt('Question/Comment/Feedback about community content');
+            $crspolicy = &mt('Question/Comment/Feedback about community policy');
+            $contribdisc = &mt('Contribution to community discussion of resource');
+            $anoncontrib = &mt('Anonymous contribution to community discussion of resource');
+            $namevis = &mt('name only visible to community facilitators');
+        }
+    }
     my $msgoptions='';
     my $discussoptions='';
     unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
@@ -2577,13 +2606,13 @@ sub screen_header {
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
 		'<p><label><input type="radio" name="discuss" value="course" /> '.
-		($optionhash{'comment'}?$optionhash{'comment'}:&mt('Question/Comment/Feedback about course content')).
+		($optionhash{'comment'}?$optionhash{'comment'}:$crscontent).
 		'</label></p>';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
 		'<p><label><input type="radio" name="discuss" value="policy" /> '.
-		($optionhash{'policy'}?$optionhash{'policy'}:&mt('Question/Comment/Feedback about course policy')).
+		($optionhash{'policy'}?$optionhash{'policy'}:$crspolicy).
 		'</label></p>';
 	}
     }
@@ -2594,20 +2623,28 @@ sub screen_header {
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
 	    $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
-		&mt('Contribution to course discussion of resource');
-	        $discussoptions.='</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
-		&mt('Anonymous contribution to course discussion of resource').
-		' <i>('.&mt('name only visible to course faculty').')</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) {
-                $discussoptions.= &add_blog_checkbox();
+                $discussoptions.= &add_blog_checkbox($crstype);
             }
         }
     }
-    if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($msgoptions) {
+        $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').'" />'
+                   .' '.&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>'.$discussoptions; }
+	$discussoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').'" />'
+                        .' '.&mt('Discussion Contributions').'</h2><p>'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'</p>'
+                        .$discussoptions;
+    }
     return $msgoptions.$discussoptions;
 }
 
@@ -2889,9 +2926,18 @@ sub show_preview {
 					
     my $end_page = &Apache::loncommon::end_page();
 
-    $r->print($start_page.'<table border="2"><tr><td>'.
-	      '<b>'.&mt('Subject').':</b> '.$subject.'<br /><br />'.
-	      $message.'</td></tr></table>'.$end_page);
+    $r->print($start_page
+             .'<h1>'.&mt('Preview').'</h1>'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title(&mt('Subject'))
+             .$subject
+             .&Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_title(&mt('Message'))
+             .$message
+             .&Apache::lonhtmlcommon::row_closure(1)
+             .&Apache::lonhtmlcommon::end_pick_box()
+             .$end_page
+    );
 }
 
 
@@ -2924,7 +2970,7 @@ sub generate_preview_button {
     return(<<ENDPREVIEW);
 <br />
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
-<input type="hidden" name="subject">
+<input type="hidden" name="subject" />
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
 onClick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
@@ -3033,7 +3079,7 @@ END
         $r->print('<input type="hidden" name="deloldattach" value="'.$item.'" />'."\n");
     }
     $r->print(<<END);
- <input type="button" name="rtntoedit" value="$lt{'stch'}" onClick="setAction()"/>
+ <input type="button" name="rtntoedit" value="$lt{'stch'}" onClick="setAction()" />
 </form>
 $end_page
 END
@@ -3095,8 +3141,8 @@ this.form.submit();" />
 <input type="hidden" name="timestamp" value="$now" />
 <input type="hidden" name="subject" />
 <input type="hidden" name="comment" />
-<input type="hidden" name="blog" value = "0" />
-<input type="hidden" name="discuss" value = "0" />
+<input type="hidden" name="blog" value="0" />
+<input type="hidden" name="discuss" value="0" />
 <input type="hidden" name="numoldver" value="$numoldver" />
 ENDATTACH
     if (defined($deloldattach)) {
@@ -3225,7 +3271,8 @@ sub construct_attachmenturl {
 }
 
 sub add_blog_checkbox {
-    my ($checkstatus);
+    my ($crstype) = @_;
+    my $checkstatus;
     if ($env{'form.blog'}) {
         $checkstatus = 'checked="checked"';
     }
@@ -3239,27 +3286,39 @@ function setblogvalue() {
     }
 }
 </script><br />
-<label><input type="checkbox" name="blog" '.$checkstatus.' /> '.
-&mt('Add to my public course blog').'</label><br />'."\n";
+<label><input type="checkbox" name="blog" '.$checkstatus.' /> ';
+    if ($crstype eq 'Community') {
+        $output .= &mt('Add to my public community blog');
+    } else {
+        $output .= &mt('Add to my public course blog');
+    } 
+    $output .= '</label><br />'."\n";
     return $output;
 }
 
 sub has_discussion {
     my $resourcesref = shift;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my @allres=$navmap->retrieveResources();
-    foreach my $resource (@allres) {
-        if ($resource->hasDiscussion()) {
-            my $ressymb = $resource->wrap_symb();
-            push(@{$resourcesref}, $ressymb);
+    if (defined($navmap)) {
+        my @allres=$navmap->retrieveResources();
+        foreach my $resource (@allres) {
+            if ($resource->hasDiscussion()) {
+                my $ressymb = $resource->wrap_symb();
+                if (ref($resourcesref) eq 'ARRAY') {
+                    push(@{$resourcesref}, $ressymb);
+                }
+            }
         }
+    } else {
+        &Apache::lonnet::logthis('Has discussion check failed - could not create navmap object.');
     }
     return;
 }
 
 sub sort_filter_names {
-    my ($sort_types,$role_types,$status_types) = @_;
-    %{$sort_types} = (
+    my ($sort_types,$role_types,$status_types,$crstype) = @_;
+    if (ref($sort_types) eq 'HASH') {
+        %{$sort_types} = (
                      ascdate => 'Date order - oldest first',
                      descdate => 'Date order - newest first',
                      thread => 'Threaded',
@@ -3267,24 +3326,30 @@ sub sort_filter_names {
                      username => 'By domain and username',
                      lastfirst => 'By last name, first name'
                    );
-    %{$role_types} = (
-                     all => 'All roles',
-                     st  => 'Students',
-                     cc  => 'Course Coordinators',
-                     in  => 'Instructors',
-                     ta  => 'TAs',
-                     ep  => 'Exam proctors',
-                     ad  => 'Administrators',
-                     cr  => 'Custom roles'
-                   );
-    %{$status_types} = (
-                     all     => 'Roles of any status',
-                     Active  => 'Only active roles',
-                     Expired => 'Only past roles',
-                     Future  => 'Only future roles',
-                   );
+    }
+    my @courseroles = qw(st in ta ep ad);
+    if ($crstype eq 'Community') {
+        push(@courseroles,'co');
+    } else {
+        push(@courseroles,'cc');
+    }
+    if (ref($role_types) eq 'HASH') {
+        foreach my $role (@courseroles) {
+            $role_types->{$role} = &Apache::lonnet::plaintext($role,$crstype);
+        }
+        $role_types->{'all'} = 'All roles';
+        $role_types->{'cr'} = 'Custom role';
+    }
+    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',
+                    );
+    }
 }
-  
+
 sub handler {
   my $r = shift;
   if ($r->header_only) {
@@ -3299,7 +3364,7 @@ sub handler {
          ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
   my $group = $env{'form.group'};
   my %attachmax = (
-                    text => '(128 KB max size)',
+                    text => &mt('(128 KB max size)'),
                     num  => 131072,
                   );
   if ($env{'form.editdisc'}) {
@@ -3429,7 +3494,7 @@ sub handler {
       my %lt = &Apache::lonlocal::texthash(
           'mnpa' => 'Marked "New" posts as read in a total of',
           'robb' => 'resources/bulletin boards.',
-          'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
+          'twnp' => 'There are currently no resources or discussion boards with unread discussion postings.'
       );       
       foreach my $res (@resources) {
           my $ressymb=$res;
@@ -3575,7 +3640,7 @@ ENDREDIR
 	  &Apache::lonnet::appenv({'environment.threadeddiscussion' => 'on'});
       } else {
  	  &Apache::lonnet::del('environment',['threadeddiscussion']);
-	  &Apache::lonnet::delenv('environment\.threadeddiscussion');
+	  &Apache::lonnet::delenv('environment.threadeddiscussion');
       }
       &redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
 		     '0','0','','',$env{'form.previous'},undef,undef,undef,
@@ -3654,7 +3719,7 @@ ENDREDIR
   } else {
 # ------------------------------------------------------------- Normal feedback
       my $feedurl=$env{'form.postdata'};
-      $feedurl=~s/^http\:\/\///;
+      $feedurl=~s/^https?\:\/\///;
       $feedurl=~s/^$ENV{'SERVER_NAME'}//;
       $feedurl=~s/^$ENV{'HTTP_HOST'}//;
       $feedurl=~s/\?.+$//;
@@ -3810,7 +3875,11 @@ ENDREDIR
 				    $env{'user.domain'},
 				    'CourseBlog_'.$env{'request.course.id'},
 				    $subject,$message,$feedurl,'public');
-	  $blog='<br />'.&mt('Added to my course blog').'<br />';
+          if (&Apache::loncommon::course_type() eq 'Community') {
+              $blog='<br />'.&mt('Added to my community blog').'<br />';
+          } else {
+	      $blog='<br />'.&mt('Added to my course blog').'<br />';
+          }
       }
 	  
 # Receipt screen and redirect back to where came from
@@ -4086,4 +4155,4 @@ None
 
 =back
 
-=cut
\ No newline at end of file
+=cut