version 1.395, 2018/12/29 23:24:39
|
version 1.398, 2021/04/29 17:45:22
|
Line 866 parameter setting wizard.
|
Line 866 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 2660 sub course_custom_roles {
|
Line 2661 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 2691 sub resource_info_box {
|
Line 2692 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 3563 sub jump_to_editres {
|
Line 3564 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 3578 sub jump_to_editres {
|
Line 3579 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; |
} |
} |
} |
} |