--- loncom/interface/lonconfigsettings.pm 2011/12/08 22:10:18 1.21 +++ loncom/interface/lonconfigsettings.pm 2015/05/22 16:52:16 1.21.4.7 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.21 2011/12/08 22:10:18 www Exp $ +# $Id: lonconfigsettings.pm,v 1.21.4.7 2015/05/22 16:52:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,16 +35,20 @@ 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); + 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) { @@ -56,12 +60,61 @@ sub print_header { } } } else { - if (&Apache::loncommon::course_type() eq 'Community') { + $crstype = &Apache::loncommon::course_type(); + if ($crstype eq 'Community') { ($pagetitle,$brcrumtitle) = ('Community Configuration','Community Configuration'); } else { ($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.'); + $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 .= &color_pick_js()."\n"; } $js .= &Apache::loncommon::viewport_size_js().' @@ -117,6 +172,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)); @@ -127,9 +201,6 @@ $jscript '); - if ($container) { - &Apache::lonparmset::startSettingsScreen($r,$container); - } $r->print('
'); return; @@ -151,7 +222,9 @@ sub print_footer { } my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; if ($phase eq 'process') { - $r->print('

'.$button_text.'

'); + $r->print( + &Apache::lonhtmlcommon::actionbox( + [''.$button_text.''])); } else { my $onclick; if ($phase eq 'display') { @@ -164,9 +237,6 @@ sub print_footer { } if ($phase eq 'process') { $r->print('
'); - if ($container) { - &Apache::lonparmset::endSettingsScreen($r); - } $r->print(&Apache::loncommon::end_page()); } return; @@ -183,7 +253,7 @@ sub make_changes { {href=>"javascript:changePage(document.$phase,'$phase')", text=>"Updated"}); &print_header($r,$phase,$context,undef,$container); - my $crstype; + my ($crstype,%lastact); if ($context eq 'course') { $crstype = &Apache::loncommon::course_type(); } @@ -194,7 +264,7 @@ sub make_changes { if ($context eq 'domain') { $r->print('

'.&mt($prefs->{$item}{'text'}).'

'. &Apache::domainprefs::process_changes($r,$dom, - $confname,$item,$roles,$values)); + $confname,$item,$roles,$values,\%lastact)); } else { $changes{$item} = {}; &Apache::courseprefs::process_changes($dom,$item,$values, @@ -239,6 +309,7 @@ sub make_changes { } &print_footer($r,$phase,'display',$footer_text,\@actions,$container); $r->print('

'); + return \%lastact; } sub display_settings { @@ -249,7 +320,11 @@ 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) { @@ -259,16 +334,44 @@ sub display_settings { if (grep(/^\Q$item\E$/,@actions)) { push(@items,$item); if ($context eq 'domain') { + my $settings; + if (ref($values) eq 'HASH') { + $settings = $values->{$item}; + } if ($item eq 'usersessions') { $r->print(''."\n"); + } elsif ($item eq 'selfcreation') { + if (ref($values) eq 'HASH') { + $settings = $values->{'usercreation'}; + } + } elsif ($item eq 'defaults') { + if (ref($values->{'inststatus'}) eq 'HASH') { + if (ref($values->{'defaults'}) eq 'HASH') { + $settings = {%{$values->{'inststatus'}},%{$values->{'defaults'}}}; + } else { + $settings = $values->{'inststatus'}; + } + } else { + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); + my $inststatus = { + inststatustypes => $usertypes, + inststatusorder => $types, + inststatusguest => [], + }; + if (ref($values->{defaults}) eq 'HASH') { + $settings = {%{$inststatus},%{$values->{'defaults'}}}; + } else { + $settings = $inststatus; + } + } } ($output{$item},$rowtotal{$item}) = &Apache::domainprefs::print_config_box($r,$dom,$confname, - $phase,$item,$prefs->{$item},$values->{$item}); + $phase,$item,$prefs->{$item},$settings); } else { ($output{$item},$rowtotal{$item}) = &Apache::courseprefs::print_config_box($r,$dom,$phase,