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.372 and 1.376

version 1.372, 2016/06/10 22:31:27	version 1.376, 2016/10/31 19:49:00
Line 538 sub date_setter {	Line 538 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 1194 sub Close_PrgWin {	Line 1196 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/Group Content)'); }
if ($target) {	if ($target) {
Line 1220 sub crumbs {	Line 1222 sub crumbs {
&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 3493 ENDUTILITY	Line 3495 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 3514 sub jump_to_editres {	Line 3516 sub jump_to_editres {
}	}
} 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 3538 sub jump_to_editres {	Line 3549 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('".&Apache::loncommon::escape_single($cfile)."')";	$jscall = "go('".&Apache::loncommon::escape_single($cfile)."')";
}	}
return $jscall;	return $jscall;

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

Removed from v.1.372
changed lines
	Added in v.1.376