--- loncom/interface/lonconfigsettings.pm	2010/01/27 13:08:01	1.11
+++ 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.11 2010/01/27 13:08:01 wenzelju Exp $
+# $Id: lonconfigsettings.pm,v 1.15.2.2 2010/12/24 22:50:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,7 @@ sub print_header {
     my ($r,$phase,$context,$jscript) = @_;
     my ($pagetitle,$brcrumtitle,$action,$call_category_check);
     if ($context eq 'domain') {
-        ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','Domain Settings');
+        ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','View/Modify Domain Settings');
         $action = '/adm/domainprefs';
         if ($phase eq 'display') {
             my @actions = &Apache::loncommon::get_env_multiple('form.actions');
@@ -94,8 +94,7 @@ function changePage(formname,newphase) {
 }'."\n";
     if ($phase eq 'pickactions') {
         $js .=
-            &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox',numcols => 'radio',})."\n".
-            &javascript_set_colnums();
+            &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox'})."\n";
     } elsif ($phase eq 'display') {
         $js .= &color_pick_js()."\n";
     }
@@ -114,12 +113,7 @@ $jscript
     my $additem;
     if ($phase eq 'pickactions') {
         my %loaditems = (
-                    'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);setDisplayColumns();setFormElements(document.pickactions);",
-                        );
-        $additem = {'add_entries' => \%loaditems,};
-    } else {
-        my %loaditems = (
-                    'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);",
+                    'onload' => "setFormElements(document.pickactions);",
                         );
         $additem = {'add_entries' => \%loaditems,};
     }
@@ -140,21 +134,16 @@ $jscript
 sub print_footer {
     my ($r,$phase,$newphase,$button_text,$actions) = @_;
     $button_text = &mt($button_text);
-    $r->print('<input type="hidden" name="phase" value="" />'.
-              '<input type="hidden" name="width" value="'.
-              $env{'form.width'}.'" />'.
-              '<input type="hidden" name="height" value="'.
-              $env{'form.height'}.'" />');
+    $r->print('<input type="hidden" name="phase" value="" />');
     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}) {
-                $r->print('<input type="hidden" name="actions" value="'.$item.'" />')."\n";
+                $r->print('<input type="hidden" name="actions" value="'.$item.'" />'."\n");
             }
         }
-        $r->print('<input type="hidden" name="numcols" value="'.$env{'form.numcols'}.'" />');
     }
     my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
     if ($phase eq 'process') {
@@ -253,15 +242,22 @@ sub display_settings {
         ({href=>"javascript:changePage(document.$phase,'display')",
           text=>"Display/Edit Settings"});
     &print_header($r,$phase,$context,$jscript);
+    my $divwidth = 900;
     if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH') && (ref($values) eq 'HASH')) { 
         if (@actions > 0) {
             my $rowsum = 0;
             my (%output,%rowtotal,@items);
-            my $halfway = @actions/2;
             foreach my $item (@{$prefs_order}) {
                 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});
@@ -273,96 +269,19 @@ sub display_settings {
                     $rowsum += $rowtotal{$item};
                 }
             }
-            my $colend;
-            my $halfway = $rowsum/2;
-            my $aggregate = 0;
-            my $sumleft = 0;
-            my $sumright = 0;
-            my $crossover;
+            $r->print('<div id="prefs" style="max-width:'.$divwidth.'px;margin: 10px auto 10px auto;">');
             for (my $i=0; $i<@items; $i++) {
-                $aggregate += $rowtotal{$items[$i]};
-                if ($aggregate > $halfway) {
-                    $crossover = $i;
-                    last;
-                }
-            }
-            for (my $i=0; $i<$crossover; $i++) {
-                $sumleft += $rowtotal{$items[$i]};
-            }
-            for (my $i=$crossover+1; $i<@items; $i++) {
-                $sumright += $rowtotal{$items[$i]};
-            }
-            if ((@items > 1) && ($env{'form.numcols'} == 2)) {
-                my $sumdiff = $sumright - $sumleft;
-                if ($sumdiff > 0) {
-                    $colend = $crossover + 1;
-                } else {
-                    $colend = $crossover;
-                }
-            } else {
-                $colend = @items;
-            }
-            if ($context ne 'course') {
-            	$r->print('<p><table class="LC_double_column"><tr><td class="LC_left_col">');            
-            }
-            else {
-            	$r->print('<div id="prefs" style="max-width:900px;margin: 10px auto 10px auto;">');
-            }
-            for (my $i=0; $i<$colend; $i++) {
                 $r->print($output{$items[$i]});
             }
-            if ($context ne 'course') {
-            	$r->print('</td><td></td><td class="LC_right_col">');
-            }
-            if ($colend < @items) {
-                for (my $i=$colend; $i<@items; $i++) {
-                    $r->print($output{$items[$i]});
-                }
-            }
-            if ($context ne 'course') {
-            	$r->print('</td></tr></table></p>');
-            }
-            else {
-            	$r->print('</div>');
-            }
+            $r->print('</div>');
             $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions));
         } else {
             $r->print('<input type="hidden" name="phase" value="" />'.
-                  '<input type="hidden" name="numcols" value="'.
-                  $env{'form.numcols'}.'" />'."\n".
-                  '<span class="LC_error">'.&mt('No settings chosen').
-                  '</span>');
+                      '<span class="LC_error">'.&mt('No settings chosen').
+                      '</span>');
         }
         $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;
 }
@@ -374,25 +293,30 @@ sub display_choices {
     }
     my %helphash;
     &print_header($r,$phase,$context);
-    $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').'" '.
+              '</script>'."\n");
+    $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).
               '<input type="button" value="'.&mt('uncheck all').'" '.
-              'onclick="javascript:uncheckAll(document.pickactions.actions)"'.
-              ' /></p><div class="LC_left_float">');
-    my ($numitems,$midpoint,$seconddiv,$count);
+              'onclick="javascript:uncheckAll(document.pickactions.actions)" />'.
+              "\n".
+              '</div><div class="LC_left_float">');
+    my ($numitems,$maxincol,$firstthird,$secondthird,$seconddiv,$thirddiv,$count);
     if (ref($prefs_order) eq 'ARRAY') {
         $numitems = @{$prefs_order};
     }
-    $midpoint = int($numitems/2);
-    if ($numitems%2) {
-        $midpoint ++;
+    my $numcols = 3;
+    $maxincol = int($numitems/$numcols);
+    if ($numitems%$numcols) {
+        $maxincol ++;
     }
+    $firstthird = $maxincol;
+    $secondthird = $firstthird + $maxincol;
     $count = 0;
     if ((ref($prefs_order) eq 'ARRAY') && (ref($prefs) eq 'HASH')) {
         foreach my $item (@{$prefs_order}) {
@@ -401,37 +325,23 @@ sub display_choices {
                       '<label><input type="checkbox" name="actions" value="'.$item.
                       '" />&nbsp;'.&mt($prefs->{$item}->{'text'}).'</label></h4>');
             $count ++;
-            if ((!$seconddiv) && ($count >= $midpoint)) {
+            if ((!$seconddiv) && ($count >= $firstthird)) {
                 $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
                 $seconddiv = 1;
             }
+            if ((!$thirddiv) && ($count >= $secondthird)) {
+                $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
+                $thirddiv = 1;
+            }
         }
-        $r->print('</div><div class="LC_clear_float_footer"></div><h3>'.
-                  &mt('Display options').'</h3>'."\n".
-                  '<p><span class="LC_nobreak">'.&mt('Display using: ')."\n".
-                  '<label><input type="radio" name="numcols" value="1" />'.
-                  &mt('one column').'</label>&nbsp;&nbsp;<label>'.
-                  '<input type="radio" name="numcols" value="2" />'.
-                  &mt('two columns').'</label></span></p>');
+        $r->print('</div><br clear="all" />');
     }
-    $r->print(&print_footer($r,$phase,'display','Go'));
+    $r->print(&print_footer($r,$phase,'display','Display'));
     $r->print('</form>');
     $r->print(&Apache::loncommon::end_page());
     return;
 }
 
-sub javascript_set_colnums {
-    return <<END;
-function setDisplayColumns() {
-    if (document.pickactions.width.value > 1100) {
-        document.pickactions.numcols[1].checked = true;
-    } else {
-        document.pickactions.numcols[0].checked = true;
-    }
-}
-END
-}
-
 sub color_pick_js {
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $output = <<"ENDCOL";