version 1.517, 2011/12/04 16:27:06
|
version 1.519, 2011/12/15 01:21:41
|
Line 855 sub page_js {
|
Line 855 sub page_js {
|
return(<<ENDJS); |
return(<<ENDJS); |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
function pclose() { |
|
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms", |
|
"height=350,width=350,scrollbars=no,menubar=no"); |
|
parmwin.close(); |
|
} |
|
|
|
$pjump_def |
$pjump_def |
|
|
function psub() { |
function psub() { |
pclose(); |
|
if (document.parmform.pres_marker.value!='') { |
if (document.parmform.pres_marker.value!='') { |
document.parmform.action+='#'+document.parmform.pres_marker.value; |
document.parmform.action+='#'+document.parmform.pres_marker.value; |
var typedef=new Array(); |
var typedef=new Array(); |
Line 904 sub startpage {
|
Line 898 sub startpage {
|
my ($r,$psymb) = @_; |
my ($r,$psymb) = @_; |
|
|
my %loaditems = ( |
my %loaditems = ( |
'onunload' => "pclose()", |
|
'onload' => "group_or_section('cgroup')", |
'onload' => "group_or_section('cgroup')", |
); |
); |
if (!$psymb) { |
if (!$psymb) { |
Line 1401 sub lookUpTableParameter {
|
Line 1394 sub lookUpTableParameter {
|
'maxcollaborators' => 'misc', |
'maxcollaborators' => 'misc', |
'scoreformat' => 'misc', |
'scoreformat' => 'misc', |
'lenient' => 'grading', |
'lenient' => 'grading', |
|
'retrypartial' => 'tries', |
|
|
); |
); |
} |
} |
Line 2152 sub assessparms {
|
Line 2146 sub assessparms {
|
} |
} |
} |
} |
} |
} |
} elsif ($markers[$i] =~ /_(type|lenient)\&\d+$/) { |
} elsif ($markers[$i] =~ /_(type|lenient|retrypartial)\&\d+$/) { |
$name = $1; |
$name = $1; |
$needsrelease = |
$needsrelease = |
$Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"}; |
$Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"}; |
Line 2814 sub storedata {
|
Line 2808 sub storedata {
|
$name = 'type'; |
$name = 'type'; |
} elsif ($typeof eq 'string_lenient') { |
} elsif ($typeof eq 'string_lenient') { |
$name = 'lenient'; |
$name = 'lenient'; |
|
} elsif ($typeof eq 'string_yesno') { |
|
if ($thiskey =~ /\.retrypartial$/) { |
|
$name = 'retrypartial'; |
|
} |
} |
} |
if ($name ne '') { |
if ($name ne '') { |
my ($needsrelease,$needsnewer); |
my ($needsrelease,$needsnewer); |
Line 3162 sub string_selector {
|
Line 3160 sub string_selector {
|
|
|
my %skiptype; |
my %skiptype; |
if (($thistype eq 'string_questiontype') || |
if (($thistype eq 'string_questiontype') || |
($thistype eq 'string_lenient')) { |
($thistype eq 'string_lenient') || |
|
($name eq 'retrypartial')) { |
my ($got_chostname,$chostname,$cmajor,$cminor); |
my ($got_chostname,$chostname,$cmajor,$cminor); |
foreach my $possibilities (@{ $strings{$thistype} }) { |
foreach my $possibilities (@{ $strings{$thistype} }) { |
next unless (ref($possibilities) eq 'ARRAY'); |
next unless (ref($possibilities) eq 'ARRAY'); |
Line 4613 sub oldversion_warning {
|
Line 4612 sub oldversion_warning {
|
my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_; |
my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_; |
my $desc; |
my $desc; |
my %stringtypes = ( |
my %stringtypes = ( |
type => 'string_questiontype', |
type => 'string_questiontype', |
lenient => 'string_lenient' |
lenient => 'string_lenient', |
|
retrypartial => 'string_yesno', |
); |
); |
if (exists($stringtypes{$name})) { |
if (exists($stringtypes{$name})) { |
if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') { |
if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') { |