--- loncom/interface/loncoursegroups.pm 2009/05/07 16:09:55 1.98 +++ loncom/interface/loncoursegroups.pm 2009/06/05 12:49:50 1.102 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursegroups.pm,v 1.98 2009/05/07 16:09:55 bisitz Exp $ +# $Id: loncoursegroups.pm,v 1.102 2009/06/05 12:49:50 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1440,7 +1440,7 @@ sub header { {'add_entries' => $loaditems,}); my $output = <<"END"; $start_page -
+ END if ($action eq 'create' || $action eq 'modify') { @@ -1985,42 +1985,25 @@ sub print_current_settings { '.$description.' '); + if (@{$available} > 0) { - $r->print(''.&mt('Available for assignment to members:').''. - ''); - my $rowcell = int(@{$available}/2) + @{$available}%2; + $r->print(''.&mt('Available for assignment to members:').''); + $r->print(''); - } - } - $r->print(''); + $r->print('
  • '.&mt($$functions{$$available[$i]}).'
  • '); } - if ((@{$available} > 3) && (@{$available}%2)) { - $r->print(''); - } - $r->print('
    '.$$functions{$$available[$i]}. - '   

    '); + $r->print(''); } + if (@{$unavailable} > 0) { - $r->print(''.&mt('Unavailable for assignment:').''. - ''); - my $rowcell = int(@{$unavailable}/2) + @{$unavailable}%2; - for (my $j=0; $j<@{$unavailable}; $j++) { - if (@{$unavailable} > 3) { - if ($j==$rowcell) { - $r->print(''); - } - } - $r->print(''); + $r->print(''.&mt('Unavailable for assignment:').''); + $r->print(''); - } - $r->print('
    '.$$functions{$$unavailable[$j]}. - '   
    '); + $r->print(''); } + my $quota_text=&mt('[_1] Mb',$quota); my $granu_text=&mt($granularity); $r->print(<<"END"); @@ -2083,7 +2066,7 @@ sub pick_new_members { &check_uncheck_buttons($r,$formname,'member',$lt{'addm'}); if (@{$available} > 0 && $granularity eq 'Yes') { $r->print(' -
    '.$lt{'setf'}.' +
    '.$lt{'setf'}.' @@ -2533,7 +2516,7 @@ sub current_membership { $r->print(' -
    '.$lt{'curf'}.' +
    '.$lt{'curf'}.'    @@ -2691,7 +2674,7 @@ sub check_uncheck_buttons { $r->print('
    - '.$title.' + '.$title.' @@ -2975,9 +2958,8 @@ sub member_privileges_form { foreach my $tool (@{$tools}) { if (@{$showboxes{$tool}} > 0) { $r->print(''); - $r->print(''. - ''); + $r->print('
    '.&mt($tool).''); + $r->print('
    '. - &mt($tool).'
    '); my $privcount = 0; foreach my $priv (@{$showboxes{$tool}}) { $privcount ++; @@ -2992,7 +2974,7 @@ sub member_privileges_form { $r->print('
    '); } $r->print( - '
    '.&mt($$toolprivs{$tool}{$priv}).'' + '
    '.&mt($$toolprivs{$tool}{$priv}).'' .'' .' ' @@ -3012,7 +2994,7 @@ sub member_privileges_form { } } } - $r->print('
     '); + $r->print('
     '); } } $r->print('');