--- loncom/homework/outputtags.pm 2003/07/01 21:10:43 1.30
+++ loncom/homework/outputtags.pm 2003/09/08 18:36:39 1.32
@@ -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.32 2003/09/08 18:36:39 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -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 ='
Due '.
- &Apache::lonnavmaps::timeToHumanString($date).
+ if (lc($style) !~ 'plain') {
+ $result ='Due '.
+ &Apache::lonnavmaps::timeToHumanString($date).
' | ';
+ } else {
+ $result='Due '.&Apache::lonnavmaps::timeToHumanString($date);
+ }
# } else {
# $result ='';
# }
@@ -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="$Apache::lonhomework::name";
+ $result=$name;
+ if (lc($style) !~ 'plain') { $result="$name"; }
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token);
$result.=' |
';
$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;
}