--- loncom/interface/lonfeedback.pm 2010/01/25 03:30:23 1.273.4.5 +++ loncom/interface/lonfeedback.pm 2009/07/09 12:53:28 1.275 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.273.4.5 2010/01/25 03:30:23 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.275 2009/07/09 12:53:28 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 '
'.&send_message_link($ressymb); + return '
'.&send_message_link($ressymb)."
"; } } if ($group ne '' && $mode eq 'board') { @@ -103,9 +103,12 @@ sub list_discussion { my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards'); if ($blocked) { + $blocktext = '
'.$blocktext.""; &Apache::lonenc::check_encrypt(\$ressymb); if ($mode ne 'board') { - $blocktext.='
'.&send_message_link($ressymb); + $blocktext.=&send_message_link($ressymb).'
'; + }else{ + $blocktext.=""; } return $blocktext; } @@ -169,8 +172,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 = (); @@ -567,7 +568,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/ + $lt{'cuse'}:
- $lt{'cuse'}:  END @@ -589,7 +590,7 @@ END   - $lt{'chgt'}? + $lt{'chgt'}?
@@ -599,7 +600,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 .= ''.&mt('Sorted by').': '.$sort_types{$sortposts}.'
'; if (defined($env{'form.totposters'})) { @@ -725,13 +726,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 +758,9 @@ sub send_feedback_link { my $output = ''. ' '. - ''.&mt('Post Discussion').''; + '" border="0" />'.&mt('Post Discussion').''; return $output; } @@ -767,20 +768,20 @@ sub send_message_link { my ($ressymb) = @_; my $output = ''. ' '.&mt('Send Feedback').''; + '" border="0" />'.&mt('Send Feedback').''; return $output; } sub action_links_bar { my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_; my $discussion = ''. - ''. - '
'; + ''; my $escsymb=&escape($ressymb); if ($visible>2) { - $discussion .= ''. + ''.&mt('Sorting/Filtering options').''.(' ' x2); + } else { + $discussion .= ''; + $discussion .= '">'.&mt('Mark NEW posts no longer new').''; } else { $discussion .= ''; } @@ -826,7 +829,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 +838,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 = (< @@ -865,7 +865,7 @@ ENDDISCUSS } my $blockblog = &Apache::loncommon::blocking_status('blogs'); if (!$blockblog) { - $postingform .= &add_blog_checkbox($crstype); + $postingform .= &add_blog_checkbox(); } $postingform .= "\n"; if ($outputtarget ne 'tex') { @@ -1014,7 +1014,6 @@ sub build_posting_display { $contrib{$idx.':senderdomain'}).' ('. $contrib{$idx.':sendername'}.':'. $contrib{$idx.':senderdomain'}.')'; - $sender = ''.$sender.''; if ($contrib{$idx.':anonymous'}) { $sender.=' ['.$$anonhash{$key}.'] '. $screenname; @@ -1022,7 +1021,6 @@ sub build_posting_display { if ($see_anonymous) { $sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'}); } - $sender = ''.$sender.''; # Set up for sorting by domain, then username unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) { %{$$usernamesort{$contrib{$idx.':senderdomain'}}} = (); @@ -1255,7 +1253,7 @@ sub build_posting_display { } $$discussionitems[$idx] .= ''; if ($$dischash{$toggkey}) { $$discussionitems[$idx].='

'.&mt('Mark NEW posts no longer new').'		   '. ''.$subject.'  '. - $sender.' '.$vgrlink.' ('. + $sender.' '.$vgrlink.' ('. &Apache::lonlocal::locallocaltime($posttime).')  '. @@ -1484,6 +1482,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', @@ -1694,6 +1693,7 @@ END END } $r->print(< $quote

$lt{'myqu'}

@@ -2009,13 +2009,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'}); @@ -2079,7 +2072,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 = < @@ -2131,17 +2124,17 @@ $start_page

- - - - - - - - - - - + + + + + + + + + + + @@ -2572,22 +2564,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'})) { @@ -2608,13 +2584,13 @@ sub screen_header { if (&feedback_available(0,1)) { $msgoptions.= '

'; } if (&feedback_available(0,0,1)) { $msgoptions.= '

'; } } @@ -2625,26 +2601,25 @@ sub screen_header { $env{'request.course.id'}. ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { $discussoptions='
'. - + &mt('Contribution to course discussion of resource'); + $discussoptions.='
'. ''.&mt('Change Screenname').''; my $blockblog = &Apache::loncommon::blocking_status('blogs'); if (!$blockblog) { - $discussoptions.= &add_blog_checkbox($crstype); + $discussoptions.= &add_blog_checkbox(); } } } if ($msgoptions) { $msgoptions='

' - .' '.&mt('Send Feedback').'

'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'

' + .' '.&mt('Send Feedback').'' .$msgoptions; } if ($discussoptions) { $discussoptions='

' - .' '.&mt('Discussion Contributions').'

'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'

' + .' '.&mt('Discussion Contributions').'' .$discussoptions; } return $msgoptions.$discussoptions; @@ -2942,19 +2917,6 @@ 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*/>| - >.* - )}xs - ); -} sub newline_to_br { my ($message)=@_; @@ -3043,7 +3005,7 @@ $toolarge
$lt{'soor'} $lt{'sprs'} $lt{'spur'} $lt{'spse'} $lt{'spgr'} $lt{'psub'}$lt{'soor'} $lt{'sprs'} $lt{'spur'} $lt{'spse'} $lt{'spgr'} $lt{'psub'}
@@ -2168,11 +2161,10 @@ $start_page
- Subject: $subject

+ Subject: $subject

END if ($idx) { if ($attachmenturls) { @@ -3286,8 +3248,7 @@ sub construct_attachmenturl { } sub add_blog_checkbox { - my ($crstype) = @_; - my $checkstatus; + my ($checkstatus); if ($env{'form.blog'}) { $checkstatus = 'checked="checked"'; } @@ -3301,13 +3262,8 @@ function setblogvalue() { } }
-
'."\n"; +
'."\n"; return $output; } @@ -3331,9 +3287,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', @@ -3341,30 +3296,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) { @@ -3890,11 +3839,7 @@ ENDREDIR $env{'user.domain'}, 'CourseBlog_'.$env{'request.course.id'}, $subject,$message,$feedurl,'public'); - if (&Apache::loncommon::course_type() eq 'Community') { - $blog='
'.&mt('Added to my community blog').'
'; - } else { - $blog='
'.&mt('Added to my course blog').'
'; - } + $blog='
'.&mt('Added to my course blog').'
'; } # Receipt screen and redirect back to where came from