--- loncom/interface/lonmodifycourse.pm 2013/11/13 00:09:28 1.64 +++ loncom/interface/lonmodifycourse.pm 2014/03/11 00:57:23 1.68 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.64 2013/11/13 00:09:28 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.68 2014/03/11 00:57:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -436,7 +436,7 @@ sub print_setquota { coursequota => 20, uploadquota => 500, ); - my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.instcode'], + my %settings = &Apache::lonnet::get('environment',['internal.coursequota','internal.uploadquota','internal.coursecode'], $cdom,$cnum); my $coursequota = $settings{'internal.coursequota'}; my $uploadquota = $settings{'internal.uploadquota'}; @@ -447,8 +447,10 @@ sub print_setquota { my %domdefs = &Apache::lonnet::get_domain_defaults($cdom); if ($type eq 'Community') { $uploadquota = $domdefs{$lctype.'quota'}; - } elsif ($settings{'internal.instcode'}) { + } elsif ($settings{'internal.coursecode'}) { $uploadquota = $domdefs{'officialquota'}; + } elsif ($settings{'internal.textbook'}) { + $uploadquota = $domdefs{'textbookquota'}; } else { $uploadquota = $domdefs{'unofficialquota'}; } @@ -994,18 +996,19 @@ sub modify_course { $reply = '
'.$reply.'
'."\n". ''; + $reply .= &Apache::lonhtmlcommon::actionbox(\@actions).''; $r->print($reply); return; } @@ -1238,10 +1241,10 @@ sub modify_quota { } $r->print(''); if ($type eq 'Community') { - $r->print(&mt('Disk usage [_1] exceeds the quota for this community.',$newoverquota).' '. + $r->print(&mt("Disk usage $newoverquota exceeds the quota for this community.").' '. &mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the community will not be possible until some files have been deleted, and total usage is below community quota.')); } else { - $r->print(&mt('Disk usage [_1] exceeds the quota for this course.',$newoverquota).' '. + $r->print(&mt("Disk usage $newoverquota exceeds the quota for this course.").' '. &mt('Upload of new portfolio files and assignment of a non-zero MB quota to new groups in the course will not be possible until some files have been deleted, and total usage is below course quota.')); } $r->print('
'); @@ -1636,7 +1639,7 @@ sub hidden_form_elements { sub showcredits { my ($dom) = @_; my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); - if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) { + if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbokcredits'}) { return 1; } }