--- loncom/interface/lonconfigsettings.pm	2010/03/22 17:29:11	1.12
+++ loncom/interface/lonconfigsettings.pm	2010/12/24 22:50:34	1.15.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.12 2010/03/22 17:29:11 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.15.2.2 2010/12/24 22:50:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -141,7 +141,7 @@ sub print_footer {
     if (($phase eq 'display') || ($phase eq 'process')) {
         if (ref($actions) eq 'ARRAY') {
             foreach my $item (@{$actions}) {
-                $r->print('<input type="hidden" name="actions" value="'.$item.'" />')."\n";
+                $r->print('<input type="hidden" name="actions" value="'.$item.'" />'."\n");
             }
         }
     }
@@ -251,6 +251,13 @@ sub display_settings {
                 if (grep(/^\Q$item\E$/,@actions)) {
                     push(@items,$item);
                     if ($context eq 'domain') {
+                        if ($item eq 'usersessions') {
+                            $r->print('<script type="text/javascript">'."\n".
+                                      '// <![CDATA['."\n".
+                                      &Apache::loncommon::check_uncheck_jscript()."\n".
+                                      '// ]]>'."\n".
+                                      '</script>'."\n");
+                        }
                         ($output{$item},$rowtotal{$item}) =
                             &Apache::domainprefs::print_config_box($r,$dom,$confname,
                                 $phase,$item,$prefs->{$item},$values->{$item});
@@ -275,34 +282,6 @@ sub display_settings {
         }
         $r->print('</form>');
     }
-    if ($context eq 'course') {
-    	$r->print('
-<script type="text/javascript">
-	$(document).ready(function(){
-		$("#prefs").accordion({
-			autoHeight: false
-		});
-		if ($(".LC_nested tr.advanced").get(0)) {
-			$(".LC_nested tr.advanced").each(function() {
-				$(this).hide();
-				p = $(this).parents("div.ui-accordion-content")
-				if (p.find(".LC_advanced_toggle").length) {
-					return;
-				}
-				p.prepend("<span class=\'LC_advanced_toggle\'><input type=\"checkbox\"/>Show advanced options</span>");
-			});
-			$(".LC_advanced_toggle input").change(function() {
-				if($(this).is(":checked")) {
-					$(this).parents("div.ui-accordion-content").find("tr.advanced").fadeIn("normal");
-				} else {
-					$(this).parents("div.ui-accordion-content").find("tr.advanced").fadeOut("normal");		
-				}
-			});
-		}
-	});
-</script>
-');
-    }
     $r->print(&Apache::loncommon::end_page());
     return;
 }
@@ -320,13 +299,13 @@ sub display_choices {
               '// ]]>'."\n".
               '</script>'."\n");
     $r->print('<h3>'.&mt('Settings to display/modify').'</h3>'.
-              '<input type="button" value="'.&mt('check all').'" '.
+              '<div><input type="button" value="'.&mt('check all').'" '.
               'onclick="javascript:checkAll(document.pickactions.actions)"'.
               ' />'.('&nbsp;'x2).
               '<input type="button" value="'.&mt('uncheck all').'" '.
               'onclick="javascript:uncheckAll(document.pickactions.actions)" />'.
               "\n".
-              '<div class="LC_left_float">');
+              '</div><div class="LC_left_float">');
     my ($numitems,$maxincol,$firstthird,$secondthird,$seconddiv,$thirddiv,$count);
     if (ref($prefs_order) eq 'ARRAY') {
         $numitems = @{$prefs_order};
@@ -336,8 +315,8 @@ sub display_choices {
     if ($numitems%$numcols) {
         $maxincol ++;
     }
-    my $firstthird = $maxincol;
-    my $secondthird = $firstthird + $maxincol;
+    $firstthird = $maxincol;
+    $secondthird = $firstthird + $maxincol;
     $count = 0;
     if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH')) {
         foreach my $item (@{$prefs_order}) {
@@ -353,7 +332,7 @@ sub display_choices {
             if ((!$thirddiv) && ($count >= $secondthird)) {
                 $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
                 $thirddiv = 1;
-            } 
+            }
         }
         $r->print('</div><br clear="all" />');
     }