--- loncom/interface/lonconfigsettings.pm 2010/04/02 21:47:54 1.13 +++ loncom/interface/lonconfigsettings.pm 2013/10/06 21:25:59 1.27 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.13 2010/04/02 21:47:54 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.27 2013/10/06 21:25:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,10 +35,11 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; +use Apache::lonparmset(); sub print_header { - my ($r,$phase,$context,$jscript) = @_; - my ($pagetitle,$brcrumtitle,$action,$call_category_check); + my ($r,$phase,$context,$jscript,$container) = @_; + 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'; @@ -55,7 +56,8 @@ 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'); @@ -93,9 +95,11 @@ function changePage(formname,newphase) { formname.submit(); }'."\n"; if ($phase eq 'pickactions') { + $js .= &Apache::lonhtmlcommon::color_picker(); $js .= &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox'})."\n"; } elsif ($phase eq 'display') { + $js .= &Apache::lonhtmlcommon::color_picker(); $js .= &color_pick_js()."\n"; } $js .= &Apache::loncommon::viewport_size_js().' @@ -126,13 +130,16 @@ $jscript '); + if ($container) { + &Apache::lonparmset::startSettingsScreen($r,$container,$crstype); + } $r->print('
'.&Apache::loncommon::end_page()); + $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) = @_; + my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles,$allitems,$container) = @_; my %brcrumtext = &get_crumb_text(); my @actions = &Apache::loncommon::get_env_multiple('form.actions'); my ($numchanged,%changes,%disallowed); @@ -174,8 +187,8 @@ sub make_changes { text=>$brcrumtext{$context}}, {href=>"javascript:changePage(document.$phase,'$phase')", text=>"Updated"}); - &print_header($r,$phase,$context); - my $crstype; + &print_header($r,$phase,$context,undef,$container); + my ($crstype,%lastact); if ($context eq 'course') { $crstype = &Apache::loncommon::course_type(); } @@ -186,7 +199,7 @@ sub make_changes { if ($context eq 'domain') { $r->print('