--- loncom/interface/lonconfigsettings.pm 2010/03/23 20:53:09 1.8.2.2 +++ loncom/interface/lonconfigsettings.pm 2010/01/08 00:52:06 1.10 @@ -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.10 2010/01/08 00:52:06 faziophi 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','View/Modify Domain Settings'); + ($pagetitle, $brcrumtitle) = ('View/Modify Domain Settings','Domain Settings'); $action = '/adm/domainprefs'; if ($phase eq 'display') { my @actions = &Apache::loncommon::get_env_multiple('form.actions'); @@ -94,7 +94,8 @@ function changePage(formname,newphase) { }'."\n"; if ($phase eq 'pickactions') { $js .= - &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox'})."\n"; + &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox',numcols => 'radio',})."\n". + &javascript_set_colnums(); } elsif ($phase eq 'display') { $js .= &color_pick_js()."\n"; } @@ -113,7 +114,12 @@ $jscript my $additem; if ($phase eq 'pickactions') { my %loaditems = ( - 'onload' => "setFormElements(document.pickactions);", + '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);", ); $additem = {'add_entries' => \%loaditems,}; } @@ -134,7 +140,11 @@ $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"); } @@ -144,6 +154,7 @@ sub print_footer { $r->print('')."\n"; } } + $r->print(''); } my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"'; if ($phase eq 'process') { @@ -201,14 +212,13 @@ sub make_changes { } if ($context eq 'course') { if ($numchanged) { - my $message = &Apache::courseprefs::store_changes($dom,$confname,$prefs_order,\@actions, - $prefs,$values,\%changes,$crstype); - $r->print(&Apache::loncommon::confirmwrapper($message)); + $r->print(&Apache::courseprefs::store_changes($dom,$confname,$prefs_order,\@actions, + $prefs,$values,\%changes,$crstype)); } else { if ($crstype eq 'Community') { - $r->print(&Apache::loncommon::confirmwrapper(&mt("No changes made to community configuration."))); + $r->print(&mt("No changes made to community configuration.")); } else { - $r->print(&Apache::loncommon::confirmwrapper(&mt("No changes made to course configuration."))); + $r->print(&mt("No changes made to course configuration.")); } } if (keys(%disallowed) > 0) { @@ -242,11 +252,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); @@ -262,19 +272,96 @@ sub display_settings { $rowsum += $rowtotal{$item}; } } - $r->print('
');
+ }
+ else {
+ $r->print(' ');
+ }
+ for (my $i=0; $i<$colend; $i++) {
$r->print($output{$items[$i]});
}
- $r->print(' ');
- $r->print(&print_footer($r,$phase,'process','Save',\@actions));
+ if ($context ne 'course') {
+ $r->print(' | '); + } + if ($colend < @items) { + for (my $i=$colend; $i<@items; $i++) { + $r->print($output{$items[$i]}); + } + } + if ($context ne 'course') { + $r->print(' |
'.(' 'x2). ''. - '
'.&mt('Display using: ')."\n". + '
'); } - $r->print(&print_footer($r,$phase,'display','Display')); + $r->print(&print_footer($r,$phase,'display','Go')); $r->print(''); $r->print(&Apache::loncommon::end_page()); return; } +sub javascript_set_colnums { + return <