More ui-libification

diff --git a/quota/lang/en b/quota/lang/en
index e004786..b48299c 100644 (file)
--- a/quota/lang/en
+++ b/quota/lang/en
@@ -69,7 +69,7 @@ cuform_select=Selected users
 cuform_members=Members of selected groups
 cuform_doit=Copy
 
-egroup_title=Edit Quota
+egroup_title=Edit Group Quota
 egroup_freturn=filesystem list
 egroup_greturn=group list
 egroup_eallowgr=You are not allowed to edit quotas for '$1'
@@ -88,7 +88,7 @@ egroup_update=Update
 egroup_listall=List All Quotas
 egroup_listalldesc=Click this button to display a list of all filesystems on which this group has disk quotas, with links to edit them.
 
-euser_title=Edit Quota
+euser_title=Edit User Quota
 euser_freturn=filesystem list
 euser_ureturn=user list
 euser_eallowus=You are not allowed to edit quotas for '$1'
@@ -163,6 +163,7 @@ index_nosupport=No local filesystems can support quotas.
 index_mountmod=You can enable quotas for a filesystem in the <a href='$1'>Disk and Network Filesystems</a> module.
 
 lgroups_failed=Failed to list groups
+lgroups_tablist=Group list
 lgroups_eallow=You are not allowed to edit quotas on this filesystem
 lgroups_title=Filesystem Quotas
 lgroups_return=filesystems list
@@ -253,8 +254,8 @@ lusers_hard=Hard Limit
 lusers_grace=Grace
 lusers_noquota=No users have quotas on <tt>$1</tt>
 lusers_equota=Edit Quota For:
-lusers_egrace=Edit Grace Times
-lusers_check=Check Quotas
+lusers_egrace=Edit grace times
+lusers_check=Check quotas
 lusers_info=Webmin can be configured to automatically set the quotas on this filesystem when a new Unix user is created. This will only work when the $1 Webmin module is used to add users.
 lusers_useradmin=Users and Groups
 lusers_newuser=New User Quotas

diff --git a/quota/list_groups.cgi b/quota/list_groups.cgi
index a840103..b6c978b 100755 (executable)
--- a/quota/list_groups.cgi
+++ b/quota/list_groups.cgi
@@ -11,19 +11,43 @@ $whatfailed = $text{'lgroups_failed'};
 $form = 0;
 
 # List quotas
-&ui_print_header(undef, $text{'lgroups_title'}, "", "list_groups");
+&ui_print_header(&text('lgroups_quotas', $f),
+                $text{'lgroups_title'}, "", "list_groups");
 
+# Build and show tabs
+$prog = "list_groups.cgi?dir=".&urlize($f);
+@tabs = ( [ 'list', $text{'lgroups_tablist'}, $prog."&mode=list" ] );
+if ($access{'default'}) {
+       push(@tabs, [ 'default', $text{'lusers_tabdefault'},
+                     $prog."&mode=default" ]);
+       }
+if ($access{'email'} && &foreign_check("cron") && &foreign_check("mailboxes")) {
+       push(@tabs, [ 'email', $text{'lusers_tabemail'},
+                     $prog."&mode=email" ]);
+       }
+print &ui_tabs_start(\@tabs, "mode", $in{'mode'} || 'list', 1);
+
+# Build user list links
+@ulinks = ( );
+if ($access{'ggrace'}) {
+       push(@ulinks, "<a href='group_grace_form.cgi?filesys=".&urlize($f).
+                     "'>$text{'lusers_egrace'}</a>");
+       }
+push(@ulinks, "<a href='check_quotas.cgi?filesys=".&urlize($f).
+             "&source=group'>$text{'lusers_check'}</a>");
+
+# Groups list, in a tab
+print &ui_tabs_start_tab("mode", "list");
 $n = &filesystem_groups($f);
 $bsize = &block_size($f);
 $fsbsize = &block_size($f);
 if ($n > $config{'display_max'} && !$access{'ro'}) {
-       print "<b>",&text('lgroups_toomany', $f),"</b><br>\n";
+       print "<b>",&text('lgroups_toomany', $f),"</b><p>\n";
+       print &ui_links_row(\@ulinks);
        }
 elsif ($n) {
        my $threshold_pc = $config{'threshold_pc'} || 101;
        $threshold_pc = 101 if $threshold_pc < 1 or $threshold_pc > 101;
-       print &ui_subheading(&text('lgroups_quotas', $f));
-       &show_buttons();
        if (!$access{'ro'}) {
                print &ui_form_start("edit_group_mass.cgi", "post");
                print &ui_hidden('dir', $f),"\n";
@@ -31,7 +55,8 @@ elsif ($n) {
 
        # Generate select links
        @links = ( &select_all_link("d", $form),
-                  &select_invert_link("d", $form) );
+                  &select_invert_link("d", $form),
+                  @ulinks );
        if (!$access{'ro'}) {
                print &ui_links_row(\@links);
                }
@@ -199,42 +224,55 @@ elsif ($n) {
                }
        }
 else {
-       print "<b>",&text('lgroups_noquota', $f),"</b><br>\n";
+       print "<b>",&text('lgroups_noquota', $f),"</b><p>\n";
+       print &ui_links_row(\@ulinks);
        }
-&show_buttons();
 
+# Form to edit any user
+if (!$access{'ro'}) {
+       print &ui_form_start("edit_group_quota.cgi");
+       print &ui_hidden("filesys", $f);
+       print &ui_hidden("source", 0);
+       print &ui_submit($text{'lgroups_equota'});
+       print &ui_group_textbox("group");
+       print &ui_form_end();
+       }
+
+print &ui_tabs_end_tab("mode", "list");
+
+# Show form for default quotas, in a tab
 if ($access{'default'}) {
-       print &ui_hr();
-       print &text('lgroups_info', $text{'lusers_useradmin'});
-       print "<p>\n";
+       print &ui_tabs_start_tab("mode", "default");
+       print &text('lgroups_info', $text{'lusers_useradmin'}),"<p>\n";
 
        @dquot = split(/\s+/, $config{"gsync_$f"});
-       print "<form action=save_gsync.cgi>\n";
-       print "<input type=hidden name=filesys value=\"$f\">\n";
-       print "<table width=100% border> <tr $tb>\n";
-       print "<td colspan=2><b>$text{'lgroups_newgroup'}</b></td> </tr> <tr $cb>\n";
-
-       print "<td width=50%><table><tr>\n";
-       print "<td><b>$text{'lusers_sblimit'}</b></td> <td>\n";
-       &quota_input("sblocks", $dquot[0], $bsize);
-       print "</td> </tr><tr> <td><b>$text{'lusers_hblimit'}</b></td> <td>\n";
-       &quota_input("hblocks", $dquot[1], $bsize);
-       print "</td> </tr></table></td>\n";
-
-       print "<td width=50%><table><tr>\n";
-       print "<td><b>$text{'lusers_sflimit'}</b></td> <td>\n";
-       &quota_input("sfiles", $dquot[2]);
-       print "</td> </tr><tr> <td><b>$text{'lusers_hflimit'}</b></td> <td>\n";
-       &quota_input("hfiles", $dquot[3]);
-       print "</td> </tr></table></td>\n";
-       print "</tr> </table>\n";
-       print "<input type=submit value=$text{'lusers_apply'}></form>\n";
+       print &ui_form_start("save_gsync.cgi");
+       print &ui_hidden("filesys", $f);
+       print &ui_table_start($text{'lgroups_newgroup'}, "width=100%", 4);
+
+       # Default block limits
+       print &ui_table_row($text{'lusers_sblimit'},
+               &quota_input("sblocks", $dquot[0], $bsize));
+       print &ui_table_row($text{'lusers_hblimit'},
+               &quota_input("hblocks", $dquot[1], $bsize));
+
+       # Default file limits
+       print &ui_table_row($text{'lusers_sflimit'},
+               &quota_input("sfiles", $dquot[2]));
+       print &ui_table_row($text{'lusers_hflimit'},
+               &quota_input("hfiles", $dquot[3]));
+
+       print &ui_table_end();
+       print &ui_form_end([ [ undef, $text{'lusers_apply'} ] ]);
+
+       print &ui_tabs_end_tab("mode", "default");
        }
 
 # Show form for email notifications
 if ($access{'email'} && &foreign_check("cron") &&
     &foreign_check("mailboxes")) {
-       print &ui_hr();
+       print &ui_tabs_start_tab("mode", "email");
+
        print &ui_form_start("save_gemail.cgi");
        print &ui_hidden("filesys", $f);
        print &ui_table_start($text{'lgroups_emailheader'}, "width=100%", 4);
@@ -274,42 +312,11 @@ if ($access{'email'} && &foreign_check("cron") &&
 
        print &ui_table_end();
        print &ui_form_end([ [ 'save', $text{'lusers_apply'} ] ]);
-       }
 
+       print &ui_tabs_end_tab("mode", "email");
+       }
 
+print &ui_tabs_end(1);
 
 &ui_print_footer("", $text{'lgroups_return'});
 
-sub show_buttons
-{
-print "<table width=100%><tr>\n";
-if (!$access{'ro'}) {
-       print "<form action=edit_group_quota.cgi>\n";
-       print "<input type=hidden name=filesys value=\"$f\">\n";
-       print "<input type=hidden name=source value=0>\n";
-       print "<td align=left width=33%>\n";
-       print "<input type=submit value=\"$text{'lgroups_equota'}\">\n";
-       print "<input name=group size=8> ",
-             &group_chooser_button("group", 0, $form),"</td></form>\n";
-       $form++;
-       }
-else { print "<td width=33%></td>\n"; }
-
-if ($access{'ggrace'}) {
-       print "<form action=group_grace_form.cgi>\n";
-       print "<input type=hidden name=filesys value=\"$f\">\n";
-       print "<td align=center width=33%>\n";
-       print "<input type=submit value=\"$text{'lgroups_grace'}\">\n";
-       print "</td></form>\n";
-       $form++;
-       }
-else { print "<td width=33%></td>\n"; }
-
-print "<form action=check_quotas.cgi>\n";
-print "<input type=hidden name=filesys value=\"$f\">\n";
-print "<input type=hidden name=source value=group>\n";
-print "<td align=right width=33%><input type=submit value=\"$text{'lgroups_check'}\">\n";
-print "</td></form> </tr></table>\n";
-$form++;
-}
-