--- loncom/interface/lonconfigsettings.pm 2010/05/22 13:26:21 1.8.2.3 +++ 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.8.2.3 2010/05/22 13:26:21 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('')."\n"; + $r->print(''."\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(''."\n"); + } ($output{$item},$rowtotal{$item}) = &Apache::domainprefs::print_config_box($r,$dom,$confname, $phase,$item,$prefs->{$item},$values->{$item}); @@ -267,7 +274,7 @@ sub display_settings { $r->print($output{$items[$i]}); } $r->print(''); - $r->print(&print_footer($r,$phase,'process','Save',\@actions)); + $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions)); } else { $r->print(''. ''.&mt('No settings chosen'). @@ -291,14 +298,14 @@ sub display_choices { &Apache::loncommon::check_uncheck_jscript()."\n". '// ]]>'."\n". ''."\n"); - $r->print('

'.&mt('Settings to display/modify').'

'."\n". + $r->print('

'.&mt('Settings to display/modify').'

'. '
'.(' 'x2). ''. - '

'."\n". - '
'); + "\n". + '
'); my ($numitems,$maxincol,$firstthird,$secondthird,$seconddiv,$thirddiv,$count); if (ref($prefs_order) eq 'ARRAY') { $numitems = @{$prefs_order}; @@ -313,9 +320,10 @@ sub display_choices { $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('

'. + &Apache::loncommon::help_open_topic($prefs->{$item}->{'help'}). '
'); + '" /> '.&mt($prefs->{$item}->{'text'}).'

'); $count ++; if ((!$seconddiv) && ($count >= $firstthird)) { $r->print('
'."\n".'
'."\n");