--- loncom/interface/lonconfigsettings.pm 2016/08/04 17:34:35 1.21.4.8 +++ loncom/interface/lonconfigsettings.pm 2017/07/26 19:45:45 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.21.4.8 2016/08/04 17:34:35 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.34 2017/07/26 19:45:45 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,38 @@ $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 %domdefaults = &Apache::lonnet::get_domain_defaults($dom); + if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') { + my $order = $domdefaults{'inststatusguest'}; + if (ref($order) eq 'ARRAY') { + foreach my $type (@{$order}) { + if (($type ne '') && ($type ne 'default')) { + my $name = $prefix.'_'.$type; + $onload .= "toggleDisplay(document.display,'$name');"; + } + } + } + } + $onload .= "toggleDisplay(document.display,'$prefix');". + "toggleDisplay(document.display,'emailoptions');". + } + 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,13 +225,16 @@ $jscript '); + if ($container) { + &Apache::lonparmset::startSettingsScreen($r,$container,$crstype); + } $r->print('
'); return; } sub print_footer { - my ($r,$phase,$newphase,$button_text,$actions,$container) = @_; + my ($r,$phase,$newphase,$button_text,$actions,$container,$parm_permission) = @_; $button_text = &mt($button_text); $r->print(''); if (defined($env{'form.origin'})) { @@ -234,18 +259,30 @@ sub print_footer { } else { $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; } - $r->print('

'); + my $showbutton = 1; + if (ref($parm_permission) eq 'HASH') { + unless (($parm_permission->{'process'}) || ($newphase eq 'display')) { + $showbutton = 0; + } + } + if ($showbutton) { + $r->print('

'); + } } if ($phase eq 'process') { $r->print('
'); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); } return; } sub make_changes { - my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles,$allitems,$container) = @_; + my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles, + $allitems,$container,$parm_permission) = @_; my %brcrumtext = &get_crumb_text(); my @actions = &Apache::loncommon::get_env_multiple('form.actions'); my ($numchanged,%changes,%disallowed); @@ -309,14 +346,14 @@ sub make_changes { if ($context eq 'course') { $footer_text = 'Back to display/edit settings'; } - &print_footer($r,$phase,'display',$footer_text,\@actions,$container); + &print_footer($r,$phase,'display',$footer_text,\@actions,$container,$parm_permission); $r->print('

'); return \%lastact; } sub display_settings { my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$jscript, - $allitems,$crstype,$container) = @_; + $allitems,$crstype,$container,$parm_permission) = @_; my %brcrumtext = &get_crumb_text(); my @actions = &Apache::loncommon::get_env_multiple('form.actions'); &Apache::lonhtmlcommon::add_breadcrumb @@ -326,26 +363,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'}; @@ -362,7 +402,7 @@ sub display_settings { my $inststatus = { inststatustypes => $usertypes, inststatusorder => $types, - inststatusguest => [], + inststatusguest => [], }; if (ref($values->{defaults}) eq 'HASH') { $settings = {%{$inststatus},%{$values->{'defaults'}}}; @@ -377,7 +417,7 @@ sub display_settings { } else { ($output{$item},$rowtotal{$item}) = &Apache::courseprefs::print_config_box($r,$dom,$phase, - $item,$prefs->{$item},$values,$allitems,$crstype); + $item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission); } $rowsum += $rowtotal{$item}; } @@ -387,7 +427,7 @@ sub display_settings { $r->print($output{$items[$i]}); } $r->print(''); - $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container)); + $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container,$parm_permission)); } else { $r->print(''. ''.&mt('No settings chosen'). @@ -395,12 +435,15 @@ sub display_settings { } $r->print(''); } + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); return; } sub display_choices { - my ($r,$phase,$context,$prefs_order,$prefs,$container) = @_; + my ($r,$phase,$context,$prefs_order,$prefs,$container,$parm_permission) = @_; if ($phase eq '') { $phase = 'pickactions'; } @@ -411,7 +454,13 @@ sub display_choices { &Apache::loncommon::check_uncheck_jscript()."\n". '// ]]>'."\n". ''."\n"); - $r->print('

'.&mt('Settings to display/modify').'

'. + my $heading = &mt('Settings to display/modify'); + if (ref($parm_permission) eq 'HASH') { + unless ($parm_permission->{'process'}) { + $heading = &mt('Settings to display'); + } + } + $r->print('

'.$heading.'

'. '
'.(' 'x2). @@ -449,8 +498,11 @@ sub display_choices { } $r->print('

'); } - $r->print(&print_footer($r,$phase,'display','Display',undef,$container)); + $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; }