--- loncom/interface/lonconfigsettings.pm 2014/04/23 10:26:37 1.21.4.6 +++ loncom/interface/lonconfigsettings.pm 2016/07/25 19:50:30 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.21.4.6 2014/04/23 10:26:37 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.32 2016/07/25 19:50:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,15 +35,21 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; +use Apache::lonparmset(); +use Apache::courseclassifier(); +use LONCAPA qw(:DEFAULT :match); sub print_header { my ($r,$phase,$context,$jscript,$container) = @_; - my ($pagetitle,$brcrumtitle,$action,$call_category_check,$crstype); + my ($pagetitle,$brcrumtitle,$action,$call_category_check,$instcode_check, + $crstype,@actions,@code_order); + if ($phase eq 'display') { + @actions = &Apache::loncommon::get_env_multiple('form.actions'); + } if ($context eq 'domain') { ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','View/Modify Domain Settings'); $action = '/adm/domainprefs'; if ($phase eq 'display') { - my @actions = &Apache::loncommon::get_env_multiple('form.actions'); if (grep(/^coursecategories$/,@actions)) { $call_category_check = qq| if (formname == document.display) { @@ -62,8 +68,58 @@ sub print_header { ($pagetitle,$brcrumtitle) = ('Course Configuration','Course Configuration'); } $action = '/adm/courseprefs'; + if ($phase eq 'display') { + if (grep(/^courseinfo$/,@actions)) { + my %codedefaults; + &Apache::lonnet::auto_instcode_defaults($env{'request.role.domain'},\%codedefaults, + \@code_order); + if (@code_order) { + my $noinstcodestr = &mt('You indicated cloning based on category, but did not select any categories.'); + &js_escape(\$noinstcodestr); + $instcode_check = <<"ENDSCRIPT"; + if (formname == document.display) { + if (formname.cloners_instcode.length) { + for (var j=0; j 'checkbox'})."\n"; } elsif ($phase eq 'display') { - $js .= &Apache::lonhtmlcommon::color_picker(); + $js .= &Apache::lonhtmlcommon::color_picker(); $js .= &color_pick_js()."\n"; } $js .= &Apache::loncommon::viewport_size_js().' @@ -119,6 +175,25 @@ $jscript 'onload' => "setFormElements(document.pickactions);", ); $additem = {'add_entries' => \%loaditems,}; + } elsif ($phase eq 'display') { + if ($context eq 'domain') { + if (grep(/^coursedefaults$/,@actions)) { + my %loaditems = ( + ' onload' => "toggleDisplay(document.display,'cloneinstcode');". + "toggleDisplay(document.display,'credits');". + "toggleDisplay(document.display,'studentsubmission');", + ); + $additem = {'add_entries' => \%loaditems,}; + } + } elsif ($context eq 'course') { + if (grep(/^courseinfo$/,@actions)) { + if (@code_order) { + $additem = { + add_entries => {'onload' => "courseSet('','load');toggleCloners(document.display.cloners_instcode);"}, + }; + } + } + } } $r->print(&Apache::loncommon::start_page($pagetitle,$js,$additem)); $r->print(&Apache::lonhtmlcommon::breadcrumbs($brcrumtitle)); @@ -129,6 +204,9 @@ $jscript '); + if ($container) { + &Apache::lonparmset::startSettingsScreen($r,$container,$crstype); + } $r->print('
'); return; @@ -165,6 +243,9 @@ sub print_footer { } if ($phase eq 'process') { $r->print('
'); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); } return; @@ -248,26 +329,33 @@ sub display_settings { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'display')", text=>"Display/Edit Settings"}); - &print_header($r,$phase,$context,$jscript,$container); + my $instcode; + if (ref($values) eq 'HASH') { + $instcode = $values->{'internal.coursecode'}; + } + &print_header($r,$phase,$context,$jscript,$container,$instcode); my $divwidth = 900; if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) { if (@actions > 0) { my $rowsum = 0; - my (%output,%rowtotal,@items); + my (%output,%rowtotal,@items,$got_check_uncheck); foreach my $item (@{$prefs_order}) { if (grep(/^\Q$item\E$/,@actions)) { push(@items,$item); if ($context eq 'domain') { my $settings; - if (ref($values) eq 'HASH') { + if (ref($values) eq 'HASH') { $settings = $values->{$item}; } - if ($item eq 'usersessions') { - $r->print(''."\n"); + if (($item eq 'usersessions') || ($item eq 'ssl')) { + unless ($got_check_uncheck) { + $r->print(''."\n"); + $got_check_uncheck = 1; + } } elsif ($item eq 'selfcreation') { if (ref($values) eq 'HASH') { $settings = $values->{'usercreation'}; @@ -284,7 +372,7 @@ sub display_settings { my $inststatus = { inststatustypes => $usertypes, inststatusorder => $types, - inststatusguest => [], + inststatusguest => [], }; if (ref($values->{defaults}) eq 'HASH') { $settings = {%{$inststatus},%{$values->{'defaults'}}}; @@ -317,6 +405,9 @@ sub display_settings { } $r->print(''); } + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; } @@ -373,6 +464,9 @@ sub display_choices { } $r->print(&print_footer($r,$phase,'display','Display',undef,$container)); $r->print(''); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; }