--- loncom/interface/lonconfigsettings.pm 2009/10/29 14:57:18 1.7 +++ loncom/interface/lonconfigsettings.pm 2010/01/07 18:21:25 1.9 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.7 2009/10/29 14:57:18 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.9 2010/01/07 18:21:25 faziophi Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,10 +38,22 @@ use Apache::lonlocal; sub print_header { my ($r,$phase,$context,$jscript) = @_; - my ($pagetitle,$brcrumtitle,$action); + my ($pagetitle,$brcrumtitle,$action,$call_category_check); if ($context eq 'domain') { ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','Domain Settings'); $action = '/adm/domainprefs'; + if ($phase eq 'display') { + my @actions = &Apache::loncommon::get_env_multiple('form.actions'); + if (grep(/^coursecategories$/,@actions)) { + $call_category_check = qq| + if (formname == document.display) { + if (!categoryCheck(formname)) { + return; + } + } +|; + } + } } else { if (&Apache::loncommon::course_type() eq 'Community') { ($pagetitle,$brcrumtitle) = ('Community Configuration','Community Configuration'); @@ -77,6 +89,7 @@ function changePage(formname,newphase) { return; } } + '.$call_category_check.' formname.submit(); }'."\n"; if ($phase eq 'pickactions') { @@ -288,17 +301,30 @@ sub display_settings { } else { $colend = @items; } - $r->print('

'); for (my $i=0; $i<$colend; $i++) { + if ($context ne 'course') { + $r->print('

'); + } + else { + $r->print('
'); + } + for (my $i=0; $i<$colend; $i++) { $r->print($output{$items[$i]}); } - $r->print('
'); + if ($context ne 'course') { + $r->print(''); + } if ($colend < @items) { for (my $i=$colend; $i<@items; $i++) { $r->print($output{$items[$i]}); } } - $r->print('

'); - $r->print(&print_footer($r,$phase,'process','Save',\@actions)); + if ($context ne 'course') { + $r->print('

'); + } + else { + $r->print(''); + } + $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions)); } else { $r->print(''. ' + $(document).ready(function(){ + $("#prefs").accordion({ + autoHeight: false + }); + $("#prefs td.LC_left_item").css("text-align", "right"); + $("#prefs td.LC_left_item").css("width", "40%"); + $("#prefs td.LC_left_item").css("padding-right", "10px"); + $("#prefs td.LC_right_item").css("text-align", "left"); + $("#prefs td.LC_right_item").css("width", "60%"); + }); + +'); + } $r->print(&Apache::loncommon::end_page()); return; }