Diff for /loncom/homework/structuretags.pm between versions 1.251 and 1.255

version 1.251, 2004/05/27 04:32:19 version 1.255, 2004/06/03 16:42:02
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 2/19 Guy  ###
 # 6/26/2001 fixed extra web display at end of <web></web> tags  
 # 8/17,8/18,8/20 Gerd Kortemeyer  
   
   
 package Apache::structuretags;   package Apache::structuretags; 
Line 84  sub page_start { Line 82  sub page_start {
     if (!defined($found{'html'})) {      if (!defined($found{'html'})) {
  $result=&Apache::londefdef::start_html($target,$token,$tagstack,   $result=&Apache::londefdef::start_html($target,$token,$tagstack,
        $parstack,$parser,$safeeval);         $parstack,$parser,$safeeval);
  $head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target);   $head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target).
       &Apache::lonhtmlcommon::htmlareaheaders();
    @Apache::lonxml::htmlareafields=();
     }      }
     my $body_tag_start;      my $body_tag_start;
     if (!defined($found{'body'})) {      if (!defined($found{'body'})) {
Line 201  sub problem_edit_header { Line 201  sub problem_edit_header {
   
 sub problem_edit_footer {  sub problem_edit_footer {
     return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />      return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
     <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />';      <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
       &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
       "\n</form>\n</body>\n</html>";
 }  }
   
 sub option {  sub option {
Line 334  sub checkout_msg { Line 336  sub checkout_msg {
 ENDCHECKOUT  ENDCHECKOUT
 }  }
   
   sub firstaccess_msg {
       my ($time,$symb)=@_;
       my ($map)=&Apache::lonnet::decode_symb($symb);
       my $foldertitle=&Apache::lonnet::gettitle($map);
       &Apache::lonxml::debug("map is $map title is $foldertitle");
       return (<<ENDCHECKOUT);
   <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
   <form name="markaccess" method="POST" action="$ENV{'request.uri'}">
   <input type="hidden" name="markaccess" value="yes" />
   <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
   </form>
   ENDCHECKOUT
   }
   
 sub init_problem_globals {  sub init_problem_globals {
     my ($type)=@_;      my ($type)=@_;
     #initialize globals      #initialize globals
Line 458  sub start_problem { Line 474  sub start_problem {
     }      }
     $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);      $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
  }   }
    if ($ENV{'form.markaccess'}) {
       &Apache::lonnet::set_first_access('map');
    }
  #handle rand seed in construction space   #handle rand seed in construction space
  my $rndseed=&setup_rndseed($safeeval);   my $rndseed=&setup_rndseed($safeeval);
  my ($symb)=&Apache::lonxml::whichuser();   my ($symb)=&Apache::lonxml::whichuser();
Line 478  sub start_problem { Line 496  sub start_problem {
  &Apache::lonxml::debug("Got $status");   &Apache::lonxml::debug("Got $status");
  if (( $status eq 'CLOSED' ) ||   if (( $status eq 'CLOSED' ) ||
     ( $status eq 'UNCHECKEDOUT') ||      ( $status eq 'UNCHECKEDOUT') ||
       ( $status eq 'NOT_YET_VIEWED') ||
     ( $status eq 'BANNED') ||      ( $status eq 'BANNED') ||
     ( $status eq 'UNAVAILABLE') ||      ( $status eq 'UNAVAILABLE') ||
     ( $status eq 'INVALID_ACCESS')) {      ( $status eq 'INVALID_ACCESS')) {
Line 487  sub start_problem { Line 506  sub start_problem {
  my $msg=$body_tag_start;   my $msg=$body_tag_start;
  if ($status eq 'UNAVAILABLE') {   if ($status eq 'UNAVAILABLE') {
     $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';      $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
  } else {   } elsif ($status ne 'NOT_YET_VIEWED') {
     $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';      $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
  }   }
  if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {   if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
     $msg.='The problem '.$accessmsg;      $msg.='The problem '.$accessmsg;
  } elsif ($status eq 'UNCHECKEDOUT') {   } elsif ($status eq 'UNCHECKEDOUT') {
     $msg.=&checkout_msg;      $msg.=&checkout_msg;
    } elsif ($status eq 'NOT_YET_VIEWED') {
       $msg.=&firstaccess_msg($accessmsg,$symb);
  }   }
  $result.=$msg.'<br />';   $result.=$msg.'<br />';
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
Line 603  sub end_problem { Line 624  sub end_problem {
     }      }
  } elsif ( ($target eq 'web' || $target eq 'tex') &&   } elsif ( ($target eq 'web' || $target eq 'tex') &&
   $Apache::inputtags::part eq '0' &&    $Apache::inputtags::part eq '0' &&
   $status ne 'UNCHECKEDOUT') {    $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') {
     # if part is zero, no <part>s existed, so we need show the current      # if part is zero, no <part>s existed, so we need show the current
     # grading status      # grading status
     my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);      my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
Line 615  sub end_problem { Line 636  sub end_problem {
    ) {     ) {
     if ($target ne 'tex' &&      if ($target ne 'tex' &&
  $ENV{'form.answer_output_mode'} ne 'tex') {   $ENV{'form.answer_output_mode'} ne 'tex') {
  $result.="</form></body>\n";   $result.="</form>";
    $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
    $result.="</body>\n";
     }      }
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.=&Apache::lonxml::xmlend();   $result.=&Apache::lonxml::xmlend();
Line 1037  sub start_part { Line 1060  sub start_part {
     }      }
     if (( $status eq 'CLOSED' ) ||      if (( $status eq 'CLOSED' ) ||
  ( $status eq 'UNCHECKEDOUT') ||   ( $status eq 'UNCHECKEDOUT') ||
    ( $status eq 'NOT_YET_VIEWED') ||
  ( $status eq 'BANNED') ||   ( $status eq 'BANNED') ||
  ( $status eq 'UNAVAILABLE') ||   ( $status eq 'UNAVAILABLE') ||
  ( $status eq 'INVALID_ACCESS')) {   ( $status eq 'INVALID_ACCESS')) {
Line 1255  sub end_startouttext { Line 1279  sub end_startouttext {
  &Apache::edit::end_row().   &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n"                   &Apache::edit::start_spanning_row()."\n"
  . &Apache::loncommon::helpLatexCheatsheet () .   . &Apache::loncommon::helpLatexCheatsheet () .
  &Apache::edit::editfield($token->[1],$text,"",80,4);   &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }      }
     if ($target eq 'modified') {      if ($target eq 'modified') {
  $result='<startouttext />'.&Apache::edit::modifiedfield("endouttext",$parser);   $result='<startouttext />'.&Apache::edit::modifiedfield("endouttext",$parser);

Removed from v.1.251  
changed lines
  Added in v.1.255


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