loncom/interface/lonhtmlcommon.pm - diff

Return to lonhtmlcommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.77 and 1.81

version 1.77, 2004/06/12 01:09:31	version 1.81, 2004/07/16 19:54:51
Line 772 sub Increment_PrgWin {	Line 772 sub Increment_PrgWin {
$$prog_state{'done'} *	$$prog_state{'done'} *
($$prog_state{'max'}-$$prog_state{'done'});	($$prog_state{'max'}-$$prog_state{'done'});
$time_est = int($time_est);	$time_est = int($time_est);
if (int ($time_est/60) > 0) {	#
my $min = int($time_est/60);	my $min = int($time_est/60);
my $sec = $time_est % 60;	my $sec = $time_est % 60;
$time_est = $min.' '.&mt('minutes');	#
if ($min < 10) {	my $str;
if ($sec > 1) {	if ($min == 1 && $sec > 1) {
$time_est.= ', '.$sec.' '.&mt('seconds');	$str = '[_2] seconds';
} elsif ($sec > 0) {	} elsif ($min == 1 && $sec < 2) {
$time_est.= ', '.$sec.' '.&mt('second');	$str = '1 minute';
}	} elsif ($min < 10 && $sec > 1) {
}	$str = '[_1] minutes, [_2] seconds';
} else {	} elsif ($min >= 10 \|\| $sec < 2) {
$time_est .= ' '.&mt('seconds');	$str = '[_1] minutes';
}	}
	$time_est = &mt($str,$min,$sec);
	#
my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};	my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
if ($lasttime > 9) {	if ($lasttime > 9) {
$lasttime = int($lasttime);	$lasttime = int($lasttime);
Line 841 sub r_print {	Line 843 sub r_print {
# ------------------------------------------------------- Puts directory header	# ------------------------------------------------------- Puts directory header

sub crumbs {	sub crumbs {
my ($uri,$target,$prefix,$form,$size)=@_;	my ($uri,$target,$prefix,$form,$size,$noformat)=@_;
if (! defined($size)) {	if (! defined($size)) {
$size = '+2';	$size = '+2';
}	}
my $output='<br /><tt><b><font size="'.$size.'">'.$prefix.'/';	my $output='';
	unless ($noformat) { $output.='<br /><tt><b>'; }
	$output.='<font size="'.$size.'">'.$prefix.'/';
if ($ENV{'user.adv'}) {	if ($ENV{'user.adv'}) {
my $path=$prefix.'/';	my $path=$prefix.'/';
foreach (split('/',$uri)) {	foreach (split('/',$uri)) {
Line 862 sub crumbs {	Line 866 sub crumbs {
$output.=$uri;	$output.=$uri;
}	}
unless ($uri=~/\/$/) { $output=~s/\/$//; }	unless ($uri=~/\/$/) { $output=~s/\/$//; }
return $output.'</font></b></tt><br />';	return $output.'</font>'.($noformat?'':'</b></tt><br />');
}	}

# ------------------------------------------------- Output headers for HTMLArea	# ------------------------------------------------- Output headers for HTMLArea
Line 1058 returns: nothing	Line 1062 returns: nothing
my $icons = '';	my $icons = '';
$faq = $last->{'faq'} if (exists($last->{'faq'}));	$faq = $last->{'faq'} if (exists($last->{'faq'}));
$bug = $last->{'bug'} if (exists($last->{'bug'}));	$bug = $last->{'bug'} if (exists($last->{'bug'}));
if ($faq ne '') {	# if ($faq ne '') {
$icons .= &Apache::loncommon::help_open_faq($faq);	# $icons .= &Apache::loncommon::help_open_faq($faq);
}	# }
if ($bug ne '') {	# if ($bug ne '') {
$icons .= &Apache::loncommon::help_open_bug($bug);	# $icons .= &Apache::loncommon::help_open_bug($bug);
}	# }
	$icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
if ($icons ne '') {	if ($icons ne '') {
$Str .= $icons.' ';	$Str .= $icons.' ';
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.77
changed lines
	Added in v.1.81