--- loncom/interface/lonhtmlcommon.pm 2004/10/21 11:18:06 1.94 +++ loncom/interface/lonhtmlcommon.pm 2004/12/02 00:01:34 1.102 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.94 2004/10/21 11:18:06 foxr Exp $ +# $Id: lonhtmlcommon.pm,v 1.102 2004/12/02 00:01:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -127,7 +127,7 @@ sub select_recent { my ($area,$fieldname,$event)=@_; my %recent=&Apache::lonnet::dump(&recent_filename($area)); my $return="\n\n"; + $result .= ' '; + my $monthselector = qq{\n"; + $monthselector.= ' '; # Day - $result .= " \n"; + my $dayselector = qq{}; # Year - $result .= " \n"; - $result .= "  "; - if (! $no_hh_mm_ss) { - # Hours - $result .= " \n"; - $result .= " m\n"; - $result .= " s\n"; + my $yearselector = qq{}; + # + my $hourselector = qq{\n"; + my $minuteselector = qq{}; + my $secondselector= qq{}; + my $cal_link = qq{}; + # + if ($no_hh_mm_ss) { + $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]', + $monthselector,$dayselector,$yearselector, + $cal_link,''); + } else { + $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]', + $monthselector,$dayselector,$yearselector, + $hourselector,$minuteselector,$secondselector, + $cal_link,''); + } + $result .= "\n\n"; return $result; } @@ -877,23 +899,25 @@ sub crumbs { if (! defined($size)) { $size = '+2'; } + if ($target) { + $target = ' target="'. + &Apache::loncommon::escape_single($target).'"'; + } my $output=''; unless ($noformat) { $output.='
'; } $output.=''.$prefix.'/'; if ($ENV{'user.adv'}) { my $path=$prefix.'/'; - foreach (split('/',$uri)) { - unless ($_) { next; } - $path.=$_; + foreach my $dir (split('/',$uri)) { + if (! $dir) { next; } + $path .= $dir; unless ($path eq $uri) { $path.='/'; } - my $linkpath=$path; - if ($form) { - my $escaped_path = &Apache::loncommon::escape_single($path); - $linkpath="javascript:$form.action='$escaped_path';$form.submit();"; - } - my $escaped_linkpath = &Apache::loncommon::escape_single($linkpath); - my $escaped_target = &Apache::loncommon::escape_single($target); - $output.=''.$_.'/'; + my $linkpath = &Apache::loncommon::escape_single($path); + if ($form) { + $linkpath= + qq{javascript:$form.action='$linkpath';$form.submit();}; + } + $output.=qq{$dir/}; } } else { $output.=$uri;