[BACK]Return to bridgetask.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.5 and 1.7

version 1.5, 2005/03/28 21:49:31 version 1.7, 2005/03/31 16:05:13
Line 173  sub start_ClosingParagraph { Line 173  sub start_ClosingParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     if ($target eq 'web') {      if ($target eq 'web') {
  $result='<table border="1"><tr><td>Closing</td></tr><tr><td>';  
     }      }
     return $result;      return $result;
 }  }
Line 182  sub end_ClosingParagraph { Line 181  sub end_ClosingParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     if ($target eq 'web') {      if ($target eq 'web') {
  $result='</td></tr></table>';  
     }      }
     return $result;      return $result;
 }  }
Line 205  sub end_Dimension { Line 203  sub end_Dimension {
  #then start repicking   #then start repicking
  my $instance=$dimension{'instances'}->[0];   my $instance=$dimension{'instances'}->[0];
  $result=$dimension{'intro'}.   $result=$dimension{'intro'}.
     $dimension{$instance.'.text'}.      $dimension{$instance.'.text'};
     '<table border="1"><tr><td>Criteria</td></tr><tr><td>';   #FIXME: don't show the criteria yet
  foreach my $id (@{$dimension{$instance.'.criterias'}}) {   #foreach my $id (@{$dimension{$instance.'.criterias'}}) {
     $result.=$dimension{$instance.'.criteria.'.$id}.   #    $result.=$dimension{$instance.'.criteria.'.$id};
  '</td></tr><tr><td>';   #}
  }  
  $result=~s/<tr><td>$//;  
  $result.='</table>';  
     }      }
     return $result;      return $result;
 }  }
Line 223  sub start_IntroParagraph { Line 218  sub start_IntroParagraph {
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($tagstack->[-2] eq 'Dimension') {   if ($tagstack->[-2] eq 'Dimension') {
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
  } else {  
     $result='<table border="1"><tr><td>Intro</td></tr><tr><td>';  
  }   }
     }      }
     return $result;      return $result;
Line 236  sub end_IntroParagraph { Line 229  sub end_IntroParagraph {
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($tagstack->[-2] eq 'Dimension') {   if ($tagstack->[-2] eq 'Dimension') {
     $dimension{'intro'}=&Apache::lonxml::endredirection();      $dimension{'intro'}=&Apache::lonxml::endredirection();
  } else {  
     $result='</td></tr></table>';  
  }   }
     }      }
     return $result;      return $result;
Line 295  sub proctor_validation_screen { Line 286  sub proctor_validation_screen {
     my ($slot) = @_;      my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();      my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');      my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
     my $dom=(&Apache::lonxml::whichuser())[2];      $user=$ENV{'form.proctorname'};
     my $user=$ENV{'form.proctorname'};      if ($ENV{'form.proctordomain'}) { $domain=$ENV{'form.proctordomain'}; }
     if ($ENV{'form.proctordomain'}) { $dom=$ENV{'form.proctordomain'}; }  
     my $msg;      my $msg;
     if ($ENV{'form.proctorpassword'}) {      if ($ENV{'form.proctorpassword'}) {
  $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")   $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
Line 313  sub proctor_validation_screen { Line 303  sub proctor_validation_screen {
 <table>  <table>
   <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>    <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>
   <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>    <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
   <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$dom" /></td></tr>    <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$domain" /></td></tr>
 </table>  </table>
 <input type="submit" name="checkoutbutton" value="Validate"  /><br />  <input type="submit" name="checkoutbutton" value="Validate"  /><br />
 Student who should be logged in is:<br />  Student who should be logged in is:<br />
Removed from v.1.5  
changed lines
  Added in v.1.7

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