--- loncom/interface/lonconfigsettings.pm	2011/03/31 15:35:54	1.18
+++ loncom/interface/lonconfigsettings.pm	2011/06/05 12:59:47	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: lonconfigsettings.pm,v 1.18 2011/03/31 15:35:54 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.19 2011/06/05 12:59:47 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,7 +35,6 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
-use Apache::lonparmset();
 
 sub print_header {
     my ($r,$phase,$context,$jscript) = @_;
@@ -120,9 +119,6 @@ $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" />
@@ -136,7 +132,7 @@ $jscript
 }
 
 sub print_footer {
-    my ($r,$context,$phase,$newphase,$button_text,$actions) = @_;
+    my ($r,$phase,$newphase,$button_text,$actions) = @_;
     $button_text = &mt($button_text);
     $r->print('<input type="hidden" name="phase" value="" />');
     if (defined($env{'form.origin'})) {
@@ -163,11 +159,7 @@ sub print_footer {
                   $button_text.'" onclick='.$onclick.' /></p>');
     }
     if ($phase eq 'process') {
-        $r->print('</form>');
-        if ($context eq 'course') {
-            &Apache::lonparmset::endSettingsScreen($r);
-        }
-        $r->print(&Apache::loncommon::end_page());
+        $r->print('</form>'.&Apache::loncommon::end_page());
     }
     return;
 }
@@ -237,7 +229,7 @@ sub make_changes {
     if ($context eq 'course') {
         $footer_text = 'Back to display/edit settings'; 
     }
-    &print_footer($r,$context,$phase,'display',$footer_text,\@actions);
+    &print_footer($r,$phase,'display',$footer_text,\@actions);
     $r->print('</p>');
 }
 
@@ -282,7 +274,7 @@ sub display_settings {
                 $r->print($output{$items[$i]});
             }
             $r->print('</div>');
-            $r->print(&print_footer($r,$context,$phase,'process','Save Changes',\@actions));
+            $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions));
         } else {
             $r->print('<input type="hidden" name="phase" value="" />'.
                       '<span class="LC_error">'.&mt('No settings chosen').
@@ -290,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;
 }
@@ -372,7 +336,7 @@ sub display_choices {
         }
         $r->print('</div><br clear="all" />');
     }
-    $r->print(&print_footer($r,$context,$phase,'display','Display'));
+    $r->print(&print_footer($r,$phase,'display','Display'));
     $r->print('</form>');
     $r->print(&Apache::loncommon::end_page());
     return;