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.374 and 1.380

version 1.374, 2016/10/16 21:20:51	version 1.380, 2017/02/18 23:39:16
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 1198 sub Close_PrgWin {	Line 1198 sub Close_PrgWin {
sub crumbs {	sub crumbs {
my ($uri,$target,$prefix,$form,$skiplast,$onclick)=@_;	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 1218 sub crumbs {	Line 1218 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) {
Line 1886 returns: nothing	Line 1892 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 ((($crstype eq 'Placement') \|\| (($env{'request.course.id'}) &&
($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement'))) &&
(!$env{'request.role.adv'})) {
undef($menulink);
}
if ($menulink) {	if ($menulink) {
my $description = 'Menu';	my $description = 'Menu';
my $no_mt_descr = 0;	my $no_mt_descr = 0;
Line 2200 sub docs_breadcrumbs {	Line 2201 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;	my $url = $env{'request.use_absolute'};
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 3495 ENDUTILITY	Line 3496 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,$usehttp);
if ($switchserver) {	if ($switchserver) {
if ($home) {	if ($home) {
$cfile = '/adm/switchserver?otherserver='.$home.'&role='.	$cfile = '/adm/switchserver?otherserver='.$home.'&role='.
Line 3516 sub jump_to_editres {	Line 3517 sub jump_to_editres {
}	}
} else {	} else {
unless ($cfile =~ m{^/priv/}) {	unless ($cfile =~ m{^/priv/}) {
	if ($cfile =~ m{^(/adm/wrapper/ext/[^#]+)#([^#]+)$}) {
	$cfile = $1;
	$anchor = $2;
	} 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://}) {
	$usehttp = 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 3535 sub jump_to_editres {	Line 3556 sub jump_to_editres {
}	}
if ($forceedit) {	if ($forceedit) {
$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1';	$cfile .= (($cfile=~/\?/)?'&':'?').'forceedit=1';
	} elsif ($usehttp) {
	$cfile .= (($cfile=~/\?/)?'&':'?').'usehttp=1';
}	}
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;

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

Removed from v.1.374
changed lines
	Added in v.1.380