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.372 and 1.420

version 1.372, 2016/06/10 22:31:27	version 1.420, 2025/03/06 16:42:40
Line 78 sub java_not_enabled {	Line 78 sub java_not_enabled {
sub coursepreflink {	sub coursepreflink {
my ($text,$category)=@_;	my ($text,$category)=@_;
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
return '<a target="_top" href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';	my $target =' target="_top"';
	if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) \|\|
	(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
	$target ='';
	}
	return '<a'.$target.' href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';
} else {	} else {
return '';	return '';
}	}
Line 92 sub raw_href_to_link {	Line 97 sub raw_href_to_link {

sub entity_encode {	sub entity_encode {
my ($text)=@_;	my ($text)=@_;
return &HTML::Entities::encode($text, '<>&"');	return &HTML::Entities::encode($text, '\'<>&"');
}	}

sub direct_parm_link {	sub direct_parm_link {
Line 101 sub direct_parm_link {	Line 106 sub direct_parm_link {
$filter=&entity_encode($filter);	$filter=&entity_encode($filter);
$part=&entity_encode($part);	$part=&entity_encode($part);
if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {	if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
return "<a target='_top' href='/adm/parmset?symb=$symb&filter=$filter&part=$part'><span class='LC_setting'>$linktext</span></a>";	my $target=' target="_top"';
	if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) \|\|
	(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
	$target='';
	}
	return "<a".$target." href=\"/adm/parmset?symb=$symb&filter=$filter&part=$part\"><span class=\"LC_setting\">$linktext</span></a>";
} else {	} else {
return $linktext;	return $linktext;
}	}
}	}
##############################################	##############################################
Line 221 sub dependencycheck_js {	Line 231 sub dependencycheck_js {
$link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"');	$link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"');
} elsif ($folderpath) {	} elsif ($folderpath) {
$link = '/adm/dependencies?folderpath='.&HTML::Entities::encode($folderpath,'<>&"');	$link = '/adm/dependencies?folderpath='.&HTML::Entities::encode($folderpath,'<>&"');
$url = $uri;	$url = $uri;
} elsif ($uri =~ m{^/public/$match_domain/$match_courseid/syllabus$}) {	} elsif ($uri =~ m{^/public/$match_domain/$match_courseid/syllabus$}) {
$link = '/adm/dependencies';	$link = '/adm/dependencies';
}	}
$link .= (($link=~/\?/)?'&':'?').'title='.	$link .= (($link=~/\?/)?'&':'?').'title='.
&HTML::Entities::encode($title,'<>&"');	&HTML::Entities::encode($title,'<>&"');
if ($url) {	if ($url) {
$link .= '&url='.&HTML::Entities::encode($url,'<>&"');	$link .= '&url='.&HTML::Entities::encode($url,'<>&"');
}	}
	&js_escape(\$link);
return <<ENDJS;	return <<ENDJS;
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
Line 407 sub textbox {	Line 418 sub textbox {
##############################################	##############################################
##############################################	##############################################
sub checkbox {	sub checkbox {
my ($name,$checked,$value) = @_;	my ($name,$checked,$value,$special) = @_;
my $Str = '<input type="checkbox" name="'.$name.'" ';	my $Str = '<input type="checkbox" name="'.$name.'" ';
if (defined($value)) {	if (defined($value)) {
$Str .= 'value="'.$value.'"';	$Str .= 'value="'.$value.'"';
Line 415 sub checkbox {	Line 426 sub checkbox {
if ($checked) {	if ($checked) {
$Str .= ' checked="checked"';	$Str .= ' checked="checked"';
}	}
$Str .= ' />';	$Str .= $special.' />';
return $Str;	return $Str;
}	}

Line 531 sub date_setter {	Line 542 sub date_setter {
my ($formname,$dname,$currentvalue,$special,$includeempty,$state,	my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
$no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink,$no_mm_ss,$no_ss) = @_;	$no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink,$no_mm_ss,$no_ss) = @_;
my $now = time;	my $now = time;
	my %labels = &Apache::lonlocal::texthash(
	day => 'day',
	month => 'month',
	year => 'year',
	sec => 'seconds',
	min => 'minutes',
	hour => 'hours',
	);
my $tzname;	my $tzname;
my ($sec,$min,$hour,$mday,$month,$year) = ('', '', undef,''.''.'');	my ($sec,$min,$hour,$mday,$month,$year) = ('', '', undef,''.''.'');
#other potentially useful values: wkday,yrday,is_daylight_savings	#other potentially useful values: wkday,yrday,is_daylight_savings

if (! defined($state) \|\| $state ne 'disabled') {	if (! defined($state) \|\| $state ne 'disabled') {
$state = '';	$state = '';
	} else {
	$state = 'disabled="disabled"';
}	}
if (! defined($no_hh_mm_ss)) {	if (! defined($no_hh_mm_ss)) {
$no_hh_mm_ss = 0;	$no_hh_mm_ss = 0;
Line 630 document.$formname.$dname\_year.value,	Line 650 document.$formname.$dname\_year.value,
</script>	</script>
ENDJS	ENDJS
$result .= ' <span class="LC_nobreak">';	$result .= ' <span class="LC_nobreak">';
my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};	my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" aria-label="$labels{'month'}">};
# Month	# 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/;
Line 644 ENDJS	Line 664 ENDJS
}	}
$monthselector.= ' </select>';	$monthselector.= ' </select>';
# Day	# Day
my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" />};	my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onchange="javascript:$dname\_checkday()" aria-label="$labels{'day'}" />};
# Year	# Year
my $yearselector = qq{<input type="text" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" />};	my $yearselector = qq{<input type="text" name="$dname\_year" $state value="$year" size="5" $special onchange="javascript:$dname\_checkday()" aria-label="$labels{'year'}" />};
#	#
my $hourselector = qq{<select name="$dname\_hour" $special $state >};	my $hourselector = qq{<select name="$dname\_hour" $special $state aria-label="$labels{'hour'}">};
if ($includeempty) {	if ($includeempty) {
$hourselector.=qq{<option value=''></option>};	$hourselector.=qq{<option value=''></option>};
}	}
Line 670 ENDJS	Line 690 ENDJS
$hourselector .= $timest." </option>\n";	$hourselector .= $timest." </option>\n";
}	}
$hourselector .= " </select>\n";	$hourselector .= " </select>\n";
my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};	my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" aria-label="$labels{'min'}" />};
my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};	my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" aria-label="$labels{'sec'}" />};
my $cal_link;	my $cal_link;
unless (($nolink) \|\| ($state eq 'disabled')) {	unless (($nolink) \|\| ($state eq 'disabled')) {
$cal_link = qq{<a href="javascript:$dname\_opencalendar()">};	$cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
Line 856 parameter setting wizard.	Line 876 parameter setting wizard.
##############################################	##############################################
sub pjump_javascript_definition {	sub pjump_javascript_definition {
my $Str = <<END;	my $Str = <<END;
function pjump(type,dis,value,marker,ret,call,hour,min,sec) {	function pjump(type,dis,value,marker,ret,call,hour,min,sec,extra) {
openMyModal("/adm/rat/parameter.html?type="+escape(type)	openMyModal("/adm/rat/parameter.html?type="+escape(type)
+"&value="+escape(value)+"&marker="+escape(marker)	+"&value="+escape(value)+"&marker="+escape(marker)
+"&return="+escape(ret)	+"&return="+escape(ret)
+"&call="+escape(call)+"&name="+escape(dis)	+"&call="+escape(call)+"&name="+escape(dis)
+"&defhour="+escape(hour)+"&defmin="+escape(min)	+"&defhour="+escape(hour)+"&defmin="+escape(min)
+"&defsec="+escape(sec)+"&modal=1",350,350,'no');	+"&defsec="+escape(sec)+"&extra="+escape(extra)
	+"&modal=1",350,350,'no');
}	}
END	END
return $Str;	return $Str;
Line 1023 data structure used for bookkeeping.	Line 1044 data structure used for bookkeeping.

=item $number_to_do The total number of items being processed.	=item $number_to_do The total number of items being processed.

	=item $preamble Optional HTML to display before the progress bar.

=back	=back

=back	=back

Returns a hash containing the progress state data structure.	Returns a hash containing the progress state data structure.
	If $number_to_do is zero or null, an indeterminate progress bar will
	be used.

=item &Update_PrgWin()	=item &Update_PrgWin()

Line 1116 Returns: none	Line 1141 Returns: none

# Create progress	# Create progress
sub Create_PrgWin {	sub Create_PrgWin {
my ($r,$number_to_do)=@_;	my ($r,$number_to_do,$preamble)=@_;
my %prog_state;	my %prog_state;
$prog_state{'done'}=0;	$prog_state{'done'}=0;
$prog_state{'firststart'}=&Time::HiRes::time();	$prog_state{'firststart'}=&Time::HiRes::time();
$prog_state{'laststart'}=&Time::HiRes::time();	$prog_state{'laststart'}=&Time::HiRes::time();
$prog_state{'max'}=$number_to_do;	$prog_state{'max'}=$number_to_do;
&Apache::loncommon::LCprogressbar($r);	&Apache::loncommon::LCprogressbar($r,$prog_state{'max'},$preamble);
return %prog_state;	return %prog_state;
}	}

# update progress	# update progress
sub Update_PrgWin {	sub Update_PrgWin {
my ($r,$prog_state,$displayString)=@_;	my ($r,$prog_state,$displayString)=@_;
&Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString);	&Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString,$$prog_state{'max'});
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1179 sub Increment_PrgWin {	Line 1204 sub Increment_PrgWin {
if ($$prog_state{'max'}) {	if ($$prog_state{'max'}) {
$percent=int(100.*$current/$$prog_state{'max'});	$percent=int(100.*$current/$$prog_state{'max'});
}	}
&Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo);	&Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo,$$prog_state{'max'});
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1194 sub Close_PrgWin {	Line 1219 sub Close_PrgWin {
# ------------------------------------------------------- Puts directory header	# ------------------------------------------------------- Puts directory header

sub crumbs {	sub crumbs {
my ($uri,$target,$prefix,$form,$skiplast)=@_;	my ($uri,$target,$prefix,$form,$skiplast,$onclick)=@_;
# You cannot crumbnify uploaded or adm resources	# You cannot crumbnify uploaded or adm resources
if ($uri=~/^\/*(uploaded\|adm)\//) { return &mt('(Internal Course/Group Content)'); }	if ($uri=~/^\/*(uploaded\|adm)\//) { return &mt('(Internal Course/Community Content)'); }
if ($target) {	if ($target) {
$target = ' target="'.	$target = ' target="'.
&Apache::loncommon::escape_single($target).'"';	&Apache::loncommon::escape_single($target).'"';
Line 1216 sub crumbs {	Line 1241 sub crumbs {
} else {	} else {
$path.='/';	$path.='/';
}	}
	if ($path eq '/res/') {
	unless (&Apache::lonnet::allowed('bre',$path)) {
	$output.="$dir/";
	next;
	}
	}
my $href_path = &HTML::Entities::encode($path,'<>&"');	my $href_path = &HTML::Entities::encode($path,'<>&"');
&Apache::loncommon::inhibit_menu_check(\$href_path);	&Apache::loncommon::inhibit_menu_check(\$href_path);
if ($form) {	if ($form) {
my $href = 'javascript:'.$form.".action='".$href_path."';".$form.'.submit();';	my $href = 'javascript:'.$form.".action='".$href_path."';".$form.'.submit();';
$output.=qq{<a href="$href"$target>$dir</a>/};	$output.=qq{<a href="$href"$onclick$target>$dir</a>/};
} else {	} else {
$output.=qq{<a href="$href_path"$target>$dir</a>/};	$output.=qq{<a href="$href_path"$onclick$target>$dir</a>/};
}	}
}	}
} else {	} else {
Line 1293 sub htmlareaheaders {	Line 1324 sub htmlareaheaders {
ENDEDITOR	ENDEDITOR
}	}
$s.=(<<ENDJQUERY);	$s.=(<<ENDJQUERY);
<script type="text/javascript" src="/adm/jQuery/js/jquery-1.11.3.min.js"></script>	<script type="text/javascript" src="/adm/jQuery/js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.11.4.custom.min.js"></script>	<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.13.3.custom.min.js"></script>
<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.11.4.custom.css" />	<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.13.3.custom.min.css" />
<script type="text/javascript" src="/adm/jpicker/js/jpicker-1.1.6.min.js" >	<script type="text/javascript" src="/adm/jpicker/js/jpicker-1.1.6.min.js" >
</script>	</script>
<link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />	<link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />
Line 1332 $(document).ready(function(){	Line 1363 $(document).ready(function(){
});';	});';
}	}

	sub countdown {

	# Code to put a due date countdown in 'duedatecountdown' span.
	# This is currently located in the breadcrumb headers.
	# note that the dueDateLayout is internatinoalized below.
	# Here document is used to support the substitution into the javascript below.
	# ..which unforunately necessitates escaping the $'s in the javascript.
	# There are several times of importance
	#
	# serverDueDate - The absolute time at which the problem expires.
	# serverTime - The server's time when the problem finished computing.
	# clientTime - The client's time...as close to serverTime as possible.
	# The clientTime will be slightly later due to
	# 1. The latency between problem computation and
	# the first network action.
	# 2. The time required between the page load-start and the actual
	# initial javascript execution that got clientTime.
	# These are used as follows:
	# The difference between clientTime and serverTime are used to
	# correct for differences in clock settings between the browser's system and the
	# server's.
	#
	# The difference between clientTime and the time at which the ready() method
	# starts executing is used to estimate latencies for page load and submission.
	# Since this is an estimate, it is doubled. The latency estimate + one minute
	# is used to determine when the countdown timer turns red to warn the user
	# to think about submitting.


	my $dueDateLayout = &mt('Due in: {dn} {dl} {hnn}{sep}{mnn}{sep}{snn} [_1]',
	"<span id='submitearly'></span>");
	my $early = '- <b>'.&mt('Submit Early').'</b>';
	my $pastdue = '- <b>'.&mt('Past Due').'</b>';
	return <<"JAVASCRIPT";

	var documentReadyTime;

	\$(document).ready(function() {
	if (typeof(dueDate) != "undefined") {
	documentReadyTime = (new Date()).getTime();
	\$("#duedatecountdown").countdown({until: dueDate, compact: true,
	layout: "$dueDateLayout",
	onTick: function (periods) {
	var latencyEstimate = (documentReadyTime - clientTime) * 2;
	if(\$.countdown.periodsToSeconds(periods) < (300 + latencyEstimate)) {
	\$("#submitearly").html("$early");
	if (\$.countdown.periodsToSeconds(periods) < 1) {
	\$("#submitearly").html("$pastdue");
	}
	}
	if(\$.countdown.periodsToSeconds(periods) < (60 + latencyEstimate)) {
	\$(this).css("color", "red"); //Highlight last minute.
	}
	}
	});
	}
	});

	JAVASCRIPT

	}

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

sub htmlareaselectactive {	sub htmlareaselectactive {
Line 1555 sub htmlareaselectactive {	Line 1648 sub htmlareaselectactive {

});	});
';	';
$output .= &color_picker;	$output .= &color_picker();

# Code to put a due date countdown in 'duedatecountdown' span.
# This is currently located in the breadcrumb headers.
# note that the dueDateLayout is internatinoalized below.
# Here document is used to support the substitution into the javascript below.
# ..which unforunately necessitates escaping the $'s in the javascript.
# There are several times of importance
#
# serverDueDate - The absolute time at which the problem expires.
# serverTime - The server's time when the problem finished computing.
# clientTime - The client's time...as close to serverTime as possible.
# The clientTime will be slightly later due to
# 1. The latency between problem computation and
# the first network action.
# 2. The time required between the page load-start and the actual
# initial javascript execution that got clientTime.
# These are used as follows:
# The difference between clientTime and serverTime are used to
# correct for differences in clock settings between the browser's system and the
# server's.
#
# The difference between clientTime and the time at which the ready() method
# starts executing is used to estimate latencies for page load and submission.
# Since this is an estimate, it is doubled. The latency estimate + one minute
# is used to determine when the countdown timer turns red to warn the user
# to think about submitting.

my $dueDateLayout = &mt('Due in: {dn} {dl} {hnn}{sep}{mnn}{sep}{snn} [_1]',
"<span id='submitearly'></span>");
my $early = '- <b>'.&mt('Submit Early').'</b>';
my $pastdue = '- <b>'.&mt('Past Due').'</b>';
$output .= <<JAVASCRIPT;

var documentReadyTime;	$output .= &countdown();

\$(document).ready(function() {	$output .= <<"JAVASCRIPT";
if (typeof(dueDate) != "undefined") {
documentReadyTime = (new Date()).getTime();
\$("#duedatecountdown").countdown({until: dueDate, compact: true,
layout: "$dueDateLayout",
onTick: function (periods) {
var latencyEstimate = (documentReadyTime - clientTime) * 2;
if(\$.countdown.periodsToSeconds(periods) < (300 + latencyEstimate)) {
\$("#submitearly").html("$early");
if (\$.countdown.periodsToSeconds(periods) < 1) {
\$("#submitearly").html("$pastdue");
}
}
if(\$.countdown.periodsToSeconds(periods) < (60 + latencyEstimate)) {
\$(this).css("color", "red"); //Highlight last minute.
}
}
});
}
});

/* This code describes the spellcheck options that will be used for	/* This code describes the spellcheck options that will be used for
items with class 'spellchecked'. It is necessary for those objects'	items with class 'spellchecked'. It is necessary for those objects'
Line 1703 sub show_return_link {	Line 1745 sub show_return_link {
unless ($env{'request.course.id'}) { return 0; }	unless ($env{'request.course.id'}) { return 0; }
if ($env{'request.noversionuri'}=~m{^/priv/} \|\|	if ($env{'request.noversionuri'}=~m{^/priv/} \|\|
$env{'request.uri'}=~m{^/priv/}) { return 1; }	$env{'request.uri'}=~m{^/priv/}) { return 1; }
return if ($env{'request.noversionuri'} eq '/adm/supplemental');	return if (($env{'request.noversionuri'} eq '/adm/supplemental') &&
	($env{'form.folder'} ne 'supplemental'));
	return if (($env{'form.folderpath'} ne '') &&
	(($env{'request.noversionuri'} =~ m{^/adm/$match_domain/$match_username/aboutme$}) \|\|
	($env{'request.noversionuri'} =~ m{^/public/$match_domain/$match_courseid/syllabus$})));
return if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&	return if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
(!$env{'request.role.adv'}));	(!$env{'request.role.adv'}));
if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist\|navmaps)($\|\?)})	if (($env{'request.noversionuri'} =~ m{^/adm/viewclasslist($\|\?)})
\|\| ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($\|\?)})) {	\|\| ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($\|\?)})) {

return if ($env{'form.register'});	return if ($env{'form.register'});
}	}
	if ((($env{'request.symb'} ne '') \|\| ($env{'form.folderpath'} ne '')) &&
	($env{'request.noversionuri'} =~m{^/adm/coursedocs/showdoc/uploaded/($match_domain)/($match_courseid)/(docs\|supplemental)/})) {
	my ($cdom,$cnum,$area) = ($1,$2,$3);
	if (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom) &&
	($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum)) {
	if (($env{'request.symb'}) && ($area eq 'docs')) {
	my ($map,$resid,$url) = &Apache::lonnet::decode_symb($env{'request.symb'});
	return if ($env{'request.noversionuri'} eq '/adm/coursedocs/showdoc/'.$url);
	} elsif (($env{'form.folderpath'}) && ($area eq 'supplemental')) {
	return;
	}
	}
	}
return (($env{'request.noversionuri'}=~m{^/(res\|public)/} &&	return (($env{'request.noversionuri'}=~m{^/(res\|public)/} &&
$env{'request.symb'} eq '')	$env{'request.symb'} eq '')
\|\|	\|\|
Line 1719 sub show_return_link {	Line 1778 sub show_return_link {
(($env{'request.noversionuri'}=~/^\/adm\//) &&	(($env{'request.noversionuri'}=~/^\/adm\//) &&
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&	($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
($env{'request.noversionuri'}!~	($env{'request.noversionuri'}!~
m{^/adm/.*/(smppg\|bulletinboard\|exttools?)($\|\?)})	m{^/adm/.*/(smppg\|bulletinboard\|ext\.tool)($\|\?)})
));	));
}	}

Line 1779 clientTime = (new Date()).getTime();	Line 1838 clientTime = (new Date()).getTime();
END	END
}	}

	##
	# Client-side javascript to convert any dashes in text pasted
	# into textbox(es) for numericalresponse item(s) to a standard
	# minus, i.e., - . Calls to dash_to_minus_js() in end_problem()
	# and in loncommon::endbodytag() for a .page (arg: dashjs => 1)
	#
	# Will apply to any input tag with class: LC_numresponse_text.
	# Currently set in start_textline for numericalresponse items.
	#

	sub dash_to_minus_js {
	return <<'ENDJS';

	<script type="text/javascript">
	//<![CDATA[
	//<!-- BEGIN LON-CAPA Internal
	document.addEventListener("DOMContentLoaded", (event) => {
	const numresp = document.querySelectorAll("input.LC_numresponse_text");
	if (numresp.length > 0) {
	Array.from(numresp).forEach((el) => {
	el.addEventListener("paste", (e) => {
	e.preventDefault();
	e.stopPropagation();
	let p = (e.clipboardData \|\| window.clipboardData).getData("text");
	p.toString();
	var regex;
	try
	{
	regex = new RegExp ("\\p{Dash}", "gu");
	}
	catch (e) { regex = new RegExp ("[\\u058A\\u05BE\\u1400\\u1806\\u2010-\\u2015\\u2212\\u2E3A\\u2E3B\\u2E5D\\u301C\\uFE58\\uFE63\\uFF0D]","g"); }
	p = p.replace(regex,'-');
	putInText(p);
	});
	});
	}
	const putInText = (newText, el = document.activeElement) => {
	const [start, end] = [el.selectionStart, el.selectionEnd];
	el.setRangeText(newText, start, end, 'end');
	}
	});
	// END LON-CAPA Internal -->
	//]]>
	</script>

	ENDJS
	}

############################################################	############################################################
############################################################	############################################################

Line 1815 boolean, controls whether to include a l	Line 1922 boolean, controls whether to include a l

if 'nohelp' don't include the orange help link	if 'nohelp' don't include the orange help link

=item $css_class	=item $crumbs_style

optional name for the class to apply to the table for CSS	optional style attribute for div containing breadcrumbs
	unless called from docs_breadcrumbs

=item $no_mt	=item $no_mt

Line 1838 loncommon::help_open_topic() to generate	Line 1946 loncommon::help_open_topic() to generate
text to include in the link in the optional help item ($topic_help) on the right	text to include in the link in the optional help item ($topic_help) on the right
side of the breadcrumbs row.	side of the breadcrumbs row.

	=item $links_target

	optionally includes the target (_top, _parent or _self) for (i) initial
	$menulink item in the breadcrumbs (if present), (ii) return to last location
	(if present), and (iii) help item at the right side of breadcrumbs menu,
	created by loncommon::help_open_topic() or loncommon::help_open_menu().

=back	=back

=back	=back
Line 1868 returns: nothing	Line 1983 returns: nothing
my %tools = ();	my %tools = ();

sub breadcrumbs {	sub breadcrumbs {
my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt,	my ($component,$component_help,$menulink,$helplink,$crumbs_style,$no_mt,
$CourseBreadcrumbs,$topic_help,$topic_help_text,$crstype) = @_;	$CourseBreadcrumbs,$topic_help,$topic_help_text,$links_target) = @_;
#	#
$css_class \|\|= 'LC_breadcrumbs';

# Make the faq and bug data cascade	# Make the faq and bug data cascade
my $faq = '';	my $faq = '';
my $bug = '';	my $bug = '';
Line 1884 returns: nothing	Line 1997 returns: nothing
#	#
# The first one should be the course or a menu link	# The first one should be the course or a menu link
if (!defined($menulink)) { $menulink=1; }	if (!defined($menulink)) { $menulink=1; }
if ((($crstype eq 'Placement') \|\| (($env{'request.course.id'}) &&	if ($menulink) {
($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement'))) &&	if ($env{'request.course.id'}) {
(!$env{'request.role.adv'})) {	my ($menucoll,$deeplinkmenu,$menuref) = &Apache::loncommon::menucoll_in_effect();
undef($menulink);	if (($menucoll) && (ref($menuref) eq 'HASH')) {
	if ($menuref->{'main'} eq 'n') {
	undef($menulink);
	}
	}
	}
}	}
if ($menulink) {	if ($menulink) {
my $description = 'Menu';	my $description = 'Menu';
Line 1899 returns: nothing	Line 2017 returns: nothing
$env{'course.'.$env{'request.course.id'}.'.description'};	$env{'course.'.$env{'request.course.id'}.'.description'};
$no_mt_descr = 1;	$no_mt_descr = 1;
if ($env{'request.noversionuri'} =~	if ($env{'request.noversionuri'} =~
m{^/public/($match_domain)/($match_courseid)/syllabus$}) {	m{^/?public/($match_domain)/($match_courseid)/syllabus$}) {
unless (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $1) &&	unless (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $1) &&
($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) {	($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) {
$description = 'Menu';	$description = 'Menu';
Line 1907 returns: nothing	Line 2025 returns: nothing
}	}
}	}
}	}
	my $target = '_top';
	if ($links_target) {
	$target = $links_target;
	} elsif ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) \|\|
	(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
	$target='';
	}
$menulink = { href =>'/adm/menu',	$menulink = { href =>'/adm/menu',
title =>'Go to main menu',	title =>'Go to main menu',
target =>'_top',	target =>$target,
text =>$description,	text =>$description,
no_mt =>$no_mt_descr, };	no_mt =>$no_mt_descr, };
if($last) {	if($last) {
Line 1927 returns: nothing	Line 2052 returns: nothing
title => &mt('Back to most recent content resource'),	title => &mt('Back to most recent content resource'),
class => 'LC_menubuttons_link',	class => 'LC_menubuttons_link',
};	};
if ($env{'request.noversionuri'} eq '/adm/searchcat') {	if ($links_target) {
$hashref->{'target'} = '_top';	$hashref->{'target'} = $links_target;
}	}
$links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',	$links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',
$hashref);	$hashref);
Line 1962 returns: nothing	Line 2087 returns: nothing

if ($lasttext ne '') {	if ($lasttext ne '') {
$links .= &htmltag( 'li', htmltag($CourseBreadcrumbs ? 'b' : 'h1',	$links .= &htmltag( 'li', htmltag($CourseBreadcrumbs ? 'b' : 'h1',
$lasttext), {title => $lasttext});	$lasttext));
}	}

my $icons = '';	my $icons = '';
Line 1979 returns: nothing	Line 2104 returns: nothing
if ($faq ne '' \|\| $component_help ne '' \|\| $bug ne '') {	if ($faq ne '' \|\| $component_help ne '' \|\| $bug ne '') {
$icons .= &Apache::loncommon::help_open_menu($component,	$icons .= &Apache::loncommon::help_open_menu($component,
$component_help,	$component_help,
$faq,$bug);	$faq,$bug,'','','','',
	$links_target);
}	}
if ($topic_help && $topic_help_text) {	if ($topic_help && $topic_help_text) {
$icons .= ' '.&Apache::loncommon::help_open_topic($topic_help,&mt($topic_help_text),'',	$icons .= ' '.&Apache::loncommon::help_open_topic($topic_help,&mt($topic_help_text),'',
undef,600);	undef,600,'',$links_target);
}	}
#	#

Line 2013 returns: nothing	Line 2139 returns: nothing
}	}
if (($links ne '') \|\| ($nav_and_tools)) {	if (($links ne '') \|\| ($nav_and_tools)) {
&render_tools(\$links);	&render_tools(\$links);
$links = &htmltag('div', $links,	unless ($CourseBreadcrumbs) {
{ id => "LC_breadcrumbs" }) unless ($CourseBreadcrumbs) ;	my $args = { id => 'LC_breadcrumbs' };
	if ($crumbs_style ne '') {
	$args->{'style'} = $crumbs_style;
	}
	$links = &htmltag('div', $links, $args);
	}
}	}
my $adv_tools = 0;	my $adv_tools = 0;
if (ref($tools{'advtools'}) eq 'ARRAY') {	if (ref($tools{'advtools'}) eq 'ARRAY') {
Line 2031 returns: nothing	Line 2162 returns: nothing

# Return the breadcrumb's line	# Return the breadcrumb's line

	my $labeltext = &HTML::Entities::encode(&mt('Links for navigation and information'));
	return '<div class="LC_landmark" role="navigation" aria-label="'.$labeltext.'">'.$links.'</div>';
return "$links";
}	}

sub clear_breadcrumbs {	sub clear_breadcrumbs {
Line 2183 returns: nothing	Line 2313 returns: nothing
} # End of scope for @Crumbs	} # End of scope for @Crumbs

sub docs_breadcrumbs {	sub docs_breadcrumbs {
my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_;	my ($allowed,$crstype,$contenteditor,$title,$precleared,$checklinkprot)=@_;
my ($folderpath,@folders,$supplementalflag);	my ($folderpath,@folders,$supplementalflag);
@folders = split('&',$env{'form.folderpath'});	@folders = split('&',$env{'form.folderpath'});
if ($env{'form.folderpath'} =~ /^supplemental/) {	if ($env{'form.folderpath'} =~ /^supplemental/) {
Line 2198 sub docs_breadcrumbs {	Line 2328 sub docs_breadcrumbs {
my $foldername=shift(@folders);	my $foldername=shift(@folders);
if ($folderpath) {$folderpath.='&';}	if ($folderpath) {$folderpath.='&';}
$folderpath.=$folder.'&'.$foldername;	$folderpath.=$folder.'&'.$foldername;
my $url;	my $url = $env{'request.use_absolute'};
if ($allowed) {	if ($allowed) {
$url = '/adm/coursedocs?folderpath=';	$url .= '/adm/coursedocs?folderpath=';
} else {	} else {
$url = '/adm/supplemental?folderpath=';	$url .= '/adm/supplemental?folderpath=';
}	}
$url .= &escape($folderpath);	$url .= &escape($folderpath);
my $name=&unescape($foldername);	my $name=&unescape($foldername);
# each of randompick number, hidden, encrypted, random order, is_page	# each of randompick number, hidden, encrypted, random order, is_page
# are appended with ":"s to the foldername	# are appended with ":"s to the foldername
$name=~s/\:(\d)\:(\w)\:(\w):(\d)\:?(\d*)$//;	$name=~s/\:(\d)\:(\w)\:(\w):(\d)\:?(\d*)$//;
unless ($supplementalflag) {	if ($contenteditor) {
if ($contenteditor) {	if ($supplementalflag) {
	if ($2) { $ishidden=1; }
	} else {
if ($1 ne '') {	if ($1 ne '') {
$randompick=$1;	$randompick=$1;
} else {	} else {
Line 2251 sub docs_breadcrumbs {	Line 2383 sub docs_breadcrumbs {
$plain=~s/\&gt\;\s*$//;	$plain=~s/\&gt\;\s*$//;
}	}
my $menulink = 0;	my $menulink = 0;
if (!$allowed && !$contenteditor) {	if (!$allowed && !$contenteditor && !$supplementalflag) {
$menulink = 1;	$menulink = 1;
}	}
	if ($checklinkprot) {
	if ($env{'request.deeplink.login'}) {
	my $linkprotout = &Apache::lonmenu::linkprot_exit();
	if ($linkprotout) {
	&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
	}
	}
	}
return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,	return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,
$contenteditor),	$contenteditor),
$randompick,$ishidden,$isencrypted,$plain,	$randompick,$ishidden,$isencrypted,$plain,
Line 2356 END	Line 2496 END
}	}

sub row_title {	sub row_title {
my ($title,$css_title_class,$css_value_class, $css_value_furtherAttributes) = @_;	my ($title,$css_title_class,$css_value_class,$css_value_furtherAttributes,$nocolon) = @_;
$row_count[0]++;	$row_count[0]++;
my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';	my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row';
$css_title_class \|\|= 'LC_pick_box_title';	$css_title_class \|\|= 'LC_pick_box_title';
Line 2364 sub row_title {	Line 2504 sub row_title {

$css_value_class \|\|= 'LC_pick_box_value';	$css_value_class \|\|= 'LC_pick_box_value';

if ($title ne '') {	if (($title ne '') && (!$nocolon)) {
$title .= ':';	$title .= ':';
}	}
my $output = <<"ENDONE";	my $output = <<"ENDONE";
<tr class="LC_pick_box_row" $css_value_furtherAttributes>	<tr class="LC_pick_box_row" $css_value_furtherAttributes>
<td $css_title_class>	<th $css_title_class>
$title	$title
</td>	</th>
<td class="$css_value_class $css_class">	<td class="$css_value_class $css_class">
ENDONE	ENDONE
return $output;	return $output;
Line 2627 sub course_custom_roles {	Line 2767 sub course_custom_roles {


sub resource_info_box {	sub resource_info_box {
my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)=@_;	my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres)=@_;
my $return='';	my $return='';
if ($stuvcurrent ne '') {	if (($stuvcurrent ne '') \|\| ($divforres)) {
$return = '<div class="LC_left_float">';	$return = '<div class="LC_left_float">';
}	}
if ($symb) {	if ($symb) {
Line 2658 sub resource_info_box {	Line 2798 sub resource_info_box {
} else {	} else {
$return='<p><span class="LC_error">'.&mt('No context provided.').'</span></p>';	$return='<p><span class="LC_error">'.&mt('No context provided.').'</span></p>';
}	}
if ($stuvcurrent ne '') {	if (($stuvcurrent ne '') \|\| ($divforres)) {
$return .= '</div>';	$return .= '</div>';
}	}
return $return;	return $return;
Line 3389 PARAMSONE	Line 3529 PARAMSONE
if (itemid != null) {	if (itemid != null) {
itemh = itemid.offsetHeight;	itemh = itemid.offsetHeight;
}	}
var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;	var primaryheight = 0;
var secondaryheight;	if (document.getElementById('LC_nav_bar') != null) {
	primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
	}
	var secondaryheight = 0;
if (document.getElementById('LC_secondary_menu') != null) {	if (document.getElementById('LC_secondary_menu') != null) {
secondaryheight = document.getElementById('LC_secondary_menu').offsetHeight;	secondaryheight = document.getElementById('LC_secondary_menu').offsetHeight;
}	}
var crumbsheight = document.getElementById('LC_breadcrumbs').offsetHeight;	var crumbsheight = 0;
	if (document.getElementById('LC_breadcrumbs') != null) {
	crumbsheight = document.getElementById('LC_breadcrumbs').offsetHeight;
	}
var dccidheight = 0;	var dccidheight = 0;
if (document.getElementById('dccid') != null) {	if (document.getElementById('dccid') != null) {
dccidheight = document.getElementById('dccid').offsetHeight;	dccidheight = document.getElementById('dccid').offsetHeight;
Line 3467 THIRD	Line 3613 THIRD
sub javascript_jumpto_resource {	sub javascript_jumpto_resource {
my $confirm_switch = &mt("Editing requires switching to the resource's home server.")."\n".	my $confirm_switch = &mt("Editing requires switching to the resource's home server.")."\n".
&mt('Switch server?');	&mt('Switch server?');
	my $confirm_new_tab = &mt("Editing requires using the resource's home server.")."\n".
	&mt('Open a new browser tab?');
&js_escape(\$confirm_switch);	&js_escape(\$confirm_switch);
	&js_escape(\$confirm_new_tab);
return (<<ENDUTILITY)	return (<<ENDUTILITY)

function go(url) {	function go(url) {
if (url!='' && url!= null) {	if (url!='' && url!= null) {
currentURL = null;	currentURL = null;
currentSymb= null;	currentSymb= null;
window.location.href=url;	var lcHostname = setLCHost();
	if (lcHostname!='' && lcHostname!= null) {
	var RegExp = /^https?\:/;
	if (RegExp.test(url)) {
	window.location.href=url;
	} else {
	window.location.href=lcHostname+url;
	}
	} else {
	window.location.href=url;
	}
}	}
}	}

function need_switchserver(url) {	function need_switchserver(url,target) {
if (url!='' && url!= null) {	if (url!='' && url!= null) {
if (confirm("$confirm_switch")) {	if (target == '_blank') {
	if (confirm("$confirm_new_tab")) {
	window.open(url,target);
	}
	} else if (confirm("$confirm_switch")) {
go(url);	go(url);
}	}
}	}
Line 3492 ENDUTILITY	Line 3655 ENDUTILITY
}	}

sub jump_to_editres {	sub jump_to_editres {
my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath,	my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$shownsymb,
$title,$idx,$suppurl,$todocs) = @_;	$folderpath,$title,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_;
my $jscall;	my ($jscall,$anchor,$usehttp,$usehttps,$is_ext,$target);
if ($switchserver) {	if ($switchserver) {
if ($home) {	if ($home) {
	my $resedit;
	if ($cfile =~ m{^/priv/($match_domain)/($match_username)/}) {
	my ($audom,$auname) = ($1,$2);
	unless (&Apache::lonnet::is_course($audom,$auname)) {
	unless ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$audom)) &&
	(&Apache::lonnet::will_trust('coaurem',$audom,$env{'user.domain'}))) {
	return;
	}
	if (($symb ne '') && ($env{'request.course.id'}) &&
	(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
	unless (&Apache::lonnet::can_switchserver($env{'user.domain'},$home)) {
	$target = '_blank';
	$resedit = 1;
	}
	}
	}
	}
$cfile = '/adm/switchserver?otherserver='.$home.'&role='.	$cfile = '/adm/switchserver?otherserver='.$home.'&role='.
&HTML::Entities::encode($env{'request.role'},'"<>&');	&HTML::Entities::encode($env{'request.role'},'"<>&');
if ($symb) {	if ($shownsymb) {
$cfile .= '&symb='.&HTML::Entities::encode($symb,'"<>&');	$cfile .= '&symb='.&HTML::Entities::encode($shownsymb,'"<>&');
	if ($resedit) {
	$cfile .= '&edit=1';
	}
} elsif ($folderpath) {	} elsif ($folderpath) {
$cfile .= '&folderpath='.&HTML::Entities::encode($folderpath,'"<>&');	$cfile .= '&folderpath='.&HTML::Entities::encode($folderpath,'"<>&');
}	}
Line 3510 sub jump_to_editres {	Line 3693 sub jump_to_editres {
if ($forcereg) {	if ($forcereg) {
$cfile .= '&register=1';	$cfile .= '&register=1';
}	}
$jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."');";	$jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."','$target')";
}	}
} else {	} else {
unless ($cfile =~ m{^/priv/}) {	unless ($cfile =~ m{^/priv/}) {
	if ($cfile =~ m{^(/adm/wrapper/ext/([^#]+))(?:\|#([^#]+))$}) {
	$cfile = $1;
	my $extlink = $2;
	$anchor = $3;
	$is_ext = 1;
	if (($extlink !~ /^https:/) && ($ENV{'SERVER_PORT'} == 443)) {
	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
	$usehttp = 1;
	}
	} elsif ($env{'request.use_absolute'}) {
	if ($env{'request.use_absolute'} =~ m{^https://}) {
	$usehttps = 1;
	}
	}
	} elsif ($cfile =~ m{^/?public/($match_domain)/($match_courseid)/syllabus}) {
	if ($ENV{'SERVER_PORT'} == 443) {
	my ($cdom,$cnum) = ($1,$2);
	if (($env{'request.course.id'}) &&
	($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum) &&
	($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom)) {
	if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://}) {
	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
	$usehttp = 1;
	}
	}
	}
	} elsif ($env{'request.use_absolute'}) {
	if ($env{'request.use_absolute'} =~ m{^https://}) {
	$usehttps = 1;
	}
	}
	}
if ($symb) {	if ($symb) {
	if ($anchor ne '') {
	if ($symb =~ m{^([^#]+)\Q#$anchor\E$}) {
	$symb = $1.&escape(&escape('#')).$anchor;
	}
	}
$cfile .= (($cfile=~/\?/)?'&':'?')."symb=$symb";	$cfile .= (($cfile=~/\?/)?'&':'?')."symb=$symb";
} elsif ($folderpath) {	} elsif ($folderpath) {
$cfile .= (($cfile=~/\?/)?'&':'?').	$cfile .= (($cfile=~/\?/)?'&':'?').
Line 3533 sub jump_to_editres {	Line 3753 sub jump_to_editres {
}	}
if ($forceedit) {	if ($forceedit) {
$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1';	$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1';
	if ($usehttps) {
	$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile;
	}
	} elsif ($usehttp) {
	if ($hostname ne '') {
	$cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile;
	}
	$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1';
	} elsif ($usehttps) {
	$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile;
}	}
if ($forcereg) {	if ($forcereg) {
$cfile .= (($cfile=~/\?/)?'&':'?').'register=1';	$cfile .= (($cfile=~/\?/)?'&':'?').'register=1';
}	}
if ($todocs) {	if ($todocs) {
$cfile .= (($cfile=~/\?/)?'&':'?').'todocs=1';	$cfile .= (($cfile=~/\?/)?'&':'?').'todocs=1';
	}
	if ($suppanchor ne '') {
	$cfile .= (($cfile=~/\?/)?'&':'?').'anchor='.
	&HTML::Entities::encode($suppanchor,'"<>&');
}	}
}	}
	if ($anchor ne '') {
	$cfile .= '#'.$anchor;
	}
$jscall = "go('".&Apache::loncommon::escape_single($cfile)."')";	$jscall = "go('".&Apache::loncommon::escape_single($cfile)."')";
}	}
return $jscall;	return $jscall;
Line 3552 sub jump_to_editres {	Line 3789 sub jump_to_editres {
# javascript_valid_email	# javascript_valid_email
#	#
# Generates javascript to validate an e-mail address.	# Generates javascript to validate an e-mail address.
# Returns a javascript function which accetps a form field as argumnent, and	# Returns a javascript function which accepts a form field as argument, and
# returns false if field.value does not satisfy two regular expression matches	# returns false if field.value does not satisfy two regular expression matches
# for a valid e-mail address. Backwards compatible with old browsers without	# for a valid e-mail address. Backwards compatible with old browsers without
# support for javascript RegExp (just checks for @ in field.value in this case).	# support for javascript RegExp (just checks for @ in field.value in this case).

sub javascript_valid_email {	sub javascript_valid_email {
my $scripttag .= <<'END';	my $scripttag .= <<'END';
function validmail(field) {	function validmail(field,suffix) {
var str = field.value;	var str = field.value;
	if (suffix != '' && suffix != undefined) {
	str += suffix;
	}
if (window.RegExp) {	if (window.RegExp) {
var reg1str = "(@.*@)\|(\\.\\.)\|(@\\.)\|(\\.@)\|(^\\.)";	var reg1str = "(@.*@)\|(\\.\\.)\|(@\\.)\|(\\.@)\|(^\\.)";
var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}\|[0-9]{1,3})(\\]?)$"; //"	var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}\|[0-9]{1,3})(\\]?)$"; //"
Line 3736 sub list_from_array {	Line 3976 sub list_from_array {
sub generate_menu {	sub generate_menu {
my @menu = @_;	my @menu = @_;
# subs for specific html elements	# subs for specific html elements
my ($h3, $div, $ul, $li, $a, $img) = inittags( qw(h3 div ul li a img) );	my ($h2, $div, $ul, $li, $a, $img) = inittags( qw(h2 div ul li a img) );

my @categories; # each element represents the entire markup for a category	my @categories; # each element represents the entire markup for a category

Line 3759 sub generate_menu {	Line 3999 sub generate_menu {
src => $src,	src => $src,
alt => mt(defined($$link{alttext}) ?	alt => mt(defined($$link{alttext}) ?
$$link{alttext} : $$link{linktext})	$$link{alttext} : $$link{linktext})
}), {	}).mt($$link{linktext}), {
href => $$link{url},
title => mt($$link{linktitle}),
class => 'LC_menubuttons_link'
}).
$a->(mt($$link{linktext}), {
href => $$link{url},	href => $$link{url},
title => mt($$link{linktitle}),	title => mt($$link{linktitle}),
class => "LC_menubuttons_link"	class => "LC_menubuttons_link"
}).	}).
(defined($$link{help}) ?	(defined($$link{help}) ?
Apache::loncommon::help_open_topic($$link{help}) : ''),	Apache::loncommon::help_open_topic($$link{help}) : ''),
{class => "LC_menubuttons_inline_text"}));	{class => "LC_menubuttons_inline_text"}));
}	}

# wrap categorytitle in <h3>, concatenate with	# wrap categorytitle in <h2>, concatenate with
# joined and in <ul> tags wrapped @links	# joined and in <ul> tags wrapped @links
# and wrap everything in an enclosing <div> and push it into	# and wrap everything in an enclosing <div> and push it into
# @categories	# @categories
# such that each element looks like:	# such that each element looks like:
# <div><h3>title</h3><ul><li>...</li>...</ul></div>	# <div><h2>title</h2><ul><li>...</li>...</ul></div>
# the category won't be added if there aren't any links	# the category won't be added if there aren't any links
push(@categories,	push(@categories,
$div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).	$div->($h2->(mt($$category{categorytitle}), {class=>'LC_hcell LC_heading_2'}).
$ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }),	$ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }),
{class=>"LC_Box LC_400Box"})) if scalar(@links);	{class=>"LC_Box LC_400Box"})) if scalar(@links);
}	}

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

Removed from v.1.372
changed lines
	Added in v.1.420