--- loncom/interface/lonconfigsettings.pm 2010/02/13 19:32:51 1.8.2.1 +++ loncom/interface/lonconfigsettings.pm 2010/11/19 13:09:36 1.8.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: lonconfigsettings.pm,v 1.8.2.1 2010/02/13 19:32:51 raeburn Exp $ +# $Id: lonconfigsettings.pm,v 1.8.2.4 2010/11/19 13:09:36 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(''. - ''. - ''); + $r->print(''); if (defined($env{'form.origin'})) { $r->print(''."\n"); } if (($phase eq 'display') || ($phase eq 'process')) { if (ref($actions) eq 'ARRAY') { foreach my $item (@{$actions}) { - $r->print('')."\n"; + $r->print(''."\n"); } } - $r->print(''); } my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; if ($phase eq 'process') { @@ -253,11 +242,11 @@ 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); @@ -273,52 +262,16 @@ 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('
'); for (my $i=0; $i<$colend; $i++) { $r->print($output{$items[$i]}); } - $r->print(' | '); - if ($colend < @items) { - for (my $i=$colend; $i<@items; $i++) { - $r->print($output{$items[$i]}); - } - } - $r->print(' |
'."\n"); + $r->print('
'.&mt('Display using: ')."\n". - '
'); + $r->print('