--- loncom/homework/outputtags.pm	2003/07/01 21:10:43	1.30
+++ loncom/homework/outputtags.pm	2005/03/28 21:49:31	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.30 2003/07/01 21:10:43 albertel Exp $
+# $Id: outputtags.pm,v 1.37 2005/03/28 21:49:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ use Apache::lonnet;
 use POSIX qw(strftime);
 
 BEGIN {
-    &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight'));
+    &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto'));
 }
 
 sub initialize_outputtags {
@@ -50,6 +50,7 @@ sub start_displayduedate {
     }
     my $status=$Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("got a $status in duedatebox");
+    my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
     if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) {
 #	my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval);
 #	if ($format eq '') {
@@ -59,9 +60,13 @@ sub start_displayduedate {
 	my $id = $Apache::inputtags::part;
 	my $date = &Apache::lonnet::EXT("resource.$id.duedate");
 	&Apache::lonxml::debug("duedatebox found $date for $id");
-	$result ='<table border="on"><tr><td>Due '.
-	    &Apache::lonnavmaps::timeToHumanString($date).
+	if (lc($style) !~ 'plain') { 
+	    $result ='<table border="on"><tr><td>Due '.
+		&Apache::lonnavmaps::timeToHumanString($date).
 		'</td></tr></table>';
+	} else {
+	    $result=&mt('Due').' '.&Apache::lonnavmaps::timeToHumanString($date);
+	}
 #        } else {
 #	    $result ='<table border="on"><tr><td>No due date set.</td></tr></table>';
 #	}
@@ -88,16 +93,22 @@ sub start_displaytitle {
     } else {
 	$Apache::outputtags::showonce{'displayduetitle'}=1;
     }
+    my $name=&Apache::structuretags::get_resource_name();
+    my $style = &Apache::lonxml::get_param('style',$parstack,$safeeval);
     if ($target eq 'web') {
-	$result="<h1>$Apache::lonhomework::name</h1>";
+	$result=$name;
+	if (lc($style) !~ 'plain') { $result="<h1>$name</h1>"; }
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.='</td></tr>';
 	$result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
-	$Apache::lonhomework::name=~s/%/\%/g;
-	$Apache::lonhomework::name=~s/&/\&/g;
-	$result='\vskip 0 mm\noindent\textbf{'.$Apache::lonhomework::name.'}\vskip 0 mm';
+	$name=&Apache::lonxml::latex_special_symbols($name);
+	if (lc($style) !~ 'plain') { 
+	    $result='\vskip 0 mm\noindent\textbf{'.$name.'}\vskip 0 mm';
+	} else {
+	    $result=$name;
+	}
     }
     return $result;
 }
@@ -134,7 +145,6 @@ sub start_displayweight {
     }
     push(@{$Apache::outputtags::showonce{'displayweight'}},
 	 $Apache::inputtags::part);
-    my $status=$Apache::inputtags::status['-1'];
     if ($target eq 'web' || $target eq 'tex') {
 	my $id = $Apache::inputtags::part;
 	if ($id ne '0') {
@@ -168,6 +178,48 @@ sub end_displayweight {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result;
     if ($target eq 'edit') { $result[1]='no'; }
+    return @result;
+}
+
+sub start_displaystudentphoto {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
+    if ($target eq 'web' && $user eq $ENV{'user.name'}) {
+	my $url=&Apache::lonnet::studentphoto($domain,$user,"gif");
+	my $args;
+	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
+	if ($width) { $args.=" width=\"$width\" "; }
+	my $height=&Apache::lonxml::get_param('heigth',$parstack,$safeeval);
+	if ($height) { $args.=" height=\"$height\" "; }
+	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval);
+	if ($align) { $args.=" align=\"$align\" "; }
+	$result.=" <img $args src=\"$url\" alt=\"$user\@$domain\" />";
+    }
+    if ($target eq 'tex' && $ENV{'request.role'} =~ /^cc/) {
+	my $url=&Apache::lonnet::studentphoto($domain,$user,"eps");
+	my $ua=new LWP::UserAgent;
+	my $request=new HTTP::Request('GET',$url);
+	my $response=$ua->request($request);
+	if ($response->is_success) {
+	    my $file=$user."_".$domain."_studentphoto.eps";
+	    open(FILE,">".$Apache::lonnet::perlvar{'lonPrtDir'}."/$file");
+	    print FILE $response->content;
+	    close(FILE);
+	    my $width_param=&Apache::londefdef::image_size($Apache::lonnet::perlvar{'lonPrtDir'}."/$file",'0.3',$parstack,$safeeval);
+	    $result.=' \graphicspath{{'.$Apache::lonnet::perlvar{'lonPrtDir'}.
+		'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+	} else {
+	    $result="$user\@$domain";
+	}
+    }
+    return $result;
+}
+
+sub end_displaystudentphoto {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my @result;
+    if ($target eq 'edit') { $result[1]='no'; }
     return @result;
 }