--- loncom/interface/lonconfigsettings.pm	2019/02/04 01:40:37	1.21.4.9.4.2
+++ loncom/interface/lonconfigsettings.pm	2015/05/21 23:26:35	1.30
@@ -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.30 2015/05/21 23:26:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,8 +35,9 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonparmset();
 use Apache::courseclassifier();
-use LONCAPA qw(:DEFAULT :match);
+use LONCAPA qw(:DEFAULT :match); 
 
 sub print_header {
     my ($r,$phase,$context,$jscript,$container) = @_;
@@ -74,7 +75,6 @@ sub print_header {
                                                         \@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) {
@@ -91,7 +91,7 @@ sub print_header {
                             var gotcode = 0;
                             for (var i=0; i<codes.length; i++) {
                                 if (codes[i].selectedIndex != 0) {
-                                     gotcode = 1;
+                                     gotcode = 1; 
                                      break;
                                 }
                             }
@@ -118,7 +118,6 @@ ENDSCRIPT
         }
     }
     my $alert = &mt('You must select at least one functionality type to display.');
-    &js_escape(\$alert);
     my $js = '
 <script type="text/javascript">
 // <![CDATA[
@@ -149,11 +148,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().'
@@ -176,29 +175,17 @@ $jscript
         $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,
+                    '             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) {
+                if (@code_order) { 
                     $additem = {
                                    add_entries => {'onload' => "courseSet('','load');toggleCloners(document.display.cloners_instcode);"},
                                };
@@ -215,13 +202,16 @@ $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;
 }
 
 sub print_footer {
-    my ($r,$phase,$newphase,$button_text,$actions,$container,$parm_permission) = @_;
+    my ($r,$phase,$newphase,$button_text,$actions,$container) = @_;
     $button_text = &mt($button_text);
     $r->print('<input type="hidden" name="phase" value="" />');
     if (defined($env{'form.origin'})) {
@@ -246,27 +236,21 @@ sub print_footer {
         } else {
             $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
         }
-        my $showbutton = 1;
-        if (ref($parm_permission) eq 'HASH') {
-            unless (($parm_permission->{'process'}) || ($newphase eq 'display')) {
-                $showbutton = 0;
-            }
-        }
-        if ($showbutton) {
-            $r->print('<p><input type="button" name="store" value="'.
-                      $button_text.'" onclick='.$onclick.' /></p>');
-        }
+        $r->print('<p><input type="button" name="store" value="'.
+                  $button_text.'" onclick='.$onclick.' /></p>');
     }
     if ($phase eq 'process') {
         $r->print('</form>');
+        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,14 +314,14 @@ 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('</p>');
     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
@@ -358,7 +342,7 @@ sub display_settings {
                     push(@items,$item);
                     if ($context eq 'domain') {
                         my $settings;
-                        if (ref($values) eq 'HASH') {
+                        if (ref($values) eq 'HASH') { 
                             $settings = $values->{$item};
                         }
                         if ($item eq 'usersessions') {
@@ -383,7 +367,7 @@ sub display_settings {
                                 my $inststatus = {
                                                    inststatustypes => $usertypes,
                                                    inststatusorder => $types,
-                                                   inststatusguest => [],
+                                                   inststatusguest => [], 
                                                  };
                                 if (ref($values->{defaults}) eq 'HASH') {
                                     $settings = {%{$inststatus},%{$values->{'defaults'}}};
@@ -398,7 +382,7 @@ sub display_settings {
                     } 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 +392,7 @@ sub display_settings {
                 $r->print($output{$items[$i]});
             }
             $r->print('</div>');
-            $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('<input type="hidden" name="phase" value="" />'.
                       '<span class="LC_error">'.&mt('No settings chosen').
@@ -416,12 +400,15 @@ sub display_settings {
         }
         $r->print('</form>');
     }
+    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 +419,7 @@ sub display_choices {
               &Apache::loncommon::check_uncheck_jscript()."\n".
               '// ]]>'."\n".
               '</script>'."\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('<h3>'.$heading.'</h3>'.
+    $r->print('<h3>'.&mt('Settings to display/modify').'</h3>'.
               '<div><input type="button" value="'.&mt('check all').'" '.
               'onclick="javascript:checkAll(document.pickactions.actions)"'.
               ' />'.('&nbsp;'x2).
@@ -476,8 +457,11 @@ sub display_choices {
         }
         $r->print('</div><br clear="all" />');
     }
-    $r->print(&print_footer($r,$phase,'display','Display',undef,$container,$parm_permission));
+    $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;
 }