--- loncom/interface/lonfeedback.pm 2005/02/14 01:37:45 1.149 +++ loncom/interface/lonfeedback.pm 2005/02/17 04:11:20 1.151 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.149 2005/02/14 01:37:45 albertel Exp $ +# $Id: lonfeedback.pm,v 1.151 2005/02/17 04:11:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -974,9 +974,9 @@ sub build_posting_display { $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$ressymb); } if ($$dischash{$readkey}=~/\.$idx\./) { - $ctlink = ''.&mt('Mark unread').'? '; + $ctlink = ''; } else { - $ctlink = ''.&mt('Mark read').'? '; + $ctlink = ''; } } #figure out at what position this needs to print @@ -1753,18 +1753,18 @@ $lt{'sdpf'}
$lt{'prca'}
  1. $l $lt{'disa'} $lt{$discdisp} -  $lt{'chgt'} "$dispchangeA" +
    -  $lt{'chgt'} "$dispchangeB" + $lt{'npmr'} $lt{$discmark} - $lt{'chgt'} "$markchange" + $lt{'dotm'} $lt{$disctogg} - $lt{'chgt'} "$toggchange" + @@ -1929,7 +1929,7 @@ $bodytag   - $lt{'shal'} +
    @@ -2024,7 +2024,7 @@ END next; } else { $count ++; - $r->print(''.$count.''.$last.', '.$first.' ('.$uname.','.$udom.')'.$postcounts{$_}.''); + $r->print(''.$count.''.$postcounts{$_}.''); } } } @@ -2105,9 +2105,10 @@ sub get_post_attachments { return; } -sub fail_redirect {; +sub fail_redirect { my ($r,$feedurl) = @_; if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' }; + my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); $r->print (< Feedback not sent @@ -2115,7 +2116,7 @@ sub fail_redirect {; - + Sorry, no recipients ...
    Continue @@ -2193,6 +2194,7 @@ sub redirect_back { } } $feedurl=&Apache::lonenc::check_encrypt($feedurl); + my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); $r->print (< @@ -2201,7 +2203,7 @@ sub redirect_back { - + $typestyle Sent $sendsomething message(s), and $sendposts post(s). $status @@ -2234,10 +2236,11 @@ ENDNOREDIR &Apache::lonenc::check_encrypt($feedurl).'">'); } $feedurl=&Apache::lonenc::check_encrypt($feedurl); + my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); $r->print (< - + $nofeed
    $continue @@ -2252,23 +2255,25 @@ sub screen_header { unless (($ENV{'form.replydisc'}) || ($ENV{'form.editdisc'})) { if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { $msgoptions= - '

    '. - &mt('Feedback to resource author').'

    '; + '

    '; } if (&feedback_available(1)) { $msgoptions.= - '
    '. - &mt('Question about resource content'); + '

    '; } if (&feedback_available(0,1)) { $msgoptions.= - '
    '. - &mt('Question/Comment/Feedback about course content'); + '

    '; } if (&feedback_available(0,0,1)) { $msgoptions.= - '
    '. - &mt('Question/Comment/Feedback about course policy'); + '

    '; } } if ($ENV{'request.course.id'}) { @@ -2276,12 +2281,12 @@ sub screen_header { &Apache::lonnet::allowed('pch', $ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { - $discussoptions=' '. &mt('Contribution to course discussion of resource'); - $discussoptions.='
    '. + $discussoptions.='
    '; } } if ($msgoptions) { $msgoptions='

    '.&mt('Sending Messages').'

    '.$msgoptions; } @@ -2627,7 +2632,7 @@ END foreach my $id (@currold) { my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); $attachurl =~ m#/([^/]+)$#; - $r->print(' '.$1.'
    '."\n"); + $r->print('
    '."\n"); } $r->print("
    "); } @@ -2637,7 +2642,7 @@ END $r->print("The following attachments have been uploaded for inclusion with this posting.
    Check the checkboxes for any you wish to remove
    \n"); foreach (@{$currnewattach}) { $_ =~ m#/([^/]+)$#; - $r->print(' '.$1.'
    '."\n"); + $r->print('
    '."\n"); } $r->print("
    "); } @@ -3054,6 +3059,7 @@ END } &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; + my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); $r->print (< @@ -3062,7 +3068,7 @@ END - + $textline