--- loncom/homework/outputtags.pm 2001/01/11 16:33:44 1.3 +++ loncom/homework/outputtags.pm 2001/10/05 12:39:13 1.12 @@ -9,14 +9,12 @@ sub BEGIN { } sub start_displayduedate { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; my $status=$Apache::inputtags::status['-1']; &Apache::lonxml::debug("got a $status in duedatebox"); if (($status =~ /CAN.*_ANSWER/) && ($target eq 'web')) { - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $format = &Apache::run::run("{$args;".'return $format}',$safeeval); + my $format = &Apache::lonxml::get_param('format',$parstack,$safeeval); if ($format eq '') { &Apache::lonxml::debug("using default format"); $format="%c"; @@ -24,24 +22,48 @@ 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 at '. - POSIX::strftime($format,localtime($date)). - '
'; + if ($date) { + $result ='
Due at '. + POSIX::strftime($format,localtime($date)). + '
'; + } else { + $result ='
No due date set.
'; + } + } elsif ( $target eq 'edit' ) { + $result=&Apache::edit::tag_start($target,$token, + &Apache::lonxml::description($token)); + $result.=''; + $result.=&Apache::edit::end_table(); } return $result; } sub end_displayduedate { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my @result; + if ($target eq 'edit') { $result[1]='no'; } + return @result; } sub start_displaytitle { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; if ($target eq 'web') { - return "

$Apache::lonhomework::name

"; - } + $result="

$Apache::lonhomework::name

"; + } elsif ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token, + &Apache::lonxml::description($token)); + $result.=''; + $result.=&Apache::edit::end_table(); + } + return $result; } sub end_displaytitle { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my @result; + if ($target eq 'edit') { $result[1]='no'; } + return @result; } 1;