--- loncom/html/res/adm/pages/annotator/admannotations.pm 2005/04/07 06:56:22 1.19 +++ loncom/html/res/adm/pages/annotator/admannotations.pm 2006/04/10 23:32:53 1.22 @@ -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.19 2005/04/07 06:56:22 albertel Exp $ +# $Id: admannotations.pm,v 1.22 2006/04/10 23:32:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,13 +31,13 @@ package Apache::admannotations; use strict; use Apache::Constants qw(:common); +use Apache::loncommon(); use Apache::lonnet; # --------------------------------------------------------------Put annotation sub write_annotation { - my $urlold=shift; - my $annotation=shift; + my ($urlold, $annotation) = @_; if ($annotation) { &Apache::lonnet::put('nohist_annotations',{$urlold => $annotation}); } @@ -47,7 +47,7 @@ sub write_annotation { # --------------------------------------------------------------Get annotation sub get_annotation { - my $urlnew=shift; + my ($urlnew) = @_; my %annotation=&Apache::lonnet::get('nohist_annotations',[$urlnew]); return %annotation; } @@ -55,14 +55,11 @@ sub get_annotation { # ------------------------------------------------------------Construct editor sub construct_editor { - my $annotation=shift; + my ($annotation,$urlnew) = @_; if ($annotation=~/^error:/) { $annotation=''; } - my $urlnew=shift; - return(< - -Annotations - - - +ENDJS + + my %load_items = ('onload' => "timeout=setTimeout('changed()','1000')", + 'onunload' => 'clearTimeout(timeout);'); + my $start_page = + &Apache::loncommon::start_page('Annotations',$js, + {'only_body' => 1, + 'add_entries' => \%load_items,}); + + my $end_page = + &Apache::loncommon::end_page(); + return(< -
-
- - - - -
+
+
+ + + + +
- - +$end_page END_HTML } # ----------------------------------------------------Constructs error window sub construct_error { - my $annot_error=shift; - my $button_name=shift; - return(< -Annotations - - + my ($annot_error,$button_name) = @_; + my $start_page = &Apache::loncommon::start_page('Annotations',undef, + {'only_body' => 1,}); + my $end_page = &Apache::loncommon::end_page(); + + return(< -
+
- + $annot_error
- - - - -
+ + + + + - - +$end_page END_HTML2 } # ---------------------------------------------------------------Main Handler sub handler { - my $r=shift; + my $r=shift; - $r->content_type('text/html'); - $r->send_http_header; - return OK if $r->header_only; - - - my $page; - my %annot_hash; - - my $urlold=$env{'form.urlold'}; - $urlold=~s/^http\:\/\///; - $urlold=~s/^[^\/]+//; - $urlold=~s/\?.*$//; - my $urlnew=$env{'form.urlnew'}; - $urlnew=~s/^http\:\/\///; - $urlnew=~s/^[^\/]+//; - $urlnew=~s/\?.*$//; - my $annotation=$env{'form.annotation'}; - - if ($urlold) { - write_annotation($urlold,$annotation); - } - 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"); - } else { - if ($urlold eq $urlnew) { - $annot_hash{$urlnew}=$annotation; - } else { - %annot_hash=get_annotation($urlnew); - } - $page=construct_editor($annot_hash{$urlnew},$env{'form.urlnew'}); - } - } - $r->print($page); - return OK; + $r->content_type('text/html'); + $r->send_http_header; + return OK if $r->header_only; + + + my $page; + my %annot_hash; + + my $urlold=$env{'form.urlold'}; + $urlold=~s/^http\:\/\///; + $urlold=~s/^[^\/]+//; + $urlold=~s/\?.*$//; + my $urlnew=$env{'form.urlnew'}; + $urlnew=~s/^http\:\/\///; + $urlnew=~s/^[^\/]+//; + $urlnew=~s/\?.*$//; + my $annotation=$env{'form.annotation'}; + + if ($urlold) { + &write_annotation($urlold,$annotation); + } + 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"); + } else { + if ($urlold eq $urlnew) { + $annot_hash{$urlnew}=$annotation; + } else { + %annot_hash=&get_annotation($urlnew); + } + $page=&construct_editor($annot_hash{$urlnew},$env{'form.urlnew'}); + } + } + $r->print($page); + return OK; } 1;