--- loncom/interface/lonconfigsettings.pm 2016/10/23 21:13:51 1.21.4.9 +++ loncom/interface/lonconfigsettings.pm 2017/10/15 04:05:10 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.21.4.9 2016/10/23 21:13:51 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.38 2017/10/15 04:05:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,11 +35,12 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; +use Apache::lonparmset(); use Apache::courseclassifier(); -use LONCAPA qw(:DEFAULT :match); +use LONCAPA qw(:DEFAULT :match); sub print_header { - my ($r,$phase,$context,$jscript,$container) = @_; + my ($r,$phase,$context,$jscript,$container,$instcode,$dom) = @_; my ($pagetitle,$brcrumtitle,$action,$call_category_check,$instcode_check, $crstype,@actions,@code_order); if ($phase eq 'display') { @@ -91,7 +92,7 @@ sub print_header { var gotcode = 0; for (var i=0; i '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().' @@ -176,17 +177,53 @@ $jscript $additem = {'add_entries' => \%loaditems,}; } elsif ($phase eq 'display') { if ($context eq 'domain') { + my $onload; if (grep(/^coursedefaults$/,@actions)) { + $onload = "toggleDisplay(document.display,'cloneinstcode');". + "toggleDisplay(document.display,'credits');". + "toggleDisplay(document.display,'studentsubmission');"; + } + if (grep(/^selfcreation$/,@actions)) { + my $prefix = 'cancreate_emailverified'; + my $customclass = 'LC_selfcreate_email'; + my $classprefix = 'LC_canmodify_emailusername_'; + my $optionsprefix = 'LC_options_emailusername_'; + $onload .= "toggleRows(document.display,'cancreate_email','selfassign','$customclass','$classprefix','$optionsprefix');"; + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); + my $hascustom; + my ($emailrules,$emailruleorder) = &Apache::lonnet::inst_userrules($dom,'email'); + if (ref($emailrules) eq 'HASH') { + if (keys(%{$emailrules}) > 0) { + $hascustom = 'cancreate_emailrule'; + } + } + my @posstypes; + if (ref($types) eq 'ARRAY') { + @posstypes = @{$types}; + push(@posstypes,'default'); + foreach my $type (@posstypes) { + $onload .= "toggleEmailOptions(document.display,'cancreate_emailoptions','$hascustom',". + "'cancreate_emaildomain','$type');"; + } + } else { + $onload .= "toggleEmailOptions(document.display,'cancreate_emailoptions','$hascustom',". + "'cancreate_emaildomain','default');"; + } + } + if (grep(/^contacts$/,@actions)) { + my $customclass = 'LC_helpdesk_override'; + my $optionsprefix = 'LC_options_helpdesk_'; + $onload .= "toggleHelpdeskRow(document.display,'overrides','$customclass','$optionsprefix');"; + } + if ($onload) { my %loaditems = ( - ' onload' => "toggleDisplay(document.display,'cloneinstcode');". - "toggleDisplay(document.display,'credits');". - "toggleDisplay(document.display,'studentsubmission');", + 'onload' => $onload, ); $additem = {'add_entries' => \%loaditems,}; } } elsif ($context eq 'course') { if (grep(/^courseinfo$/,@actions)) { - if (@code_order) { + if (@code_order) { $additem = { add_entries => {'onload' => "courseSet('','load');toggleCloners(document.display.cloners_instcode);"}, }; @@ -203,6 +240,9 @@ $jscript '); + if ($container) { + &Apache::lonparmset::startSettingsScreen($r,$container,$crstype); + } $r->print('
'); return; @@ -243,10 +283,13 @@ sub print_footer { if ($showbutton) { $r->print('

'); - } + } } if ($phase eq 'process') { $r->print('
'); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); } return; @@ -335,26 +378,29 @@ sub display_settings { if (ref($values) eq 'HASH') { $instcode = $values->{'internal.coursecode'}; } - &print_header($r,$phase,$context,$jscript,$container,$instcode); + &print_header($r,$phase,$context,$jscript,$container,$instcode,$dom); 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'}; @@ -371,7 +417,7 @@ sub display_settings { my $inststatus = { inststatustypes => $usertypes, inststatusorder => $types, - inststatusguest => [], + inststatusguest => [], }; if (ref($values->{defaults}) eq 'HASH') { $settings = {%{$inststatus},%{$values->{'defaults'}}}; @@ -404,6 +450,9 @@ sub display_settings { } $r->print(''); } + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; } @@ -466,6 +515,9 @@ sub display_choices { } $r->print(&print_footer($r,$phase,'display','Display',undef,$container,$parm_permission)); $r->print(''); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; }