';
+ $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='
Intro
';
}
}
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='
';
}
}
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='
'.&mt("Failed to authenticate the proctor.")
@@ -315,11 +303,11 @@ sub proctor_validation_screen {
Proctor's Username:
Password:
-
Proctor's Domain:
+
Proctor's Domain:
Student who should be logged in is:
-
+
ENDCHECKOUT
return $result;