--- loncom/interface/lonconfigsettings.pm 2019/02/04 01:40:37 1.21.4.9.4.2
+++ 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.21.4.9.4.2 2019/02/04 01:40:37 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.27 2013/10/06 21:25:59 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,37 +120,6 @@ $jscript
'onload' => "setFormElements(document.pickactions);",
);
$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(/^contacts$/,@actions)) {
- my $customclass = 'LC_helpdesk_override';
- my $optionsprefix = 'LC_options_helpdesk_';
- $onload .= "toggleHelpdeskRow(document.display,'overrides','$customclass','$optionsprefix');";
- }
- if (grep(/^scantron$/,@actions)) {
- $onload .= "toggleScantron('document.display');";
- }
- if ($onload) {
- my %loaditems = (
- 'onload' => $onload,
- );
- $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));
@@ -215,13 +130,16 @@ $jscript
');
+ if ($container) {
+ &Apache::lonparmset::startSettingsScreen($r,$container,$crstype);
+ }
$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,$parm_permission) = @_;
+ 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);
@@ -330,24 +242,20 @@ sub make_changes {
if ($context eq 'course') {
$footer_text = 'Back to display/edit settings';
}
- &print_footer($r,$phase,'display',$footer_text,\@actions,$container,$parm_permission);
+ &print_footer($r,$phase,'display',$footer_text,\@actions,$container);
$r->print('
');
return \%lastact;
}
sub display_settings {
my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$jscript,
- $allitems,$crstype,$container,$parm_permission) = @_;
+ $allitems,$crstype,$container) = @_;
my %brcrumtext = &get_crumb_text();
my @actions = &Apache::loncommon::get_env_multiple('form.actions');
&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) {
@@ -357,48 +265,20 @@ 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,
- $item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission);
+ $item,$prefs->{$item},$values,$allitems,$crstype);
}
$rowsum += $rowtotal{$item};
}
@@ -408,7 +288,7 @@ sub display_settings {
$r->print($output{$items[$i]});
}
$r->print('');
- $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container,$parm_permission));
+ $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container));
} else {
$r->print(''.
''.&mt('No settings chosen').
@@ -416,12 +296,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,$parm_permission) = @_;
+ my ($r,$phase,$context,$prefs_order,$prefs,$container) = @_;
if ($phase eq '') {
$phase = 'pickactions';
}
@@ -432,13 +315,7 @@ sub display_choices {
&Apache::loncommon::check_uncheck_jscript()."\n".
'// ]]>'."\n".
''."\n");
- 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.'
'.
+ $r->print(''.&mt('Settings to display/modify').'
'.
''.(' 'x2).
@@ -476,8 +353,11 @@ sub display_choices {
}
$r->print('
');
}
- $r->print(&print_footer($r,$phase,'display','Display',undef,$container,$parm_permission));
+ $r->print(&print_footer($r,$phase,'display','Display',undef,$container));
$r->print('');
+ if ($container) {
+ &Apache::lonparmset::endSettingsScreen($r);
+ }
$r->print(&Apache::loncommon::end_page());
return;
}