Diff for /loncom/interface/lonevaluate.pm between versions 1.18 and 1.19

version 1.18, 2006/03/02 21:11:00 version 1.19, 2006/03/19 22:22:49
Line 37  use Apache::lonenc(); Line 37  use Apache::lonenc();
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
       &Apache::loncommon::no_cache($r);
       
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
Line 70  sub handler { Line 72  sub handler {
   
     my $warning='';      my $warning='';
   
     my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource');  
   
     if ($env{'form.submiteval'} eq 'true') {      if ($env{'form.submiteval'} eq 'true') {
 # ------------------------------------------------ User is submitting something  # ------------------------------------------------ User is submitting something
         my $complete=1;          my $complete=1;
Line 84  sub handler { Line 84  sub handler {
         }          }
         if ($complete) {          if ($complete) {
     my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl));      my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl));
     my $html=&Apache::lonxml::xmlbegin();      my $js =<<ENDJS;
     $r->print(<<ENDHEADER);  
 $html  
 <head>  
 <title>Evaluation submitted</title>  
 <script type="text/javascript">  <script type="text/javascript">
     function goback() {      function goback() {
  if ((window.name=='loncapaclient')) {   if ((window.name=='loncapaclient')) {
Line 98  $html Line 94  $html
         }          }
     }      }
 </script>  </script>
 <meta http-equiv="pragma" content="no-cache"></meta>  ENDJS
 </head>  
 $bodytag              my $start_page = 
           &Apache::loncommon::start_page('Evaluate Resource',$js);
       $r->print(<<ENDHEADER);
   $start_page
 <h1>Thank you for your input!</h1>  <h1>Thank you for your input!</h1>
 ENDHEADER  ENDHEADER
        $r->print('Storing feedback: '.         $r->print('Storing feedback: '.
Line 109  ENDHEADER Line 108  ENDHEADER
        $r->print('<br />Logging first evaluation');         $r->print('<br />Logging first evaluation');
            }             }
            $r->print(             $r->print(
             '<script type="text/javascript">setTimeout("goback()",2000);</script></body></html>');              '<script type="text/javascript">setTimeout("goback()",2000);</script>'.&Apache::loncommon::end_page());
            return OK;             return OK;
         } else {          } else {
     $warning='Please fill out all fields below';      $warning='Please fill out all fields below';
Line 143  ENDHEADER Line 142  ENDHEADER
 <option value="5">Strongly Agree</option>  <option value="5">Strongly Agree</option>
 ENDOPTIONS  ENDOPTIONS
           
     my $html=&Apache::lonxml::xmlbegin();      my $start_page = &Apache::loncommon::start_page('Evaluate Resource');
       my $end_page   = &Apache::loncommon::end_page();
     $r->print(<<ENDDOCUMENT);      $r->print(<<ENDDOCUMENT);
 $html  $start_page
 <head>  
 <title>The LearningOnline Network with CAPA</title>  
 </head>  
 $bodytag  
 <tt>$title</tt><br /><br />  <tt>$title</tt><br /><br />
 <h3><font color="red">$warning</font></h3>  <h3><font color="red">$warning</font></h3>
 Please rank the following criteria:  Please rank the following criteria:
Line 187  Any comments? Line 183  Any comments?
 <script type="text/javascript">$dialold</script>  <script type="text/javascript">$dialold</script>
 <br /><input type="submit" value="Submit Evaluation" />  <br /><input type="submit" value="Submit Evaluation" />
 </form>  </form>
 </body>  $end_page
 </html>  
 ENDDOCUMENT  ENDDOCUMENT
     return OK;      return OK;
 }   } 

Removed from v.1.18  
changed lines
  Added in v.1.19


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>