--- loncom/interface/lonconfigsettings.pm	2015/05/22 16:52:16	1.21.4.7
+++ loncom/interface/lonconfigsettings.pm	2015/06/09 21:22:56	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.21.4.7 2015/05/22 16:52:16 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.31 2015/06/09 21:22:56 damieng 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,6 +75,7 @@ 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) {
@@ -90,7 +92,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;
                                 }
                             }
@@ -117,6 +119,7 @@ ENDSCRIPT
         }
     }
     my $alert = &mt('You must select at least one functionality type to display.');
+    &js_escape(\$alert);
     my $js = '
 <script type="text/javascript">
 // <![CDATA[
@@ -147,11 +150,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().'
@@ -184,7 +187,7 @@ $jscript
             }
         } 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);"},
                                };
@@ -201,6 +204,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;
@@ -237,6 +243,9 @@ sub print_footer {
     }
     if ($phase eq 'process') {
         $r->print('</form>');
+        if ($container) {
+           &Apache::lonparmset::endSettingsScreen($r);
+        }
         $r->print(&Apache::loncommon::end_page());
     }
     return;
@@ -335,7 +344,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') {
@@ -360,7 +369,7 @@ sub display_settings {
                                 my $inststatus = {
                                                    inststatustypes => $usertypes,
                                                    inststatusorder => $types,
-                                                   inststatusguest => [],
+                                                   inststatusguest => [], 
                                                  };
                                 if (ref($values->{defaults}) eq 'HASH') {
                                     $settings = {%{$inststatus},%{$values->{'defaults'}}};
@@ -393,6 +402,9 @@ sub display_settings {
         }
         $r->print('</form>');
     }
+    if ($container) {
+        &Apache::lonparmset::endSettingsScreen($r);
+    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }
@@ -449,6 +461,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;
 }