--- loncom/interface/lonevaluate.pm 2006/03/02 21:11:00 1.18 +++ loncom/interface/lonevaluate.pm 2006/12/05 02:55:52 1.20 @@ -1,7 +1,7 @@ # The LearningOnline Network # Evaluate # -# $Id: lonevaluate.pm,v 1.18 2006/03/02 21:11:00 albertel Exp $ +# $Id: lonevaluate.pm,v 1.20 2006/12/05 02:55:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,10 +33,13 @@ use Apache::lonnet; use Apache::Constants qw(:common); use Apache::loncommon(); use Apache::lonenc(); +use LONCAPA(); sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); + &Apache::loncommon::no_cache($r); + $r->send_http_header; return OK if $r->header_only; @@ -51,7 +54,7 @@ sub handler { my $title=&Apache::lonnet::gettitle($feedurl); my $showurl=&Apache::lonenc::check_encrypt($feedurl); - my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//); + my ($rdomain,$rauth)=($feedurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\//); my $prefix=$env{'user.name'}.'@'.$env{'user.domain'}.'___'. $feedurl.'___'; @@ -70,8 +73,6 @@ sub handler { my $warning=''; - my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource'); - if ($env{'form.submiteval'} eq 'true') { # ------------------------------------------------ User is submitting something my $complete=1; @@ -84,11 +85,7 @@ sub handler { } if ($complete) { my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl)); - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -Evaluation submitted + my $js =< function goback() { if ((window.name=='loncapaclient')) { @@ -98,9 +95,12 @@ $html } } - - -$bodytag +ENDJS + + my $start_page = + &Apache::loncommon::start_page('Evaluate Resource',$js); + $r->print(<Thank you for your input! ENDHEADER $r->print('Storing feedback: '. @@ -109,7 +109,7 @@ ENDHEADER $r->print('
Logging first evaluation'); } $r->print( - ''); + ''.&Apache::loncommon::end_page()); return OK; } else { $warning='Please fill out all fields below'; @@ -143,13 +143,10 @@ ENDHEADER ENDOPTIONS - my $html=&Apache::lonxml::xmlbegin(); + my $start_page = &Apache::loncommon::start_page('Evaluate Resource'); + my $end_page = &Apache::loncommon::end_page(); $r->print(< -The LearningOnline Network with CAPA - -$bodytag +$start_page $title

$warning

Please rank the following criteria: @@ -187,8 +184,7 @@ Any comments?
- - +$end_page ENDDOCUMENT return OK; }