--- loncom/interface/lonconfigsettings.pm	2014/04/23 10:26:37	1.21.4.6
+++ loncom/interface/lonconfigsettings.pm	2013/04/10 21:15:15	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.21.4.6 2014/04/23 10:26:37 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.25 2013/04/10 21:15:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonparmset();
 
 sub print_header {
     my ($r,$phase,$context,$jscript,$container) = @_;
@@ -94,11 +95,11 @@ function changePage(formname,newphase) {
     formname.submit();
 }'."\n";
     if ($phase eq 'pickactions') {
-        $js .= &Apache::lonhtmlcommon::color_picker();
+	$js .= &Apache::lonhtmlcommon::color_picker();
         $js .=
             &Apache::lonhtmlcommon::set_form_elements({actions => '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().'
@@ -129,6 +130,9 @@ $jscript
 <input type="hidden" name="pres_value" />
 </form>
 ');
+    if ($container) {
+       &Apache::lonparmset::startSettingsScreen($r,$container,$crstype);
+    }
     $r->print('<form method="post" name="'.$phase.'" action="'.$action.'"'.
               ' enctype="multipart/form-data">');
     return;
@@ -165,6 +169,9 @@ sub print_footer {
     }
     if ($phase eq 'process') {
         $r->print('</form>');
+        if ($container) {
+           &Apache::lonparmset::endSettingsScreen($r);
+        }
         $r->print(&Apache::loncommon::end_page());
     }
     return;
@@ -181,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();
     }
@@ -192,7 +199,7 @@ sub make_changes {
                 if ($context eq 'domain') {
                     $r->print('<h3>'.&mt($prefs->{$item}{'text'}).'</h3>'.
                               &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,
@@ -237,7 +244,6 @@ sub make_changes {
     }
     &print_footer($r,$phase,'display',$footer_text,\@actions,$container);
     $r->print('</p>');
-    return \%lastact;
 }
 
 sub display_settings {
@@ -258,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('<script type="text/javascript">'."\n".
                                       '// <![CDATA['."\n".
                                       &Apache::loncommon::check_uncheck_jscript()."\n".
                                       '// ]]>'."\n".
                                       '</script>'."\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,
@@ -317,6 +295,9 @@ sub display_settings {
         }
         $r->print('</form>');
     }
+    if ($container) {
+        &Apache::lonparmset::endSettingsScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }
@@ -373,6 +354,9 @@ sub display_choices {
     }
     $r->print(&print_footer($r,$phase,'display','Display',undef,$container));
     $r->print('</form>');
+    if ($container) {
+        &Apache::lonparmset::endSettingsScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }