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.358.2.4 and 1.358.2.19.2.10

version 1.358.2.4, 2016/08/04 21:26:35	version 1.358.2.19.2.10, 2024/08/22 18:43:03
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.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 96 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 105 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.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 407 sub textbox {	Line 415 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 423 sub checkbox {
if ($checked) {	if ($checked) {
$Str .= ' checked="checked"';	$Str .= ' checked="checked"';
}	}
$Str .= ' />';	$Str .= $special.' />';
return $Str;	return $Str;
}	}

Line 534 sub date_setter {	Line 542 sub date_setter {

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 669 ENDJS	Line 679 ENDJS
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" />};
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" />};
my $cal_link;	my $cal_link;
if (!$nolink) {	unless (($nolink) \|\| ($state eq 'disabled')) {
$cal_link = qq{<a href="javascript:$dname\_opencalendar()">};	$cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
}	}
#	#
Line 694 ENDJS	Line 704 ENDJS
$hourselector,$minuteselector,$secondselector).	$hourselector,$minuteselector,$secondselector).
$tzone;	$tzone;
}	}
if (!$nolink) {	unless (($nolink) \|\| ($state eq 'disabled')) {
$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');	$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
}	}
$result .= "</span>\n<!-- end $dname date setting form -->\n";	$result .= "</span>\n<!-- end $dname date setting form -->\n";
Line 846 parameter setting wizard.	Line 856 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 1007 Inputs	Line 1018 Inputs

=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

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 1080 Returns: none	Line 1094 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 1143 sub Increment_PrgWin {	Line 1157 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 1160 sub Close_PrgWin {	Line 1174 sub Close_PrgWin {
sub crumbs {	sub crumbs {
my ($uri,$target,$prefix,$form,$skiplast,$onclick)=@_;	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 1180 sub crumbs {	Line 1194 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) {
Line 1257 sub htmlareaheaders {	Line 1277 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 1342 sub htmlareaselectactive {	Line 1362 sub htmlareaselectactive {
}	}

function startRichEditor(id) {	function startRichEditor(id) {
	// fix character entities inside <m>
	// NOTE: this is not fixing characters inside <parse>
	// NOTE: < and > inside <chem> should fix automatically because there should not be a letter after <.
	var ta = document.getElementById(id);
	var value = ta.value;
	var in_m = false; // in the m element
	var in_text = false; // in the text inside the m element
	var im = -1; // position of <m>
	var it = -1; // position of the text inside
	for (var i=0; i<value.length; i++) {
	if (value.substr(i, 2) == "<m") {
	// ignore previous <m> if found twice
	in_m = true;
	in_text = false;
	im = i;
	it = -1;
	} else if (in_m) {
	if (!in_text) {
	if (value.charAt(i) == ">") {
	in_text = true;
	it = i+1;
	}
	} else if (value.substr(i, 4) == "</m>") {
	in_m = false;
	var text = value.substr(it, i-it);
	var l1 = text.length;
	text = text.replace(/</g, "<");
	text = text.replace(/>/g, ">");
	var l2 = text.length;
	value = value.substr(0, it) + text + "</m>" + value.substr(i+4);
	i = i + (l2-l1);
	}
	}
	}
	ta.value = value;
CKEDITOR.replace(id,	CKEDITOR.replace(id,
{	{
customConfig: "/ckeditor/loncapaconfig.js",	customConfig: "/ckeditor/loncapaconfig.js",
Line 1353 sub htmlareaselectactive {	Line 1408 sub htmlareaselectactive {

function destroyRichEditor(id) {	function destroyRichEditor(id) {
CKEDITOR.instances[id].destroy();	CKEDITOR.instances[id].destroy();
	// replace character entities < and > in <m> and <chem>
	// and "&fctname(" by "&fctname("
	// and the quotes inside functions: "&fct(1, "a")" -> "&fct(1, "a")"
	var ta = document.getElementById(id);
	var value = ta.value;
	var in_element = false; // in the m or chem element
	var tagname = ""; // m or chem
	var in_text = false; // in the text inside the element
	var im = -1; // position of start tag
	var it = -1; // position of the text inside
	for (var i=0; i<value.length; i++) {
	if (value.substr(i, 2) == "<m" \|\| value.substr(i, 5) == "<chem") {
	// ignore previous tags if found twice
	in_element = true;
	if (value.substr(i, 2) == "<m")
	tagname = "m";
	else
	tagname = "chem";
	in_text = false;
	im = i;
	it = -1;
	} else if (in_element) {
	if (!in_text) {
	if (value.charAt(i) == ">") {
	in_text = true;
	it = i+1;
	}
	} else if (value.substr(i, 3+tagname.length) == "</"+tagname+">") {
	in_element = false;
	var text = value.substr(it, i-it);
	var l1 = text.length;
	text = text.replace(/</g, "<");
	text = text.replace(/>/g, ">");
	var l2 = text.length;
	value = value.substr(0, it) + text + value.substr(i);
	i = i + (l2-l1);
	}
	}
	}
	// fix function names
	value = value.replace(/&([a-zA-Z_]+)\(/g, "&$1(");
	// fix quotes in functions
	var pos_next_fct = value.search(/&[a-zA-Z_]+\(/);
	var depth = 0;
	for (var i=0; i<value.length; i++) {
	if (i == pos_next_fct) {
	depth++;
	var sub = value.substring(i+1);
	var pos2 = sub.search(/&[a-zA-Z_]+\(/);
	if (pos2 == -1)
	pos_next_fct = -1;
	else
	pos_next_fct = i + 1 + pos2;
	} else if (depth > 0) {
	if (value.charAt(i) == ")")
	depth--;
	else if (value.substr(i, 6) == """)
	value = value.substr(0, i) + "\"" + value.substr(i+6);
	}
	}
	// replace the text value
	ta.value = value;
}	}

function editorHandler(event) {	function editorHandler(event) {
Line 1570 sub show_return_link {	Line 1687 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'));
if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist\|navmaps)($\|\?)})	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$})));
	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 1585 sub show_return_link {	Line 1718 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)($\|\?)})	m{^/adm/.*/(smppg\|bulletinboard\|ext\.tool)($\|\?)})
));	));
}	}

Line 1645 clientTime = (new Date()).getTime();	Line 1778 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\\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 1672 Inputs: $component (the text on the righ	Line 1853 Inputs: $component (the text on the righ
row, using loncommon::help_open_topic() to generate the link.	row, using loncommon::help_open_topic() to generate the link.
$topic_help_text (text to include in the link in the optional help item	$topic_help_text (text to include in the link in the optional help item
on the right side of the breadcrumbs row.	on the right side of the breadcrumbs row.
	$links_target optionally includes the target (_top, _parent or _self)

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

Line 1700 returns: nothing	Line 1882 returns: nothing

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

Line 1716 returns: nothing	Line 1898 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 ($menulink) {	if ($menulink) {
	if ($env{'request.course.id'}) {
	my ($menucoll,$deeplinkmenu,$menuref) = &Apache::loncommon::menucoll_in_effect();
	if (($menucoll) && (ref($menuref) eq 'HASH')) {
	if ($menuref->{'main'} eq 'n') {
	undef($menulink);
	}
	}
	}
	}
	if ($menulink) {
my $description = 'Menu';	my $description = 'Menu';
my $no_mt_descr = 0;	my $no_mt_descr = 0;
if ((exists($env{'request.course.id'})) &&	if ((exists($env{'request.course.id'})) &&
Line 1725 returns: nothing	Line 1917 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 1733 returns: nothing	Line 1925 returns: nothing
}	}
}	}
}	}
	my $target = '_top';
	if ($links_target) {
	$target = $links_target;
	} elsif (($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 1753 returns: nothing	Line 1951 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 1805 returns: nothing	Line 2003 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 1926 returns: nothing	Line 2125 returns: nothing
undef(%tools);	undef(%tools);
}	}

	=item &current_breadcrumb_tools()

	returns: a hash containing the current breadcrumb tools.

	=cut

	sub current_breadcrumb_tools {
	return %tools;
	}

=item &render_tools(\$breadcrumbs)	=item &render_tools(\$breadcrumbs)

Creates html for breadcrumb tools (categories navigation and tools) and inserts	Creates html for breadcrumb tools (categories navigation and tools) and inserts
Line 1977 returns: nothing	Line 2186 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 1992 sub docs_breadcrumbs {	Line 2201 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 2045 sub docs_breadcrumbs {	Line 2256 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 2421 sub course_custom_roles {	Line 2640 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 2452 sub resource_info_box {	Line 2671 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 2467 sub resource_info_box {	Line 2686 sub resource_info_box {
#	#

sub display_usage {	sub display_usage {
my ($current_disk_usage,$disk_quota) = @_;	my ($current_disk_usage,$disk_quota,$context) = @_;
my $usage = $current_disk_usage/1000;	my $usage = $current_disk_usage/1024;
my $quota = $disk_quota/1000;	my $quota = $disk_quota/1024;
my $percent;	my $percent;
if ($disk_quota == 0) {	if ($disk_quota == 0) {
$percent = 100.0;	$percent = 100.0;
Line 2493 sub display_usage {	Line 2712 sub display_usage {
if ($prog_width > 100) {	if ($prog_width > 100) {
$prog_width = 100;	$prog_width = 100;
}	}
	my $display = 'block';
	if ($context eq 'authoring') {
	$display = 'inline';
	}
return '	return '
<div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".	<div id="meter1" align="left" style="display:'.$display.'" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
' <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".	' <div id="meter2" style="display:block; margin-top:3px; margin-bottom:3px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
' <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".	' <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
' </div>'."\n".	' </div>'."\n".
' </div>';	' </div>';
Line 3179 PARAMSONE	Line 3402 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 3257 THIRD	Line 3486 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 3282 ENDUTILITY	Line 3528 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)) {
	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 3300 sub jump_to_editres {	Line 3562 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 3323 sub jump_to_editres {	Line 3622 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 3342 sub jump_to_editres {	Line 3658 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})(\\]?)$"; //"

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

Removed from v.1.358.2.4
changed lines
	Added in v.1.358.2.19.2.10