diff --git a/acl/index.cgi b/acl/index.cgi index a1bf181e8..d7cd3ed3b 100755 --- a/acl/index.cgi +++ b/acl/index.cgi @@ -125,28 +125,28 @@ if ($access{'groups'}) { "$text{'index_gcreate'}"); print &ui_links_row(\@rowlinks); - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print &ui_columns_start([ $text{'index_group'}, + $text{'index_members'}, + $text{'index_modules'} ], 100); foreach $g (@glist) { - print "\n"; - print "\n"; - + local @cols; + push(@cols, &user_link($g,"edit_group.cgi","group")); + push(@cols, join(" ", @{$g->{'members'}})); if ($ingroup{'@'.$g->{'name'}}) { # Is a member of some other group - &show_modules("group", $g->{'name'}, $g->{'ownmods'},0, - &text('index_modgroups', - "$ingroup{$g->{'name'}}->{'name'}")); + push(@cols, &show_modules("group", $g->{'name'}, + $g->{'ownmods'},0, + &text('index_modgroups', + "$ingroup{$g->{'name'}}->{'name'}"))); } else { # Is a top-level group - &show_modules("group", $g->{'name'}, $g->{'modules'},1); + push(@cols, &show_modules("group", $g->{'name'}, + $g->{'modules'}, 1)); } + print &ui_columns_row(\@cols); } - print "
$text{'index_group'}$text{'index_members'}$text{'index_modules'}
\n"; - print &user_link($g,"edit_group.cgi","group"),"",join(" ", @{$g->{'members'}}), - " 
\n"; + print &ui_columns_end(); print &ui_links_row(\@rowlinks); if (!$config{'select'}) { print &ui_form_end([ [ "delete", $text{'index_delete'} ] ]); @@ -230,7 +230,7 @@ else { push(@grid, "$text{'index_global'}"); } - foreach $m (sort { $modname{$a} cmp $modname{$b} } @$mods) { + foreach my $m (sort { $modname{$a} cmp $modname{$b} } @$mods) { if ($modname{$m}) { if ($mcan{$m} && $access{'acl'}) { push(@grid, "