--- loncom/homework/bridgetask.pm	2005/03/28 19:26:10	1.4
+++ loncom/homework/bridgetask.pm	2005/03/31 16:05:13	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.4 2005/03/28 19:26:10 albertel Exp $
+# $Id: bridgetask.pm,v 1.7 2005/03/31 16:05:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -173,7 +173,6 @@ sub start_ClosingParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     if ($target eq 'web') {
-	$result='<table border="1"><tr><td>Closing</td></tr><tr><td>';
     }
     return $result;
 }
@@ -182,7 +181,6 @@ sub end_ClosingParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     if ($target eq 'web') {
-	$result='</td></tr></table>';
     }
     return $result;
 }
@@ -205,14 +203,11 @@ sub end_Dimension {
 	#then start repicking
 	my $instance=$dimension{'instances'}->[0];
 	$result=$dimension{'intro'}.
-	    $dimension{$instance.'.text'}.
-	    '<table border="1"><tr><td>Criteria</td></tr><tr><td>';
-	foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-	    $result.=$dimension{$instance.'.criteria.'.$id}.
-		'</td></tr><tr><td>';
-	}
-	$result=~s/<tr><td>$//;
-	$result.='</table>';
+	    $dimension{$instance.'.text'};
+	#FIXME: don't show the criteria yet
+	#foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+	#    $result.=$dimension{$instance.'.criteria.'.$id};
+	#}
     }
     return $result;
 }
@@ -223,8 +218,6 @@ sub start_IntroParagraph {
     if ($target eq 'web') {
 	if ($tagstack->[-2] eq 'Dimension') {
 	    &Apache::lonxml::startredirection();
-	} else {
-	    $result='<table border="1"><tr><td>Intro</td></tr><tr><td>';
 	}
     }
     return $result;
@@ -236,8 +229,6 @@ sub end_IntroParagraph {
     if ($target eq 'web') {
 	if ($tagstack->[-2] eq 'Dimension') {
 	    $dimension{'intro'}=&Apache::lonxml::endredirection();
-	} else {
-	    $result='</td></tr></table>';
 	}
     }
     return $result;
@@ -294,12 +285,9 @@ sub end_Criteria {
 sub proctor_validation_screen {
     my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
-    my $ret=&Apache::lonnet::reply("studentphoto:$domain:$user:gif",&Apache::lonnet::homeserver($user,$domain));
-    my $url="/uploaded/$domain/$user/internal/studentphoto.gif";
-    my $tokenurl=&Apache::lonnet::tokenwrapper($url);
-    my $dom=(&Apache::lonxml::whichuser())[2];
-    my $user=$ENV{'form.proctorname'};
-    if ($ENV{'form.proctordomain'}) { $dom=$ENV{'form.proctordomain'}; }
+    my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+    $user=$ENV{'form.proctorname'};
+    if ($ENV{'form.proctordomain'}) { $domain=$ENV{'form.proctordomain'}; }
     my $msg;
     if ($ENV{'form.proctorpassword'}) {
 	$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
@@ -315,11 +303,11 @@ sub proctor_validation_screen {
 <table>
   <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>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>
 <input type="submit" name="checkoutbutton" value="Validate"  /><br />
 Student who should be logged in is:<br />
-<img src="$tokenurl" /><br />
+<img src="$url" /><br />
 </form>
 ENDCHECKOUT
     return $result;