version 1.358.2.18, 2020/09/02 00:42:52
|
version 1.358.2.19.2.1, 2021/12/31 20:56:46
|
Line 848 parameter setting wizard.
|
Line 848 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 1693 sub show_return_link {
|
Line 1694 sub show_return_link {
|
(($env{'request.noversionuri'}=~/^\/adm\//) && |
(($env{'request.noversionuri'}=~/^\/adm\//) && |
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && |
($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && |
($env{'request.noversionuri'}!~ |
($env{'request.noversionuri'}!~ |
m{^/adm/.*/(smppg|bulletinboard)($|\?)}) |
m{^/adm/.*/(smppg|bulletinboard|ext\.tool)($|\?)}) |
)); |
)); |
} |
} |
|
|
Line 1824 returns: nothing
|
Line 1825 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 3301 PARAMSONE
|
Line 3312 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 3442 sub jump_to_editres {
|
Line 3459 sub jump_to_editres {
|
$anchor = $3; |
$anchor = $3; |
$is_ext = 1; |
$is_ext = 1; |
if (($extlink !~ /^https:/) && ($ENV{'SERVER_PORT'} == 443)) { |
if (($extlink !~ /^https:/) && ($ENV{'SERVER_PORT'} == 443)) { |
unless (&Apache::lonnet::uses_sts()) { |
unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { |
$usehttp = 1; |
$usehttp = 1; |
} |
} |
} elsif ($env{'request.use_absolute'}) { |
} elsif ($env{'request.use_absolute'}) { |
Line 3457 sub jump_to_editres {
|
Line 3474 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://}) { |
unless (&Apache::lonnet::uses_sts()) { |
unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { |
$usehttp = 1; |
$usehttp = 1; |
} |
} |
} |
} |