--- loncom/interface/lonfeedback.pm	2010/01/24 03:13:55	1.273.4.3
+++ loncom/interface/lonfeedback.pm	2009/05/28 19:38:33	1.274
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.273.4.3 2010/01/24 03:13:55 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.274 2009/05/28 19:38:33 kalberla Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,7 +91,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') {
@@ -105,7 +105,7 @@ sub list_discussion {
     if ($blocked) {
         &Apache::lonenc::check_encrypt(\$ressymb);
         if ($mode ne 'board') {
-            $blocktext.='<br />'.&send_message_link($ressymb);
+            $blocktext.='<br /><div class="LC_feedback_link">'.&send_message_link($ressymb).'</div>';
         }
         return $blocktext; 
     }
@@ -169,8 +169,6 @@ 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 = ();
@@ -599,7 +597,7 @@ END
                 my %sort_types = ();
                 my %role_types = ();
                 my %status_types = ();
-                &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
+                &sort_filter_names(\%sort_types,\%role_types,\%status_types);
 
                 $discussion .= '<td><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
                 if (defined($env{'form.totposters'})) {
@@ -725,13 +723,13 @@ END
 			&postingform_display($mode,$ressymb,$now,$subject,
 					     $comment,$outputtarget,$attachnum,
 					     $currnewattach,$currdelold,
-					     $group,$crstype);
+					     $group);
                 }
             } else {
 	        $discussion.= 
 		    &postingform_display($mode,$ressymb,$now,$subject,
 					 $comment,$outputtarget,$attachnum,
-					 $currnewattach,$currdelold,'',$crstype);
+					 $currnewattach,$currdelold);
             }
 	}
     } else {
@@ -757,9 +755,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;
 }
 
@@ -767,20 +765,20 @@ 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="'.
+                 &escape($ressymb).'"><img alt="" class="LC_noBorder" src="'.
                  &Apache::loncommon::lonhttpdurl('/res/adm/pages/com.png').
-                 '" border="0" />'.&mt('Send Feedback').'</a></span>';
+                 '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span></a></span>';
     return $output;
 }
 
 sub action_links_bar {
     my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
     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">';
+                     '<table width="100%" class="LC_disc_action_table"><tr>';
     my $escsymb=&escape($ressymb);
     if ($visible>2) {
-        $discussion .= '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
+        $discussion .= '<td class="LC_disc_action_left">'.
+                       '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$escsymb;
         if ($newpostsflag) {
             $discussion .= '&previous='.$prevread;
         }
@@ -798,6 +796,8 @@ sub action_links_bar {
         }
         $discussion .= &group_args($group);
         $discussion .='">'.&mt('Sorting/Filtering options').'</a>'.('&nbsp;' x2);
+    } else {
+        $discussion .= '<td class="LC_disc_action_left>';
     }
     $discussion .='<a href="/adm/feedback?export='.$escsymb;
     if ($newpostsflag) {
@@ -826,7 +826,7 @@ sub action_links_bar {
 
 sub postingform_display {
     my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum,
-        $currnewattach,$currdelold,$group,$crstype) = @_;
+        $currnewattach,$currdelold,$group) = @_;
     my $newattachmsg;
     my %lt = &Apache::lonlocal::texthash(
               'note' => 'Note: in anonymous discussion, your name is visible only to course faculty',
@@ -835,9 +835,6 @@ 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" />
@@ -865,7 +862,7 @@ ENDDISCUSS
     }
     my $blockblog = &Apache::loncommon::blocking_status('blogs');
     if (!$blockblog) {
-        $postingform .= &add_blog_checkbox($crstype);
+        $postingform .= &add_blog_checkbox();
     }
     $postingform .= "</form>\n";
     if ($outputtarget ne 'tex') {
@@ -1482,6 +1479,7 @@ 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',
@@ -1692,6 +1690,7 @@ END
 END
   }
   $r->print(<<END);
+$lt{'plch'}
 $options<hr />
 $quote
 <p>$lt{'myqu'}</p>
@@ -2007,13 +2006,6 @@ 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'});
@@ -2077,7 +2069,7 @@ sub print_sortfilter_options {
     my %sort_types = ();
     my %role_types = ();
     my %status_types = ();
-    &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
+    &sort_filter_names(\%sort_types,\%role_types,\%status_types);
 
     my $js = <<END;
 <script type="text/javascript">
@@ -2166,11 +2158,10 @@ $start_page
    <select name="rolefilter" multiple="multiple" size="5">
     <option value="all">$role_types{'all'}</option>
     <option value="st">$role_types{'st'}</option>
-    <option value="$ccrole">$role_types{$ccrole}</option>
+    <option value="cc">$role_types{'cc'}</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>
@@ -2570,22 +2561,6 @@ 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'})) {
@@ -2606,13 +2581,13 @@ sub screen_header {
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
 		'<p><label><input type="radio" name="discuss" value="course" /> '.
-		($optionhash{'comment'}?$optionhash{'comment'}:$crscontent).
+		($optionhash{'comment'}?$optionhash{'comment'}:&mt('Question/Comment/Feedback about course content')).
 		'</label></p>';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
 		'<p><label><input type="radio" name="discuss" value="policy" /> '.
-		($optionhash{'policy'}?$optionhash{'policy'}:$crspolicy).
+		($optionhash{'policy'}?$optionhash{'policy'}:&mt('Question/Comment/Feedback about course policy')).
 		'</label></p>';
 	}
     }
@@ -2623,26 +2598,25 @@ 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" /> '.
-                $contribdisc.
-                '</label><br /><label><input type="radio" name="discuss" value="anon" /> '.
-                $anoncontrib.
-                ' <i>('.$namevis.')</i></label> '.
-
+		&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> '.
 		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
             my $blockblog = &Apache::loncommon::blocking_status('blogs');
             if (!$blockblog) {
-                $discussoptions.= &add_blog_checkbox($crstype);
+                $discussoptions.= &add_blog_checkbox();
             }
         }
     }
     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>'
+                   .' '.&mt('Send Feedback').'</h2>'
                    .$msgoptions;
     }
     if ($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>'
+                        .' '.&mt('Discussion Contributions').'</h2>'
                         .$discussoptions;
     }
     return $msgoptions.$discussoptions;
@@ -3271,8 +3245,7 @@ sub construct_attachmenturl {
 }
 
 sub add_blog_checkbox {
-    my ($crstype) = @_;
-    my $checkstatus;
+    my ($checkstatus);
     if ($env{'form.blog'}) {
         $checkstatus = 'checked="checked"';
     }
@@ -3286,13 +3259,8 @@ function setblogvalue() {
     }
 }
 </script><br />
-<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";
+<label><input type="checkbox" name="blog" '.$checkstatus.' /> '.
+&mt('Add to my public course blog').'</label><br />'."\n";
     return $output;
 }
 
@@ -3316,9 +3284,8 @@ sub has_discussion {
 }
 
 sub sort_filter_names {
-    my ($sort_types,$role_types,$status_types,$crstype) = @_;
-    if (ref($sort_types) eq 'HASH') {
-        %{$sort_types} = (
+    my ($sort_types,$role_types,$status_types) = @_;
+    %{$sort_types} = (
                      ascdate => 'Date order - oldest first',
                      descdate => 'Date order - newest first',
                      thread => 'Threaded',
@@ -3326,30 +3293,24 @@ sub sort_filter_names {
                      username => 'By domain and username',
                      lastfirst => 'By last name, first name'
                    );
-    }
-    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',
-                    );
-    }
+    %{$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',
+                   );
 }
-
+  
 sub handler {
   my $r = shift;
   if ($r->header_only) {
@@ -3875,11 +3836,7 @@ ENDREDIR
 				    $env{'user.domain'},
 				    'CourseBlog_'.$env{'request.course.id'},
 				    $subject,$message,$feedurl,'public');
-          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 />';
-          }
+	  $blog='<br />'.&mt('Added to my course blog').'<br />';
       }
 	  
 # Receipt screen and redirect back to where came from