'.$lt{'cose'}.'
'.$lt{'cour'}.'
'.$disp_table.'
'.
@@ -457,15 +496,8 @@ sub print_setquota {
}
if ($uploadquota eq '') {
my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
- if ($type eq 'Community') {
- $uploadquota = $domdefs{$lctype.'quota'};
- } elsif ($settings{'internal.coursecode'}) {
- $uploadquota = $domdefs{'officialquota'};
- } elsif ($settings{'internal.textbook'}) {
- $uploadquota = $domdefs{'textbookquota'};
- } else {
- $uploadquota = $domdefs{'unofficialquota'};
- }
+ my $quotatype = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$type,\%settings);
+ $uploadquota = $domdefs{$quotatype.'quota'};
if ($uploadquota eq '') {
$uploadquota = $staticdefaults{'uploadquota'};
}
@@ -534,6 +566,98 @@ ENDDOCUMENT
return;
}
+sub print_postsubmit_config {
+ my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my %lt = &Apache::lonlocal::texthash (
+ 'conf' => 'Configure submit button behavior after student makes a submission',
+ 'disa' => 'Disable submit button/keypress following student submission',
+ 'nums' => 'Number of seconds submit is disabled',
+ 'modi' => 'Save',
+ 'back' => 'Pick another action',
+ 'yes' => 'Yes',
+ 'no' => 'No',
+ );
+ my %settings = &Apache::lonnet::get('environment',['internal.postsubmit','internal.postsubtimeout',
+ 'internal.coursecode','internal.textbook'],$cdom,$cnum);
+ my $postsubmit = $settings{'internal.postsubmit'};
+ if ($postsubmit eq '') {
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom);
+ $postsubmit = 1;
+ if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+ if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+ if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
+ $postsubmit = 0;
+ }
+ }
+ }
+ }
+ my ($checkedon,$checkedoff,$display);
+ if ($postsubmit) {
+ $checkedon = 'checked="checked"';
+ $display = 'block';
+ } else {
+ $checkedoff = 'checked="checked"';
+ $display = 'none';
+ }
+ my $postsubtimeout = $settings{'internal.postsubtimeout'};
+ my $default = &domain_postsubtimeout($cdom,$type,\%settings);
+ my $zero = &mt('(Enter 0 to disable until next page reload, or leave blank to use the domain default: [_1])',$default);
+ if ($postsubtimeout eq '') {
+ $postsubtimeout = $default;
+ }
+ &print_header($r,$type);
+ my $hidden_elements = &hidden_form_elements();
+ my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config');
+ $r->print(<
+$helpitem $lt{'disa'}:
+
+
+$lt{'conf'} ($cdesc)
+
+$zero
+
+
'. ''. - &mt('Pick another action').''); + &mt('Pick another action').'
'); + $r->print(&hidden_form_elements().''); + return; +} + +sub modify_postsubmit_config { + my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; + &print_header($r,$type); + my %lt = &Apache::lonlocal::texthash( + subb => 'Submit button behavior after student makes a submission:', + unch => 'Post submission behavior of the Submit button is unchanged.', + erro => 'An error occurred when saving your proposed changes.', + inva => 'An invalid response was recorded.', + pick => 'Pick another action', + ); + $r->print(''); return; } @@ -1420,6 +1827,13 @@ sub modify_catsettings { if (@changes > 0) { my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom,$cnum); if ($putreply eq 'ok') { + if ($env{'course.'.$cdom.'_'.$cnum.'.description'} ne '') { + my %newenvhash; + foreach my $item (@changes) { + $newenvhash{'course.'.$cdom.'_'.$cnum.'.'.$item} = $cenv{$item}; + } + &Apache::lonnet::appenv(\%newenvhash); + } my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.', $cnum,undef,undef,'.'); if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') { @@ -1502,6 +1916,8 @@ function hide_searching() { } elsif ($phase eq 'setquota') { my $invalid = &mt('The quota you entered contained invalid characters.'); my $alert = &mt('You must enter a number'); + &js_escape(\$invalid); + &js_escape(\$alert); my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/'; $js .= <<"ENDSCRIPT"; @@ -1521,6 +1937,8 @@ ENDSCRIPT } elsif ($phase eq 'setanon') { my $invalid = &mt('The responder threshold you entered is invalid.'); my $alert = &mt('You must enter a positive integer.'); + &js_escape(\$invalid); + &js_escape(\$alert); my $regexp = ' /^\s*\d+\s*$/'; $js .= <<"ENDSCRIPT"; @@ -1542,8 +1960,86 @@ function verify_anon_threshold() { } ENDSCRIPT + } elsif ($phase eq 'setpostsubmit') { + my $invalid = &mt('The choice entered for disabling the submit button is invalid.'); + my $invalidtimeout = &mt('The timeout you entered for disabling the submit button is invalid.'); + my $alert = &mt('Enter one of: a positive integer, 0 (for no timeout), or leave blank to use domain default'); + &js_escape(\$invalid); + &js_escape(\$invalidtimeout); + &js_escape(\$alert); + my $regexp = ' /^\s*\d+\s*$/'; + + $js .= <<"ENDSCRIPT"; + +function verify_postsubmit() { + var optionsElement = document.setpostsubmit.postsubmit; + var verified = ''; + if (optionsElement.length) { + var currval; + for (var i=0; i