--- loncom/interface/lonconfigsettings.pm	2010/03/23 20:53:09	1.8.2.2
+++ loncom/interface/lonconfigsettings.pm	2011/03/31 15:35:54	1.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.8.2.2 2010/03/23 20:53:09 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.18 2011/03/31 15:35:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonparmset();
 
 sub print_header {
     my ($r,$phase,$context,$jscript) = @_;
@@ -119,6 +120,9 @@ $jscript
     }
     $r->print(&Apache::loncommon::start_page($pagetitle,$js,$additem));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs($brcrumtitle));
+    if ($context eq 'course') {
+        &Apache::lonparmset::startSettingsScreen($r,'coursepref');
+    }
     $r->print('
 <form name="parmform" action="">
 <input type="hidden" name="pres_marker" />
@@ -132,7 +136,7 @@ $jscript
 }
 
 sub print_footer {
-    my ($r,$phase,$newphase,$button_text,$actions) = @_;
+    my ($r,$context,$phase,$newphase,$button_text,$actions) = @_;
     $button_text = &mt($button_text);
     $r->print('<input type="hidden" name="phase" value="" />');
     if (defined($env{'form.origin'})) {
@@ -141,7 +145,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");
             }
         }
     }
@@ -159,7 +163,11 @@ sub print_footer {
                   $button_text.'" onclick='.$onclick.' /></p>');
     }
     if ($phase eq 'process') {
-        $r->print('</form>'.&Apache::loncommon::end_page());
+        $r->print('</form>');
+        if ($context eq 'course') {
+            &Apache::lonparmset::endSettingsScreen($r);
+        }
+        $r->print(&Apache::loncommon::end_page());
     }
     return;
 }
@@ -229,7 +237,7 @@ sub make_changes {
     if ($context eq 'course') {
         $footer_text = 'Back to display/edit settings'; 
     }
-    &print_footer($r,$phase,'display',$footer_text,\@actions);
+    &print_footer($r,$context,$phase,'display',$footer_text,\@actions);
     $r->print('</p>');
 }
 
@@ -251,6 +259,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});
@@ -267,7 +282,7 @@ sub display_settings {
                 $r->print($output{$items[$i]});
             }
             $r->print('</div>');
-            $r->print(&print_footer($r,$phase,'process','Save',\@actions));
+            $r->print(&print_footer($r,$context,$phase,'process','Save Changes',\@actions));
         } else {
             $r->print('<input type="hidden" name="phase" value="" />'.
                       '<span class="LC_error">'.&mt('No settings chosen').
@@ -275,6 +290,34 @@ 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;
 }
@@ -291,14 +334,14 @@ sub display_choices {
               &Apache::loncommon::check_uncheck_jscript()."\n".
               '// ]]>'."\n".
               '</script>'."\n");
-    $r->print('<h3>'.&mt('Settings to display/modify').'</h3>'."\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)" />'.
-              '</div><br />'."\n".
-              '<div class="LC_left_float">');
+              "\n".
+              '</div><div class="LC_left_float">');
     my ($numitems,$maxincol,$firstthird,$secondthird,$seconddiv,$thirddiv,$count);
     if (ref($prefs_order) eq 'ARRAY') {
         $numitems = @{$prefs_order};
@@ -308,14 +351,15 @@ 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}) {
-            $r->print(&Apache::loncommon::help_open_topic($prefs->{$item}->{'help'}).
+            $r->print('<h4>'.
+                      &Apache::loncommon::help_open_topic($prefs->{$item}->{'help'}).
                       '<label><input type="checkbox" name="actions" value="'.$item.
-                      '" />&nbsp;'.&mt($prefs->{$item}->{'text'}).'</label><br />');
+                      '" />&nbsp;'.&mt($prefs->{$item}->{'text'}).'</label></h4>');
             $count ++;
             if ((!$seconddiv) && ($count >= $firstthird)) {
                 $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
@@ -328,7 +372,7 @@ sub display_choices {
         }
         $r->print('</div><br clear="all" />');
     }
-    $r->print(&print_footer($r,$phase,'display','Display'));
+    $r->print(&print_footer($r,$context,$phase,'display','Display'));
     $r->print('</form>');
     $r->print(&Apache::loncommon::end_page());
     return;