Diff for /loncom/homework/structuretags.pm between versions 1.47 and 1.50

version 1.47, 2001/07/13 14:02:35 version 1.50, 2001/08/03 17:48:24
Line 8  use strict; Line 8  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));    &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
 #  &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))  #  &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
 }  }
   
Line 38  sub end_tex { Line 38  sub end_tex {
     return '';      return '';
 }  }
   
   sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
     my $head_tag_start='<head>'.&Apache::lonxml::registerurl();
     my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.
     'onUnload="'.&Apache::lonxml::unloadevents().'" ';
     my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);
     if ($background) {
       $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
                                           $background;
       $body_tag_start.='background="'.$background.'" ';
     } else {
       my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);
       if ($bgcolor) {
         $body_tag_start.='bgcolor="'.$bgcolor.'" ';
       } else {
         $body_tag_start.='bgcolor="#ffffff"';
       }
     }
     $body_tag_start.='>';
     return ($result,$head_tag_start,$body_tag_start);
   }
   
 sub start_problem {  sub start_problem {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
Line 56  sub start_problem { Line 79  sub start_problem {
   my $datemsg;    my $datemsg;
   
   #should get back a <html> or the neccesary stuff to start XML/MathML    #should get back a <html> or the neccesary stuff to start XML/MathML
   my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);    my ($result,$head_tag_start,$body_tag_start)=
       &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
   
   my $head_tag_start='<head>'.&Apache::lonxml::registerurl();  
   my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.  
   'onUnload="'.&Apache::lonxml::unloadevents().'" '.  
     'bgcolor="#FFFFFF">';  
   if ($target eq 'web' || $target eq 'grade') {    if ($target eq 'web' || $target eq 'grade') {
     ($status,$datemsg) = &Apache::lonhomework::check_date('0');      ($status,$datemsg) = &Apache::lonhomework::check_date('0');
     push (@Apache::inputtags::status,$status);      push (@Apache::inputtags::status,$status);
Line 106  sub start_problem { Line 126  sub start_problem {
        <input type="hidden" name="problemmode" value="Edit" />         <input type="hidden" name="problemmode" value="Edit" />
        <input type="submit" name="problemmode" value="View" />         <input type="submit" name="problemmode" value="View" />
        <input type="submit" name="Undo" value="undo" /> <hr />         <input type="submit" name="Undo" value="undo" /> <hr />
          <input type="submit" name="submit" value="Submit Changes" /><br />
       ';        ';
     my $temp=&Apache::edit::insertlist($target,$token);      my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;      $result.=$temp;
Line 139  sub end_problem { Line 160  sub end_problem {
       } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {        } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
  $result.="</body>\n";   $result.="</body>\n";
       }        }
         $result.=&Apache::lonxml::xmlend();
     }      }
   }    }
   if ($target eq 'meta') {    if ($target eq 'meta') {
Line 151  sub end_problem { Line 173  sub end_problem {
     $result='<br /><input type="submit" name="submit" value="Submit Changes" />';      $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
   }    }
   return $result;    return $result;
   }
   
   sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my ($result,$head_tag_start,$body_tag_start)=
       &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
     if ($target eq 'edit') {
       $result.=$head_tag_start."</head>".$body_tag_start.
         '<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">
          <input type="hidden" name="submitted" value="edit" />
          <input type="hidden" name="problemmode" value="Edit" />
          <input type="submit" name="problemmode" value="View" />
          <input type="submit" name="Undo" value="undo" /> <hr />
         ';
       my $temp=&Apache::edit::insertlist($target,$token);
       $result.=$temp;
       return $result;
     }
     if ($target eq 'modified') {
       $result=$token->[4];
       $result.=&Apache::edit::handle_insert();
       return $result;
     }
     return '';
   }
   
   sub end_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
     if ($target eq 'edit') {
       $result='<br /><input type="submit" name="submit" value="Submit Changes" />';
     }
     return $result;
 }  }
   
 sub start_block {  sub start_block {

Removed from v.1.47  
changed lines
  Added in v.1.50


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