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.62 and 1.84.2.1

version 1.62, 2004/04/06 15:07:41	version 1.84.2.1, 2004/08/17 19:09:33
Line 163 sub textbox {	Line 163 sub textbox {
##############################################	##############################################
##############################################	##############################################
sub checkbox {	sub checkbox {
my ($name,$value) = @_;	my ($name,$checked,$value) = @_;
my $Str = '<input type="checkbox" name="'.$name.'"'.	my $Str = '<input type="checkbox" name="'.$name.'" ';
($value?' checked="1"':'').' />';	if (defined($value)) {
	$Str .= 'value="'.$value.'"';
	}
	if ($checked) {
	$Str .= ' checked="1"';
	}
	$Str .= ' />';
return $Str;	return $Str;
}	}

Line 219 The method used to restrict user input w	Line 225 The method used to restrict user input w
##############################################	##############################################
##############################################	##############################################
sub date_setter {	sub date_setter {
my ($formname,$dname,$currentvalue,$special,$includeempty,$state) = @_;	my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
	$no_hh_mm_ss) = @_;
if (! defined($state) \|\| $state ne 'disabled') {	if (! defined($state) \|\| $state ne 'disabled') {
$state = '';	$state = '';
}	}
	if (! defined($no_hh_mm_ss)) {
	$no_hh_mm_ss = 0;
	}
if (! defined($currentvalue) \|\| $currentvalue eq 'now') {	if (! defined($currentvalue) \|\| $currentvalue eq 'now') {
unless ($includeempty) {	unless ($includeempty) {
$currentvalue = time;	$currentvalue = time;
Line 231 sub date_setter {	Line 241 sub date_setter {
}	}
}	}
# other potentially useful values: wkday,yrday,is_daylight_savings	# other potentially useful values: wkday,yrday,is_daylight_savings
my ($sec,$min,$hour,$mday,$month,$year)=('','','','','','');	my ($sec,$min,$hour,$mday,$month,$year)=('','',undef,'','','');
if ($currentvalue) {	if ($currentvalue) {
($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) =	($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) =
localtime($currentvalue);	localtime($currentvalue);
Line 305 ENDJS	Line 315 ENDJS
$result .= " <nobr><select name=\"$dname\_month\" ".$special.' '.	$result .= " <nobr><select name=\"$dname\_month\" ".$special.' '.
$state.' '.	$state.' '.
"onChange=\"javascript:$dname\_checkday()\" >\n";	"onChange=\"javascript:$dname\_checkday()\" >\n";
	# Month
my @Months = qw/January February March April May June	my @Months = qw/January February March April May June
July August September October November December/;	July August September October November December/;
# Pad @Months with a bogus value to make indexing easier	# Pad @Months with a bogus value to make indexing easier
Line 316 ENDJS	Line 327 ENDJS
$result .= "> ".&mt($Months[$m])." </option>\n";	$result .= "> ".&mt($Months[$m])." </option>\n";
}	}
$result .= " </select>\n";	$result .= " </select>\n";
	# Day
$result .= " <input type=\"text\" name=\"$dname\_day\" ".$state.' '.	$result .= " <input type=\"text\" name=\"$dname\_day\" ".$state.' '.
"value=\"$mday\" size=\"3\" ".$special.' '.	"value=\"$mday\" size=\"3\" ".$special.' '.
"onChange=\"javascript:$dname\_checkday()\" />\n";	"onChange=\"javascript:$dname\_checkday()\" />\n";
	# Year
$result .= " <input type=\"year\" name=\"$dname\_year\" ".$state.' '.	$result .= " <input type=\"year\" name=\"$dname\_year\" ".$state.' '.
"value=\"$year\" size=\"5\" ".$special.' '.	"value=\"$year\" size=\"5\" ".$special.' '.
"onChange=\"javascript:$dname\_checkday()\" />\n";	"onChange=\"javascript:$dname\_checkday()\" />\n";
$result .= "  ";	$result .= "  ";
$result .= " <select name=\"$dname\_hour\" ".$special." ".$state.' '.">\n";	if (! $no_hh_mm_ss) {
if ($includeempty) { $result.="<option value=''></option>"; }	# Hours
for (my $h = 0;$h<24;$h++) {	$result .= " <select name=\"$dname\_hour\" ".$special." ".$state.' '.
$result .= " <option value=\"$h\" ";	">\n";
$result .= "selected " if ($hour == $h);	if ($includeempty) { $result.="<option value=''></option>"; }
$result .= "> ";	for (my $h = 0;$h<24;$h++) {
my $timest='';	$result .= " <option value=\"$h\" ";
if ($h == 0) {	$result .= "selected " if (defined($hour) && $hour == $h);
$timest .= "12 am";	$result .= "> ";
} elsif($h == 12) {	my $timest='';
$timest .= "12 noon";	if ($h == 0) {
} elsif($h < 12) {	$timest .= "12 am";
$timest .= "$h am";	} elsif($h == 12) {
} else {	$timest .= "12 noon";
$timest .= $h-12 ." pm";	} elsif($h < 12) {
}	$timest .= "$h am";
$timest=&mt($timest);	} else {
$result .= $timest." </option>\n";	$timest .= $h-12 ." pm";
}	}
$result .= " </select>\n";	$timest=&mt($timest);
$result .= " <input type=\"text\" name=\"$dname\_minute\" ".$special.' '.	$result .= $timest." </option>\n";
$state.' '.	}
"value=\"$min\" size=\"3\" /> m\n";	$result .= " </select>\n";
$result .= " <input type=\"text\" name=\"$dname\_second\" ".$special.' '.	$result .= " <input type=\"text\" name=\"$dname\_minute\" ".
$state.' '.	$special.' '.
"value=\"$sec\" size=\"3\" /> s\n";	$state.' '.
	"value=\"$min\" size=\"3\" /> m\n";
	$result .= " <input type=\"text\" name=\"$dname\_second\" ".
	$special.' '.
	$state.' '.
	"value=\"$sec\" size=\"3\" /> s\n";
	}
$result .= "<a href=\"javascript:$dname\_opencalendar()\">".	$result .= "<a href=\"javascript:$dname\_opencalendar()\">".
&mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";	&mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";
return $result;	return $result;
Line 392 sub get_date_from_form {	Line 411 sub get_date_from_form {
if (($tmpsec =~ /^\d+$/) && ($tmpsec >= 0) && ($tmpsec < 60)) {	if (($tmpsec =~ /^\d+$/) && ($tmpsec >= 0) && ($tmpsec < 60)) {
$sec = $tmpsec;	$sec = $tmpsec;
}	}
	if (!defined($tmpsec) \|\| $tmpsec eq '') { $sec = 0; }
	} else {
	$sec = 0;
}	}
if (defined($ENV{'form.'.$dname.'_minute'})) {	if (defined($ENV{'form.'.$dname.'_minute'})) {
my $tmpmin = $ENV{'form.'.$dname.'_minute'};	my $tmpmin = $ENV{'form.'.$dname.'_minute'};
if (($tmpmin =~ /^\d+$/) && ($tmpmin >= 0) && ($tmpmin < 60)) {	if (($tmpmin =~ /^\d+$/) && ($tmpmin >= 0) && ($tmpmin < 60)) {
$min = $tmpmin;	$min = $tmpmin;
}	}
	if (!defined($tmpmin) \|\| $tmpmin eq '') { $min = 0; }
	} else {
	$min = 0;
}	}
if (defined($ENV{'form.'.$dname.'_hour'})) {	if (defined($ENV{'form.'.$dname.'_hour'})) {
my $tmphour = $ENV{'form.'.$dname.'_hour'};	my $tmphour = $ENV{'form.'.$dname.'_hour'};
if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) {	if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) {
$hour = $tmphour;	$hour = $tmphour;
}	}
	} else {
	$hour = 0;
}	}
if (defined($ENV{'form.'.$dname.'_day'})) {	if (defined($ENV{'form.'.$dname.'_day'})) {
my $tmpday = $ENV{'form.'.$dname.'_day'};	my $tmpday = $ENV{'form.'.$dname.'_day'};
Line 745 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 814 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 835 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

sub htmlareaheaders {	sub htmlareaheaders {
unless (&htmlareablocked()) { return ''; }	if (&htmlareablocked()) { return ''; }
	unless (&htmlareabrowser()) { return ''; }
my $lang='en';	my $lang='en';
	if (&mt('htmlarea_lang') ne 'htmlarea_lang') {
	$lang=&mt('htmlarea_lang');
	}
return (<<ENDHEADERS);	return (<<ENDHEADERS);
<script type="text/javascript">	<script type="text/javascript">
_editor_url="/htmlarea/";	_editor_url='/htmlarea/';
	_editor_lang='$lang';
</script>	</script>
<script type="text/javascript" src="/htmlarea/htmlarea.js"></script>	<script type="text/javascript" src="/htmlarea/htmlarea.js"></script>
<script type="text/javascript" src="/htmlarea/lang/$lang.js"></script>
<script type="text/javascript" src="/htmlarea/dialog.js"></script>
<style type="text/css">
\@import url(/htmlarea/htmlarea.css);
</style>
ENDHEADERS	ENDHEADERS
}	}

# ---------------------------------------------------------- Script to activate	# ------------------------------------------------- Activate additional buttons

sub htmlareaactive {	sub htmlareaaddbuttons {
unless (&htmlareablocked()) { return ''; }	if (&htmlareablocked()) { return ''; }
return (<<ENDSCRIPT);	unless (&htmlareabrowser()) { return ''; }
<script type="text/javascript" defer="1">	return (<<ENDADDBUTTON);
HTMLArea.replaceAll();	var config=new HTMLArea.Config();
</script>	config.registerButton('ed_math','LaTeX Inline',
ENDSCRIPT	'/htmlarea/images/ed_math.gif',false,
	function(editor,id) {
	editor.surroundHTML('<m>\$','\$</m>');
	}
	);
	config.registerButton('ed_math_eqn','LaTeX Equation',
	'/htmlarea/images/ed_math_eqn.gif',false,
	function(editor,id) {
	editor.surroundHTML(
	'<center><m>\\\\[','\\\\]</m></center>');
	}
	);
	config.toolbar.push(['ed_math','ed_math_eqn']);
	ENDADDBUTTON
	}

	# ----------------------------------------------------------------- Preferences

	sub disablelink {
	my @fields=@_;
	if (defined($#fields)) {
	unless ($#fields>=0) { return ''; }
	}
	return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
	}

	sub enablelink {
	my @fields=@_;
	if (defined($#fields)) {
	unless ($#fields>=0) { return ''; }
	}
	return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
	}

	# ----------------------------------------- Script to activate only some fields

	sub htmlareaselectactive {
	my @fields=@_;
	unless (&htmlareabrowser()) { return ''; }
	if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
	my $output='<script type="text/javascript" defer="1">'.
	&htmlareaaddbuttons();
	foreach(@fields) {
	$output.="\nHTMLArea.replace('$_',config);";
	}
	$output.="\nwindow.status='Activated Editfields';\n</script><br />".
	&disablelink(@fields);
	return $output;
}	}

# --------------------------------------------------------------------- Blocked	# --------------------------------------------------------------------- Blocked

sub htmlareablocked {	sub htmlareablocked {
unless (&htmlareabrowser()) { return ''; }	unless ($ENV{'environment.wysiwygeditor'} eq 'on') { return 1; }
return 1;	return 0;
}	}

# ---------------------------------------- Browser capable of running HTMLArea?	# ---------------------------------------- Browser capable of running HTMLArea?
Line 899 All inputs can be undef without problems	Line 977 All inputs can be undef without problems
Inputs: $color (the background color of the table returned),	Inputs: $color (the background color of the table returned),
$component (the large text on the right side of the table),	$component (the large text on the right side of the table),
$component_help	$component_help
	$function (role to get colors from)
	$domain (domian of role)
	$menulink (boolean, controls whether to include a link to /adm/menu)

Returns a string containing breadcrumbs for the current page.	Returns a string containing breadcrumbs for the current page.

Line 924 returns: nothing	Line 1005 returns: nothing
my @Crumbs;	my @Crumbs;

sub breadcrumbs {	sub breadcrumbs {
my ($color,$component,$component_help,$function,$domain) = @_;	my ($color,$component,$component_help,$function,$domain,$menulink,
	$helplink) = @_;
if (! defined($color)) {	if (! defined($color)) {
if (! defined($function)) {	if (! defined($function)) {
$function = &Apache::loncommon::get_users_function();	$function = &Apache::loncommon::get_users_function();
Line 944 returns: nothing	Line 1026 returns: nothing
# The last breadcrumb does not have a link, so handle it separately.	# The last breadcrumb does not have a link, so handle it separately.
my $last = pop(@Crumbs);	my $last = pop(@Crumbs);
#	#
# The first one should be the course, I guess.	# The first one should be the course or a menu link
if (exists($ENV{'request.course.id'})) {	if (!defined($menulink)) { $menulink=1; }
my $cid = $ENV{'request.course.id'};	if ($menulink) {
	my $description = 'Menu';
	if (exists($ENV{'request.course.id'}) &&
	$ENV{'request.course.id'} ne '') {
	$description =
	$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
	}
unshift(@Crumbs,{	unshift(@Crumbs,{
href=>'/adm/menu',	href =>'/adm/menu',
title=>'Go to main menu',	title =>'Go to main menu',
text=>$ENV{'course.'.$cid.'.description'},	target =>'_top',
});	text =>$description,
	});
}	}
my $links .=	my $links .=
join('->',	join('->',
map {	map {
$faq = $_->{'faq'} if (exists($_->{'faq'}));	$faq = $_->{'faq'} if (exists($_->{'faq'}));
$bug = $_->{'bug'} if (exists($_->{'bug'}));	$bug = $_->{'bug'} if (exists($_->{'bug'}));
'<a href="'.$_->{'href'}.'" title="'.&mt($_->{'title'}).'">'.	my $result = '<a href="'.$_->{'href'}.'" ';
&mt($_->{'text'}).'</a>'	if (defined($_->{'target'}) && $_->{'target'} ne '') {
	$result .= 'target="'.$_->{'target'}.'" ';
	}
	$result .='title="'.&mt($_->{'title'}).'">'.
	&mt($_->{'text'}).'</a>';
	$result;
} @Crumbs	} @Crumbs
);	);
$links .= '->' if ($links ne '');	$links .= '->' if ($links ne '');
$links .= '<b>'.$last->{'text'}.'</b>';	$links .= '<b>'.&mt($last->{'text'}).'</b>';
#	#
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);
}	# }
	if ($helplink ne 'nohelp') {
	$icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
	}
if ($icons ne '') {	if ($icons ne '') {
$Str .= $icons.' ';	$Str .= $icons.' ';
}	}
Line 982 returns: nothing	Line 1079 returns: nothing
#	#
if (defined($component)) {	if (defined($component)) {
$Str .= '<td align="right" bgcolor="'.$color.'">'.	$Str .= '<td align="right" bgcolor="'.$color.'">'.
'<font size="+1">'.&mt($component).'</font>';	'<font size="+1">'.&mt($component).'</font></td>';
if (defined($component_help)) {
$Str .=
&Apache::loncommon::help_open_topic($component_help);
}
$Str.= '</td>';
}	}
$Str .= '</tr></table>'."\n";	$Str .= '</tr></table>'."\n";
#	#

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

Removed from v.1.62
changed lines
	Added in v.1.84.2.1