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.352 and 1.358.2.11.6.1

version 1.352, 2013/07/22 11:46:23	version 1.358.2.11.6.1, 2020/04/07 18:26:30
Line 176 sub dragmath_js {	Line 176 sub dragmath_js {
function mathedit(textarea, doc) {	function mathedit(textarea, doc) {
targetEntry = textarea;	targetEntry = textarea;
targetDoc = doc;	targetDoc = doc;
newwin = window.open("/adm/dragmath/applet/$popup.html","","width=565,height=500,resizable");	newwin = window.open("/adm/dragmath/$popup.html","","width=565,height=500,resizable");
}	}
// ]]>	// ]]>
</script>	</script>
Line 407 sub textbox {	Line 407 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 415 sub checkbox {
if ($checked) {	if ($checked) {
$Str .= ' checked="checked"';	$Str .= ' checked="checked"';
}	}
$Str .= ' />';	$Str .= $special.' />';
return $Str;	return $Str;
}	}

Line 482 the date/time fields are left empty.	Line 482 the date/time fields are left empty.
=item $state	=item $state

Specifies the initial state of the form elements. Either 'disabled' or empty.	Specifies the initial state of the form elements. Either 'disabled' or empty.
Defaults to empty, which indiciates the form elements are not disabled.	Defaults to empty, which indicates the form elements are not disabled.

	=item $no_hh_mm_ss

	If true, text boxes for hours, minutes and seconds are omitted.

	=item $defhour

	Default value for hours (a default of 0 is used otherwise).

	=item $defmin

	Default value for minutes (a default of 0 is used otherwise).

	=item defsec

	Default value for seconds (a default of 0 is used otherwise).

	=item $nolink

	If true, a "Select calendar" link (to pop-up a calendar) is not displayed
	to the right of the items.

	=item $no_mm_ss

	If true, text boxes for minutes and seconds are omitted.

	=item $no_ss

	If true, text boxes for seconds are omitted.

=back	=back

Line 496 The method used to restrict user input w	Line 525 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,$defhour,$defmin,$defsec,$nolink) = @_;	$no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink,$no_mm_ss,$no_ss) = @_;
my $now = time;	my $now = time;

my $tzname;	my $tzname;
Line 505 sub date_setter {	Line 534 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 649 ENDJS	Line 680 ENDJS
$result .= &mt('[_1] [_2] [_3] ',	$result .= &mt('[_1] [_2] [_3] ',
$monthselector,$dayselector,$yearselector).	$monthselector,$dayselector,$yearselector).
$tzone;	$tzone;
if (!$nolink) {	} elsif ($no_mm_ss) {
$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');	$result .= &mt('[_1] [_2] [_3] [_4]',
}	$monthselector,$dayselector,$yearselector,
	$hourselector).
	$tzone;
	} elsif ($no_ss) {
	$result .= &mt('[_1] [_2] [_3] [_4] [_5]m',
	$monthselector,$dayselector,$yearselector,
	$hourselector,$minuteselector).
	$tzone;
} else {	} else {
$result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',	$result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',
$monthselector,$dayselector,$yearselector,	$monthselector,$dayselector,$yearselector,
$hourselector,$minuteselector,$secondselector).	$hourselector,$minuteselector,$secondselector).
$tzone;	$tzone;
if (!$nolink) {	}
$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');	if (!$nolink) {
}	$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";
return $result;	return $result;
Line 1122 sub Close_PrgWin {	Line 1160 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 1144 sub crumbs {	Line 1182 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 1221 sub htmlareaheaders {	Line 1265 sub htmlareaheaders {
ENDEDITOR	ENDEDITOR
}	}
$s.=(<<ENDJQUERY);	$s.=(<<ENDJQUERY);
<script type="text/javascript" src="/adm/jQuery/js/jquery-1.6.2.min.js"></script>	<script type="text/javascript" src="/adm/jQuery/js/jquery-1.11.3.min.js"></script>
<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.8.16.custom.min.js"></script>	<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.11.4.custom.min.js"></script>
<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.8.16.custom.css" />	<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.11.4.custom.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" />
<script type="text/javascript" src="/adm/countdown/js/jquery.countdown.js"></script>	<script type="text/javascript" src="/adm/countdown/js/jquery.countdown.min.js"></script>
<link rel="stylesheet" type="text/css" href="/adm/countdown/css/jquery.countdown.css" />	<link rel="stylesheet" type="text/css" href="/adm/countdown/css/jquery.countdown.css" />

<script type="text/javascript" src="/adm/spellchecker/js/jquery.spellchecker.min.js"></script>	<script type="text/javascript" src="/adm/spellchecker/js/jquery.spellchecker.min.js"></script>
Line 1306 sub htmlareaselectactive {	Line 1350 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 1317 sub htmlareaselectactive {	Line 1396 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 1549 sub show_return_link {	Line 1690 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 1624 A link to help for the component will be	Line 1765 A link to help for the component will be
All inputs can be undef without problems.	All inputs can be undef without problems.

Inputs: $component (the text on the right side of the breadcrumbs trail),	Inputs: $component (the text on the right side of the breadcrumbs trail),
$component_help	$component_help (the help item filename (without .tex extension).
$menulink (boolean, controls whether to include a link to /adm/menu)	$menulink (boolean, controls whether to include a link to /adm/menu)
$helplink (if 'nohelp' don't include the orange help link)	$helplink (if 'nohelp' don't include the orange help link)
$css_class (optional name for the class to apply to the table for CSS)	$css_class (optional name for the class to apply to the table for CSS)
$no_mt (optional flag, 1 if &mt() is _not_ to be applied to $component	$no_mt (optional flag, 1 if &mt() is _not_ to be applied to $component
when including the text on the right.	when including the text on the right.
	$CourseBreadcrumbs (optional flag, 1 if &breadcrumbs called from &docs_breadcrumbs,
	because breadcrumbs are being)
	$topic_help (optional help item to be displayed on right side of the breadcrumbs
	row, using loncommon::help_open_topic() to generate the link.
	$topic_help_text (text to include in the link in the optional help item
	on the right side of the breadcrumbs row.

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

=item &clear_breadcrumbs()	=item &clear_breadcrumbs()
Line 1657 returns: nothing	Line 1805 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) = @_;	$CourseBreadcrumbs,$topic_help,$topic_help_text) = @_;
#	#
$css_class \|\|= 'LC_breadcrumbs';	$css_class \|\|= 'LC_breadcrumbs';

Line 1682 returns: nothing	Line 1830 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 1706 returns: nothing	Line 1854 returns: nothing
my $links;	my $links;
if ((&show_return_link) && (!$CourseBreadcrumbs) && (ref($last) eq 'HASH')) {	if ((&show_return_link) && (!$CourseBreadcrumbs) && (ref($last) eq 'HASH')) {
my $alttext = &mt('Go Back');	my $alttext = &mt('Go Back');
	my $hashref = { href => '/adm/flip?postdata=return:',
	title => &mt('Back to most recent content resource'),
	class => 'LC_menubuttons_link',
	};
	if ($env{'request.noversionuri'} eq '/adm/searchcat') {
	$hashref->{'target'} = '_top';
	}
$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" />',
{ href => '/adm/flip?postdata=return:',	$hashref);
title => &mt('Back to most recent content resource'),
class => 'LC_menubuttons_link',
});
$links=&htmltag('li',$links);	$links=&htmltag('li',$links);
}	}
$links.= join "",	$links.= join "",
Line 1760 returns: nothing	Line 1912 returns: nothing
$component_help,	$component_help,
$faq,$bug);	$faq,$bug);
}	}
	if ($topic_help && $topic_help_text) {
	$icons .= ' '.&Apache::loncommon::help_open_topic($topic_help,&mt($topic_help_text),'',
	undef,600);
	}
#	#


Line 1772 returns: nothing	Line 1928 returns: nothing
}	}


if ($component) {	if (($component) \|\| ($topic_help && $topic_help_text)) {
$links = &htmltag('span',	$links = &htmltag('span',
( $no_mt ? $component : mt($component) ).	( $no_mt ? $component : mt($component) ).
( $icons ? $icons : '' ),	( $icons ? $icons : '' ),
Line 1875 returns: nothing	Line 2031 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 2237 sub course_selection {	Line 2403 sub course_selection {
if ($totcodes > 0) {	if ($totcodes > 0) {
my $numtitles = @$codetitles;	my $numtitles = @$codetitles;
if ($numtitles > 0) {	if ($numtitles > 0) {
$output .= '<label><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').'</label><br />';	$output .= '<label><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&html_escape(&mt('Choose categories, from left to right'))."'".')" />'.&mt('Pick courses by category:').'</label><br />';
$output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".	$output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
'<select name="'.$standardnames->[0].	'<select name="'.$standardnames->[0].
'" onchange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".	'" onchange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".
Line 2416 sub resource_info_box {	Line 2582 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 2442 sub display_usage {	Line 2608 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 2694 sub set_form_elements {	Line 2864 sub set_form_elements {

sub file_submissionchk_js {	sub file_submissionchk_js {
my ($turninpaths,$multiples) = @_;	my ($turninpaths,$multiples) = @_;
my $overwritewarn = &mt('File(s) you uploaded for your submission will overwrite existing file(s) submitted for this item').'\\n'.	my $overwritewarn = &mt('File(s) you uploaded for your submission will overwrite existing file(s) submitted for this item')."\n".
&mt('Continue submission and overwrite the file(s)?');	&mt('Continue submission and overwrite the file(s)?');
my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.	&js_escape(\$overwritewarn);
	my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.')."\n".
&mt('Continue submission with these files removed?');	&mt('Continue submission with these files removed?');
	&js_escape(\$delfilewarn);
my ($turninpathtext,$multtext,$arrayindexofjs);	my ($turninpathtext,$multtext,$arrayindexofjs);
if (ref($turninpaths) eq 'HASH') {	if (ref($turninpaths) eq 'HASH') {
foreach my $key (sort(keys(%{$turninpaths}))) {	foreach my $key (sort(keys(%{$turninpaths}))) {
Line 2938 ENDSCRIPT	Line 3110 ENDSCRIPT
##############################################	##############################################

sub resize_scrollbox_js {	sub resize_scrollbox_js {
my ($context,$tabidstr) = @_;	my ($context,$tabidstr,$tid) = @_;
my (%names,$paddingwfrac,$offsetwfrac,$offsetv,$minw,$minv);	my (%names,$paddingwfrac,$offsetwfrac,$offsetv,$minw,$minv);
if ($context eq 'docs') {	if ($context eq 'docs') {
%names = (	%names = (
Line 2974 window.onresize=callResize;	Line 3146 window.onresize=callResize;

';	';
if ($context eq 'docs') {	if ($context eq 'docs') {
$output .= '	if ($env{'form.active'}) {
var activeTab;	$output .= "\nvar activeTab = '$env{'form.active'}$tid';\n";
';	} else {
	$output .= "\nvar activeTab = '';\n";
	}
}	}
$output .= <<"FIRST";	$output .= <<"FIRST";

Line 3200 THIRD	Line 3374 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?');
	&js_escape(\$confirm_switch);
return (<<ENDUTILITY)	return (<<ENDUTILITY)

function go(url) {	function go(url) {
Line 3227 ENDUTILITY	Line 3402 ENDUTILITY

sub jump_to_editres {	sub jump_to_editres {
my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath,	my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath,
$title,$idx,$suppurl,$todocs) = @_;	$title,$idx,$suppurl,$todocs,$suppanchor) = @_;
my $jscall;	my ($jscall,$anchor);
if ($switchserver) {	if ($switchserver) {
if ($home) {	if ($home) {
$cfile = '/adm/switchserver?otherserver='.$home.'&role='.	$cfile = '/adm/switchserver?otherserver='.$home.'&role='.
Line 3244 sub jump_to_editres {	Line 3419 sub jump_to_editres {
if ($forcereg) {	if ($forcereg) {
$cfile .= '&register=1';	$cfile .= '&register=1';
}	}
$jscall = "need_switchserver('$cfile');";	$jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."');";
}	}
} else {	} else {
unless ($cfile =~ m{^/priv/}) {	unless ($cfile =~ m{^/priv/}) {
	if ($cfile =~ m{^(/adm/wrapper/ext/[^#]+)#([^#]+)$}) {
	$cfile = $1;
	$anchor = $2;
	}
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 3272 sub jump_to_editres {	Line 3456 sub jump_to_editres {
$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('$cfile')";	$jscall = "go('".&Apache::loncommon::escape_single($cfile)."')";
}	}
return $jscall;	return $jscall;
}	}
Line 3342 END	Line 3533 END
sub htmltag{	sub htmltag{
return	return
qq\|<$_[0]\|	qq\|<$_[0]\|
. join( '', map { qq\| $_="${$_[2]}{$_}"\| if ${$_[2]}{$_} } keys %{ $_[2] } )	. join( '', map { qq\| $_="${$_[2]}{$_}"\| if ${$_[2]}{$_} } keys(%{ $_[2] }) )
. ($_[1] ? qq\|>$_[1]</$_[0]>\| : qq\|/>\|). "\n";	. ($_[1] ? qq\|>$_[1]</$_[0]>\| : qq\|/>\|). "\n";
};	};

Line 3605 add_item_funclist	Line 3796 add_item_funclist
Inputs: ./.	Inputs: ./.

Returns: HTML code with function list end	Returns: HTML code with function list end

=cut	=cut

sub end_funclist {	sub end_funclist {
Line 3648 sub funclist_from_array {	Line 3840 sub funclist_from_array {

=pod	=pod

	=over

=item &actionbox( \@array )	=item &actionbox( \@array )

Constructs a XHTML list from \@array with the first item being visually	Constructs a XHTML list from \@array with the first item being visually
Line 3665 A reference to the array containing text	Line 3859 A reference to the array containing text

=back	=back

Returns: XHTML div as string.	Returns: XHTML div as string.

=back	=back

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

Removed from v.1.352
changed lines
	Added in v.1.358.2.11.6.1