--- loncom/interface/lonconfigsettings.pm 2016/08/04 17:34:35 1.21.4.8 +++ loncom/interface/lonconfigsettings.pm 2013/04/08 23:21:15 1.24 @@ -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.24 2013/04/08 23:21:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,20 +35,16 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; -use Apache::courseclassifier(); -use LONCAPA qw(:DEFAULT :match); +use Apache::lonparmset(); sub print_header { my ($r,$phase,$context,$jscript,$container) = @_; - 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'); - } + my ($pagetitle,$brcrumtitle,$action,$call_category_check,$crstype); 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) { @@ -67,58 +63,8 @@ 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().' @@ -174,25 +120,6 @@ $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)); @@ -203,6 +130,9 @@ $jscript '); + if ($container) { + &Apache::lonparmset::startSettingsScreen($r,$container,$crstype); + } $r->print('
'); return; @@ -239,6 +169,9 @@ sub print_footer { } if ($phase eq 'process') { $r->print('
'); + if ($container) { + &Apache::lonparmset::endSettingsScreen($r); + } $r->print(&Apache::loncommon::end_page()); } return; @@ -255,7 +188,7 @@ sub make_changes { {href=>"javascript:changePage(document.$phase,'$phase')", text=>"Updated"}); &print_header($r,$phase,$context,undef,$container); - my ($crstype,%lastact); + my $crstype; if ($context eq 'course') { $crstype = &Apache::loncommon::course_type(); } @@ -266,7 +199,7 @@ sub make_changes { if ($context eq 'domain') { $r->print('

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

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

'); - return \%lastact; } sub display_settings { @@ -322,11 +254,7 @@ sub display_settings { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'display')", text=>"Display/Edit Settings"}); - my $instcode; - if (ref($values) eq 'HASH') { - $instcode = $values->{'internal.coursecode'}; - } - &print_header($r,$phase,$context,$jscript,$container,$instcode); + &print_header($r,$phase,$context,$jscript,$container); my $divwidth = 900; if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) { if (@actions > 0) { @@ -336,44 +264,16 @@ 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},$settings); + $phase,$item,$prefs->{$item},$values->{$item}); } else { ($output{$item},$rowtotal{$item}) = &Apache::courseprefs::print_config_box($r,$dom,$phase,