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.348 and 1.358.2.3

version 1.348, 2013/07/02 19:04:37	version 1.358.2.3, 2016/08/04 16:40:47
Line 64 use HTML::Entities();	Line 64 use HTML::Entities();
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);

sub java_not_enabled {	sub java_not_enabled {
return "\n".'<span class="LC_error">'.	if (($env{'browser.mobile'}) && ($env{'browser.mobile'} =~ /^ipad\|ipod\|iphone$/i)) {
&mt('The required Java applet could not be started. Please make sure to have Java installed and active in your browser.').	return "\n".'<span class="LC_error">'.
"</span>\n";	&mt('The required Java applet could not be started, because Java is not supported by your mobile device.').
	"</span>\n";
	} else {
	return "\n".'<span class="LC_error">'.
	&mt('The required Java applet could not be started. Please make sure to have Java installed and active in your browser.').
	"</span>\n";
	}
}	}

sub coursepreflink {	sub coursepreflink {
Line 170 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 476 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 490 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 643 ENDJS	Line 678 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 1215 sub htmlareaheaders {	Line 1257 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>
<link rel="stylesheet" type="text/css" href="/adm/spellchecker/css/spellchecker.css" />	<link rel="stylesheet" type="text/css" href="/adm/spellchecker/css/spellchecker.css" />
	<script type="text/javascript" src="/adm/nicescroll/jquery.nicescroll.min.js"></script>

ENDJQUERY	ENDJQUERY
return $s;	return $s;
Line 1617 A link to help for the component will be	Line 1660 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 1650 returns: nothing	Line 1700 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 1699 returns: nothing	Line 1749 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 1753 returns: nothing	Line 1807 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 1765 returns: nothing	Line 1823 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 2230 sub course_selection {	Line 2288 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".
' <option value="-1" />Select'."\n";	' <option value="-1" />Select'."\n";
my @items = ();	my @items = ();
my @longitems = ();	my @longitems = ();
Line 2263 sub course_selection {	Line 2321 sub course_selection {
for (my $i=1; $i<$numtitles; $i++) {	for (my $i=1; $i<$numtitles; $i++) {
$output .= '<td>'.$$codetitles[$i].'<br />'."\n".	$output .= '<td>'.$$codetitles[$i].'<br />'."\n".
'<select name="'.$standardnames->[$i].	'<select name="'.$standardnames->[$i].
'" onChange="courseSet('."'$$codetitles[$i]'".')">'."\n".	'" onchange="courseSet('."'$$codetitles[$i]'".')">'."\n".
'<option value="-1"><-Pick '.$$codetitles[$i-1].'</option>'."\n".	'<option value="-1"><-Pick '.$$codetitles[$i-1].'</option>'."\n".
'</select>'."\n".	'</select>'."\n".
'</td>';	'</td>';
Line 2687 sub set_form_elements {	Line 2745 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 2931 ENDSCRIPT	Line 2991 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 2941 sub resize_scrollbox_js {	Line 3001 sub resize_scrollbox_js {
scroll => 'contentscroll',	scroll => 'contentscroll',
boxh => 'contenteditor',	boxh => 'contenteditor',
);	);
$paddingwfrac = 0.09;	$paddingwfrac = 0.09;
$offsetwfrac = 0.015;	$offsetwfrac = 0.015;
$offsetv = 20;	$offsetv = 20;
$minw = 250;	$minw = 250;
Line 2967 window.onresize=callResize;	Line 3027 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 2980 function resize_scrollbox(scrollboxname,	Line 3042 function resize_scrollbox(scrollboxname,
var scrolltableid = 'table_'+scrollboxname;	var scrolltableid = 'table_'+scrollboxname;
var scrollbox;	var scrollbox;
var scrolltable;	var scrolltable;
	var ismobile = '$env{'browser.mobile'}';

if (document.getElementById("$names{'boxw'}") == null) {	if (document.getElementById("$names{'boxw'}") == null) {
return;	return;
Line 3016 FIRST	Line 3079 FIRST
}	}
$output .= <<"SECOND";	$output .= <<"SECOND";
var listwchange;	var listwchange;
	var scrollchange;
if (chkw == 1) {	if (chkw == 1) {
var boxw = document.getElementById("$names{'boxw'}").offsetWidth;	var boxw = document.getElementById("$names{'boxw'}").offsetWidth;
var itemw;	var itemw;
Line 3027 FIRST	Line 3091 FIRST

var scrollboxw = scrollbox.offsetWidth;	var scrollboxw = scrollbox.offsetWidth;
var scrollboxscrollw = scrollbox.scrollWidth;	var scrollboxscrollw = scrollbox.scrollWidth;
	var scrollstart = scrollboxw;

var offsetw = parseInt(vpw * $offsetwfrac);	var offsetw = parseInt(vpw * $offsetwfrac);
var paddingw = parseInt(vpw * $paddingwfrac);	var paddingw = parseInt(vpw * $paddingwfrac);
Line 3101 PARAMSONE	Line 3166 PARAMSONE
}	}
}	}

	if (newscrollboxw != scrollboxw) {
	scrollchange = 1;
	}

if (itemid.offsetWidth != itemwstart) {	if (itemid.offsetWidth != itemwstart) {
listwchange = 1;	listwchange = 1;
}	}
}	}
if ((chkh == 1) \|\| (listwchange)) {	if ((chkh == 1) \|\| (listwchange)) {
	var itemid = document.getElementById("$names{'item'}");
	if (itemid != null) {
	itemh = itemid.offsetHeight;
	}
var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;	var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
var secondaryheight;	var secondaryheight;
if (document.getElementById('LC_secondary_menu') != null) {	if (document.getElementById('LC_secondary_menu') != null) {
Line 3126 PARAMSONE	Line 3199 PARAMSONE

var scrollboxheight = scrollbox.offsetHeight;	var scrollboxheight = scrollbox.offsetHeight;
var scrollboxscrollheight = scrollbox.scrollHeight;	var scrollboxscrollheight = scrollbox.scrollHeight;
	var scrollboxh = scrollboxheight;

var minvscrollbox = $minv;	var minvscrollbox = $minv;
var offsetv = $offsetv;	var offsetv = $offsetv;
Line 3156 PARAMSONE	Line 3230 PARAMSONE
scrollbox.style.height = newscrollheight+"px";	scrollbox.style.height = newscrollheight+"px";
}	}
}	}
	var newscrollboxh = scrollbox.offsetHeight;
	if (scrollboxh != newscrollboxh) {
	scrollchange = 1;
	}
	}
	if (ismobile && scrollchange) {
	\$("#div_$names{'scroll'}").getNiceScroll().onResize();
}	}
return;	return;
}	}
Line 3174 THIRD	Line 3255 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 3218 sub jump_to_editres {	Line 3300 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/}) {
Line 3249 sub jump_to_editres {	Line 3331 sub jump_to_editres {
$cfile .= (($cfile=~/\?/)?'&':'?').'todocs=1';	$cfile .= (($cfile=~/\?/)?'&':'?').'todocs=1';
}	}
}	}
$jscall = "go('$cfile')";	$jscall = "go('".&Apache::loncommon::escape_single($cfile)."')";
}	}
return $jscall;	return $jscall;
}	}
Line 3316 END	Line 3398 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 3579 add_item_funclist	Line 3661 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 3622 sub funclist_from_array {	Line 3705 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 3639 A reference to the array containing text	Line 3724 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.348
changed lines
	Added in v.1.358.2.3