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.388 and 1.411

version 1.388, 2017/08/03 16:22:09	version 1.411, 2024/04/14 17:12:27
Line 78 sub java_not_enabled {	Line 78 sub java_not_enabled {
sub coursepreflink {	sub coursepreflink {
my ($text,$category)=@_;	my ($text,$category)=@_;
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
return '<a target="_top" href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';	my $target =' target="_top"';
	if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) \|\|
	(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
	$target ='';
	}
	return '<a'.$target.' href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';
} else {	} else {
return '';	return '';
}	}
Line 101 sub direct_parm_link {	Line 106 sub direct_parm_link {
$filter=&entity_encode($filter);	$filter=&entity_encode($filter);
$part=&entity_encode($part);	$part=&entity_encode($part);
if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {	if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
return "<a target='_top' href='/adm/parmset?symb=$symb&filter=$filter&part=$part'><span class='LC_setting'>$linktext</span></a>";	my $target=' target="_top"';
	if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) \|\|
	(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
	$target='';
	}
	return "<a".$target." href=\"/adm/parmset?symb=$symb&filter=$filter&part=$part\"><span class=\"LC_setting\">$linktext</span></a>";
} else {	} else {
return $linktext;	return $linktext;
}	}
}	}
##############################################	##############################################
Line 221 sub dependencycheck_js {	Line 231 sub dependencycheck_js {
$link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"');	$link = '/adm/dependencies?symb='.&HTML::Entities::encode($symb,'<>&"');
} elsif ($folderpath) {	} elsif ($folderpath) {
$link = '/adm/dependencies?folderpath='.&HTML::Entities::encode($folderpath,'<>&"');	$link = '/adm/dependencies?folderpath='.&HTML::Entities::encode($folderpath,'<>&"');
$url = $uri;	$url = $uri;
} elsif ($uri =~ m{^/public/$match_domain/$match_courseid/syllabus$}) {	} elsif ($uri =~ m{^/public/$match_domain/$match_courseid/syllabus$}) {
$link = '/adm/dependencies';	$link = '/adm/dependencies';
}	}
$link .= (($link=~/\?/)?'&':'?').'title='.	$link .= (($link=~/\?/)?'&':'?').'title='.
&HTML::Entities::encode($title,'<>&"');	&HTML::Entities::encode($title,'<>&"');
if ($url) {	if ($url) {
$link .= '&url='.&HTML::Entities::encode($url,'<>&"');	$link .= '&url='.&HTML::Entities::encode($url,'<>&"');
}	}
	&js_escape(\$link);
return <<ENDJS;	return <<ENDJS;
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
Line 858 parameter setting wizard.	Line 869 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 1025 data structure used for bookkeeping.	Line 1037 data structure used for bookkeeping.

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

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

=back	=back

=back	=back

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

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

Line 1118 Returns: none	Line 1134 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 1181 sub Increment_PrgWin {	Line 1197 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 1301 sub htmlareaheaders {	Line 1317 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.2.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.12.1.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.12.1.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 1340 $(document).ready(function(){	Line 1356 $(document).ready(function(){
});';	});';
}	}

	sub countdown {

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


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

	var documentReadyTime;

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

	JAVASCRIPT

	}

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

sub htmlareaselectactive {	sub htmlareaselectactive {
Line 1563 sub htmlareaselectactive {	Line 1641 sub htmlareaselectactive {

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

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

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

var documentReadyTime;	$output .= <<"JAVASCRIPT";

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

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

return if ($env{'form.register'});	return if ($env{'form.register'});
}	}
	if ((($env{'request.symb'} ne '') \|\| ($env{'form.folderpath'} ne '')) &&
	($env{'request.noversionuri'} =~m{^/adm/coursedocs/showdoc/uploaded/($match_domain)/($match_courseid)/(docs\|supplemental)/})) {
	my ($cdom,$cnum,$area) = ($1,$2,$3);
	if (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom) &&
	($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum)) {
	if (($env{'request.symb'}) && ($area eq 'docs')) {
	my ($map,$resid,$url) = &Apache::lonnet::decode_symb($env{'request.symb'});
	return if ($env{'request.noversionuri'} eq '/adm/coursedocs/showdoc/'.$url);
	} elsif (($env{'form.folderpath'}) && ($area eq 'supplemental')) {
	return;
	}
	}
	}
return (($env{'request.noversionuri'}=~m{^/(res\|public)/} &&	return (($env{'request.noversionuri'}=~m{^/(res\|public)/} &&
$env{'request.symb'} eq '')	$env{'request.symb'} eq '')
\|\|	\|\|
Line 1787 clientTime = (new Date()).getTime();	Line 1831 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 1846 loncommon::help_open_topic() to generate	Line 1932 loncommon::help_open_topic() to generate
text to include in the link in the optional help item ($topic_help) on the right	text to include in the link in the optional help item ($topic_help) on the right
side of the breadcrumbs row.	side of the breadcrumbs row.

	=item $links_target

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

=back	=back

=back	=back
Line 1877 returns: nothing	Line 1970 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,$crstype) = @_;	$CourseBreadcrumbs,$topic_help,$topic_help_text,$links_target) = @_;
#	#
$css_class \|\|= 'LC_breadcrumbs';	$css_class \|\|= 'LC_breadcrumbs';

Line 1893 returns: nothing	Line 1986 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 1910 returns: nothing	Line 2013 returns: nothing
}	}
}	}
}	}
	my $target = '_top';
	if ($links_target) {
	$target = $links_target;
	} elsif ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) \|\|
	(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
	$target='';
	}
$menulink = { href =>'/adm/menu',	$menulink = { href =>'/adm/menu',
title =>'Go to main menu',	title =>'Go to main menu',
target =>'_top',	target =>$target,
text =>$description,	text =>$description,
no_mt =>$no_mt_descr, };	no_mt =>$no_mt_descr, };
if($last) {	if($last) {
Line 1930 returns: nothing	Line 2040 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 1982 returns: nothing	Line 2092 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 2186 returns: nothing	Line 2297 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 2212 sub docs_breadcrumbs {	Line 2323 sub docs_breadcrumbs {
# 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 2254 sub docs_breadcrumbs {	Line 2367 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 2630 sub course_custom_roles {	Line 2751 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 2661 sub resource_info_box {	Line 2782 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 3392 PARAMSONE	Line 3513 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 3470 THIRD	Line 3597 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) {
Line 3478 function go(url) {	Line 3608 function go(url) {
currentURL = null;	currentURL = null;
currentSymb= null;	currentSymb= null;
var lcHostname = setLCHost();	var lcHostname = setLCHost();
window.location.href=lcHostname+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;
	}
}	}
}	}

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 3496 ENDUTILITY	Line 3639 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,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_;	$folderpath,$title,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_;
my ($jscall,$anchor,$usehttp,$usehttps,$is_ext);	my ($jscall,$anchor,$usehttp,$usehttps,$is_ext,$target);
if ($switchserver) {	if ($switchserver) {
if ($home) {	if ($home) {
	my $resedit;
	if ($cfile =~ m{^/priv/($match_domain)/($match_username)/}) {
	my ($audom,$auname) = ($1,$2);
	unless (&Apache::lonnet::is_course($audom,$auname)) {
	unless ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$audom)) &&
	(&Apache::lonnet::will_trust('coaurem',$audom,$env{'user.domain'}))) {
	return;
	}
	if (($symb ne '') && ($env{'request.course.id'}) &&
	(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
	unless (&Apache::lonnet::can_switchserver($env{'user.domain'},$home)) {
	$target = '_blank';
	$resedit = 1;
	}
	}
	}
	}
$cfile = '/adm/switchserver?otherserver='.$home.'&role='.	$cfile = '/adm/switchserver?otherserver='.$home.'&role='.
&HTML::Entities::encode($env{'request.role'},'"<>&');	&HTML::Entities::encode($env{'request.role'},'"<>&');
if ($symb) {	if ($shownsymb) {
$cfile .= '&symb='.&HTML::Entities::encode($symb,'"<>&');	$cfile .= '&symb='.&HTML::Entities::encode($shownsymb,'"<>&');
	if ($resedit) {
	$cfile .= '&edit=1';
	}
} elsif ($folderpath) {	} elsif ($folderpath) {
$cfile .= '&folderpath='.&HTML::Entities::encode($folderpath,'"<>&');	$cfile .= '&folderpath='.&HTML::Entities::encode($folderpath,'"<>&');
}	}
Line 3514 sub jump_to_editres {	Line 3677 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/([^#]+))#([^#]+)$}) {	if ($cfile =~ m{^(/adm/wrapper/ext/([^#]+))(?:\|#([^#]+))$}) {
$cfile = $1;	$cfile = $1;
my $extlink = $2;	my $extlink = $2;
$anchor = $3;	$anchor = $3;
$is_ext = 1;	$is_ext = 1;
if (($extlink !~ /^https:/) && ($ENV{'SERVER_PORT'} == 443)) {	if (($extlink !~ /^https:/) && ($ENV{'SERVER_PORT'} == 443)) {
$usehttp = 1;	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
	$usehttp = 1;
	}
} elsif ($env{'request.use_absolute'}) {	} elsif ($env{'request.use_absolute'}) {
if ($env{'request.use_absolute'} =~ m{^https://}) {	if ($env{'request.use_absolute'} =~ m{^https://}) {
$usehttps = 1;	$usehttps = 1;
Line 3537 sub jump_to_editres {	Line 3702 sub jump_to_editres {
($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum) &&	($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum) &&
($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom)) {	($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom)) {
if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://}) {	if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://}) {
$usehttp = 1;	unless ((&Apache::lonnet::uses_sts()) \|\| (&Apache::lonnet::waf_allssl($hostname))) {
	$usehttp = 1;
	}
}	}
}	}
} elsif ($env{'request.use_absolute'}) {	} elsif ($env{'request.use_absolute'}) {
Line 3577 sub jump_to_editres {	Line 3744 sub jump_to_editres {
if ($hostname ne '') {	if ($hostname ne '') {
$cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile;	$cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile;
}	}
unless ($is_ext) {	$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1';
$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1';
}
} elsif ($usehttps) {	} elsif ($usehttps) {
$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile;	$cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile;
}	}

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

Removed from v.1.388
changed lines
	Added in v.1.411