--- loncom/html/res/adm/pages/annotator/admannotations.pm 2006/04/10 23:37:25 1.23 +++ loncom/html/res/adm/pages/annotator/admannotations.pm 2006/04/11 15:52:33 1.25 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # This will take annotations and then plug them into a page. # -# $Id: admannotations.pm,v 1.23 2006/04/10 23:37:25 albertel Exp $ +# $Id: admannotations.pm,v 1.25 2006/04/11 15:52:33 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,7 +59,7 @@ sub construct_editor { my ($annotation,$urlnew) = @_; if ($annotation=~/^error:/) { $annotation=''; } - my $js = << ENDJS; + my $js = < var timeout; @@ -143,9 +143,9 @@ END_HTML2 # ---------------------------------------------------------------Main Handler sub handler { - my $r=shift; - - $r->content_type('text/html'); + my ($r) = @_; + + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -168,7 +168,7 @@ sub handler { } if (exists($env{'form.urlnew'})) { unless ($urlnew) { - $page=&construct_error("Cannot annotate current window. Please point your browser to a LON-CAPA page and then 'continue'.","continue"); + $page=&construct_error(&mt("Cannot annotate current window. Please point your browser to a LON-CAPA page and then 'continue'."),"continue"); } else { if ($urlold eq $urlnew) { $annot_hash{$urlnew}=$annotation;