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.20 and 1.359

version 1.358.2.20, 2023/09/11 14:13:31	version 1.359, 2015/03/31 13:46:01
Line 92 sub raw_href_to_link {	Line 92 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 407 sub textbox {	Line 407 sub textbox {
##############################################	##############################################
##############################################	##############################################
sub checkbox {	sub checkbox {
my ($name,$checked,$value,$special) = @_;	my ($name,$checked,$value) = @_;
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 .= $special.' />';	$Str .= ' />';
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 indicates the form elements are not disabled.	Defaults to empty, which indiciates 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 525 The method used to restrict user input w	Line 496 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_mm_ss,$no_ss) = @_;	$no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_;
my $now = time;	my $now = time;

my $tzname;	my $tzname;
Line 534 sub date_setter {	Line 505 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 671 ENDJS	Line 640 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;
unless (($nolink) \|\| ($state eq 'disabled')) {	if (!$nolink) {
$cal_link = qq{<a href="javascript:$dname\_opencalendar()">};	$cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
}	}
#	#
Line 680 ENDJS	Line 649 ENDJS
$result .= &mt('[_1] [_2] [_3] ',	$result .= &mt('[_1] [_2] [_3] ',
$monthselector,$dayselector,$yearselector).	$monthselector,$dayselector,$yearselector).
$tzone;	$tzone;
} elsif ($no_mm_ss) {	if (!$nolink) {
$result .= &mt('[_1] [_2] [_3] [_4]',	$result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
$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) {
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";
return $result;	return $result;
Line 1009 Inputs	Line 971 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 1085 Returns: none	Line 1044 Returns: none

# Create progress	# Create progress
sub Create_PrgWin {	sub Create_PrgWin {
my ($r,$number_to_do,$preamble)=@_;	my ($r,$number_to_do)=@_;
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,$prog_state{'max'},$preamble);	&Apache::loncommon::LCprogressbar($r);
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,$$prog_state{'max'});	&Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString);
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1148 sub Increment_PrgWin {	Line 1107 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,$$prog_state{'max'});	&Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo);
$$prog_state{'laststart'}=&Time::HiRes::time();	$$prog_state{'laststart'}=&Time::HiRes::time();
}	}

Line 1163 sub Close_PrgWin {	Line 1122 sub Close_PrgWin {
# ------------------------------------------------------- Puts directory header	# ------------------------------------------------------- Puts directory header

sub crumbs {	sub crumbs {
my ($uri,$target,$prefix,$form,$skiplast,$onclick)=@_;	my ($uri,$target,$prefix,$form,$skiplast)=@_;
# You cannot crumbnify uploaded or adm resources	# You cannot crumbnify uploaded or adm resources
if ($uri=~/^\/*(uploaded\|adm)\//) { return &mt('(Internal Course/Community Content)'); }	if ($uri=~/^\/*(uploaded\|adm)\//) { return &mt('(Internal Course/Group Content)'); }
if ($target) {	if ($target) {
$target = ' target="'.	$target = ' target="'.
&Apache::loncommon::escape_single($target).'"';	&Apache::loncommon::escape_single($target).'"';
Line 1185 sub crumbs {	Line 1144 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"$onclick$target>$dir</a>/};	$output.=qq{<a href="$href"$target>$dir</a>/};
} else {	} else {
$output.=qq{<a href="$href_path"$onclick$target>$dir</a>/};	$output.=qq{<a href="$href_path"$target>$dir</a>/};
}	}
}	}
} else {	} else {
Line 1268 sub htmlareaheaders {	Line 1221 sub htmlareaheaders {
ENDEDITOR	ENDEDITOR
}	}
$s.=(<<ENDJQUERY);	$s.=(<<ENDJQUERY);
<script type="text/javascript" src="/adm/jQuery/js/jquery-3.2.1.min.js"></script>	<script type="text/javascript" src="/adm/jQuery/js/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.12.1.custom.min.js"></script>	<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.8.16.custom.min.js"></script>
<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.12.1.custom.min.css" />	<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.8.16.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" />
Line 1355 sub htmlareaselectactive {	Line 1308 sub htmlareaselectactive {
function startRichEditor(id) {	function startRichEditor(id) {
// fix character entities inside <m>	// fix character entities inside <m>
// NOTE: this is not fixing characters inside <parse>	// 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 ta = document.getElementById(id);
var value = ta.value;	var value = ta.value;
var in_m = false; // in the m element	var in_m = false; // in the m element
Line 1399 sub htmlareaselectactive {	Line 1351 sub htmlareaselectactive {

function destroyRichEditor(id) {	function destroyRichEditor(id) {
CKEDITOR.instances[id].destroy();	CKEDITOR.instances[id].destroy();
// replace character entities < and > in <m> and <chem>	// replace character entities < and > in <m>
// and "&fctname(" by "&fctname("	// and "&fctname(" by "&fctname("
// and the quotes inside functions: "&fct(1, "a")" -> "&fct(1, "a")"	// and the quotes inside functions: "&fct(1, "a")" -> "&fct(1, "a")"
var ta = document.getElementById(id);	var ta = document.getElementById(id);
var value = ta.value;	var value = ta.value;
var in_element = false; // in the m or chem element	var in_m = false; // in the m element
var tagname = ""; // m or chem	var in_text = false; // in the text inside the m element
var in_text = false; // in the text inside the element	var im = -1; // position of <m>
var im = -1; // position of start tag
var it = -1; // position of the text inside	var it = -1; // position of the text inside
for (var i=0; i<value.length; i++) {	for (var i=0; i<value.length; i++) {
if (value.substr(i, 2) == "<m" \|\| value.substr(i, 5) == "<chem") {	if (value.substr(i, 2) == "<m") {
// ignore previous tags if found twice	// ignore previous <m> if found twice
in_element = true;	in_m = true;
if (value.substr(i, 2) == "<m")
tagname = "m";
else
tagname = "chem";
in_text = false;	in_text = false;
im = i;	im = i;
it = -1;	it = -1;
} else if (in_element) {	} else if (in_m) {
if (!in_text) {	if (!in_text) {
if (value.charAt(i) == ">") {	if (value.charAt(i) == ">") {
in_text = true;	in_text = true;
it = i+1;	it = i+1;
}	}
} else if (value.substr(i, 3+tagname.length) == "</"+tagname+">") {	} else if (value.substr(i, 4) == "</m>") {
in_element = false;	in_m = false;
var text = value.substr(it, i-it);	var text = value.substr(it, i-it);
var l1 = text.length;	var l1 = text.length;
text = text.replace(/</g, "<");	text = text.replace(/</g, "<");
text = text.replace(/>/g, ">");	text = text.replace(/>/g, ">");
var l2 = text.length;	var l2 = text.length;
value = value.substr(0, it) + text + value.substr(i);	value = value.substr(0, it) + text + "</m>" + value.substr(i+4);
i = i + (l2-l1);	i = i + (l2-l1);
}	}
}	}
Line 1753 clientTime = (new Date()).getTime();	Line 1700 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) {
numresp.forEach((el) => {
el.addEventListener("paste", (e) => {
e.preventDefault();
e.stopPropagation();
let p = (e.clipboardData \|\| window.clipboardData).getData("text");
p.toString();
p = p.replace(/\p{Dash}/gu, '-');
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 1810 A link to help for the component will be	Line 1715 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 (the help item filename (without .tex extension).	$component_help
$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 1850 returns: nothing	Line 1748 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) = @_;
#	#
$css_class \|\|= 'LC_breadcrumbs';	$css_class \|\|= 'LC_breadcrumbs';

Line 1875 returns: nothing	Line 1773 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 1957 returns: nothing	Line 1855 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 1973 returns: nothing	Line 1867 returns: nothing
}	}


if (($component) \|\| ($topic_help && $topic_help_text)) {	if ($component) {
$links = &htmltag('span',	$links = &htmltag('span',
( $no_mt ? $component : mt($component) ).	( $no_mt ? $component : mt($component) ).
( $icons ? $icons : '' ),	( $icons ? $icons : '' ),
Line 2076 returns: nothing	Line 1970 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 2152 sub docs_breadcrumbs {	Line 2036 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 = $env{'request.use_absolute'};	my $url;
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);
Line 2448 sub course_selection {	Line 2332 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('."'".&html_escape(&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('."'".&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 2581 sub course_custom_roles {	Line 2465 sub course_custom_roles {


sub resource_info_box {	sub resource_info_box {
my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres)=@_;	my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)=@_;
my $return='';	my $return='';
if (($stuvcurrent ne '') \|\| ($divforres)) {	if ($stuvcurrent ne '') {
$return = '<div class="LC_left_float">';	$return = '<div class="LC_left_float">';
}	}
if ($symb) {	if ($symb) {
Line 2612 sub resource_info_box {	Line 2496 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 '') \|\| ($divforres)) {	if ($stuvcurrent ne '') {
$return .= '</div>';	$return .= '</div>';
}	}
return $return;	return $return;
Line 2627 sub resource_info_box {	Line 2511 sub resource_info_box {
#	#

sub display_usage {	sub display_usage {
my ($current_disk_usage,$disk_quota,$context) = @_;	my ($current_disk_usage,$disk_quota) = @_;
my $usage = $current_disk_usage/1024;	my $usage = $current_disk_usage/1000;
my $quota = $disk_quota/1024;	my $quota = $disk_quota/1000;
my $percent;	my $percent;
if ($disk_quota == 0) {	if ($disk_quota == 0) {
$percent = 100.0;	$percent = 100.0;
Line 2653 sub display_usage {	Line 2537 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" 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="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="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="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="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 2909 sub set_form_elements {	Line 2789 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)?');
&js_escape(\$overwritewarn);	my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
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 3343 PARAMSONE	Line 3221 PARAMSONE
if (itemid != null) {	if (itemid != null) {
itemh = itemid.offsetHeight;	itemh = itemid.offsetHeight;
}	}
var primaryheight = 0;	var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
if (document.getElementById('LC_nav_bar') != null) {	var secondaryheight;
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 = 0;	var crumbsheight = document.getElementById('LC_breadcrumbs').offsetHeight;
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 3425 THIRD	Line 3297 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) {
if (url!='' && url!= null) {	if (url!='' && url!= null) {
currentURL = null;	currentURL = null;
currentSymb= null;	currentSymb= null;
var lcHostname = setLCHost();	window.location.href=url;
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;
}
}	}
}	}

Line 3463 ENDUTILITY	Line 3324 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,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_;	$title,$idx,$suppurl,$todocs) = @_;
my ($jscall,$anchor,$usehttp,$usehttps,$is_ext);	my $jscall;
if ($switchserver) {	if ($switchserver) {
if ($home) {	if ($home) {
$cfile = '/adm/switchserver?otherserver='.$home.'&role='.	$cfile = '/adm/switchserver?otherserver='.$home.'&role='.
Line 3484 sub jump_to_editres {	Line 3345 sub jump_to_editres {
}	}
} 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 3540 sub jump_to_editres {	Line 3364 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 3576 sub jump_to_editres {	Line 3383 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 accepts a form field as argument, and	# Returns a javascript function which accetps a form field as argumnent, 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,suffix) {	function validmail(field) {
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 3898 add_item_funclist	Line 3702 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 3942 sub funclist_from_array {	Line 3745 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 3961 A reference to the array containing text	Line 3762 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.358.2.20
changed lines
	Added in v.1.359