--- loncom/interface/lonconfigsettings.pm	2009/05/12 21:20:42	1.4
+++ loncom/interface/lonconfigsettings.pm	2009/08/23 17:21:22	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.4 2009/05/12 21:20:42 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.6 2009/08/23 17:21:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,6 +49,8 @@ sub print_header {
     my $alert = &mt('You must select at least one functionality type to display.');
     my $js = '
 <script type="text/javascript">
+// <![CDATA[
+
 function changePage(formname,newphase) {
     formname.phase.value = newphase;
     numchecked = 0;
@@ -81,6 +83,8 @@ function changePage(formname,newphase) {
         $js .= &color_pick_js()."\n";
     }
     $js .= &Apache::loncommon::viewport_size_js().'
+
+// ]]>
 </script>
 ';
     if ($jscript) {
@@ -124,6 +128,9 @@ sub print_footer {
               $env{'form.width'}.'" />'.
               '<input type="hidden" name="height" value="'.
               $env{'form.height'}.'" />');
+    if (defined($env{'form.origin'})) {
+        $r->print('<input type="hidden" name="origin" value="'.$env{'form.origin'}.'" />'."\n");
+    }
     if (($phase eq 'display') || ($phase eq 'process')) {
         if (ref($actions) eq 'ARRAY') {
             foreach my $item (@{$actions}) {
@@ -300,9 +307,11 @@ sub display_choices {
     }
     my %helphash;
     &print_header($r,$phase,$context);
-    $r->print('<h3>'.&mt('Functionality to display/modify').'</h3>');
+    $r->print('<h3>'.&mt('Settings to display/modify').'</h3>');
     $r->print('<script type="text/javascript">'."\n".
+              '// <![CDATA['."\n".
               &Apache::loncommon::check_uncheck_jscript()."\n".
+              '// ]]>'."\n".
               '</script>'."\n".'<p><input type="button" value="'.&mt('check all').'" '.
               'onclick="javascript:checkAll(document.pickactions.actions)"'.
               ' />'.('&nbsp;'x2).