Some ui-lib conversion .. more to come

diff --git a/quota/copy_group_form.cgi b/quota/copy_group_form.cgi
index 04c088b..f7f361e 100755 (executable)
--- a/quota/copy_group_form.cgi
+++ b/quota/copy_group_form.cgi
@@ -10,20 +10,20 @@ $access{'filesys'} eq "*" ||
        &error($text{'cgform_egroup'});
 &ui_print_header(undef, $text{'cgform_title'}, "", "copy_group");
 
-print "<form action=copy_group.cgi>\n";
-print "<input type=hidden name=group value=\"$in{'group'}\">\n";
 print "<b>",&text('cgform_copyto', $in{'group'}),"</b><p>\n";
-print "<ul>\n";
-print "<input type=radio name=dest value=0> ",
-      "<b>$text{'cgform_all'}</b><br>\n";
-print "<input type=radio name=dest value=1 checked> ",
-      "<b>$text{'cgform_select'}</b>\n";
-print "<input name=groups size=30> ",&group_chooser_button("groups",1),"<br>\n";
-print "<input type=radio name=dest value=2> ",
-      "<b>$text{'cgform_contain'}</b>\n";
-print "<input name=users size=30> ",&user_chooser_button("users",1),"<br>\n";
-print "<input type=submit value=$text{'cgform_doit'}></form>\n";
-print "</ul>\n";
+print &ui_form_start("copy_group.cgi");
+print &ui_hidden("group", $in{'group'});
 
-&ui_print_footer("group_filesys.cgi?group=$in{'group'}", $text{'cgform_return'});
+print &ui_radio_table("dest", 1,
+       [ [ 0, $text{'cgform_all'} ],
+         [ 1, $text{'cgform_select'}, &ui_textbox("groups", undef, 40)." ".
+                                      &group_chooser_button("groups", 1) ],
+         [ 2, $text{'cgform_contain'}, &ui_textbox("users", undef, 40)." ".
+                                       &user_chooser_button("users", 1) ],
+       ]);
+
+print &ui_form_end([ [ undef, $text{'cgform_doit'} ] ]);
+
+&ui_print_footer("group_filesys.cgi?group=$in{'group'}",
+                $text{'cgform_return'});
 

diff --git a/quota/copy_user_form.cgi b/quota/copy_user_form.cgi
index 46e4c19..ff76220 100755 (executable)
--- a/quota/copy_user_form.cgi
+++ b/quota/copy_user_form.cgi
@@ -10,19 +10,16 @@ $access{'filesys'} eq "*" ||
        &error($text{'cuform_euallow'});
 &ui_print_header(undef, $text{'cuform_title'}, "", "copy_user");
 
-print "<form action=copy_user.cgi>\n";
-print "<input type=hidden name=user value=\"$in{'user'}\">\n";
 print "<b>",&text('cuform_copyto', $in{'user'}),"</b><p>\n";
-print "<ul>\n";
-print "<input type=radio name=dest value=0> ",
-      "<b>$text{'cuform_all'}</b><br>\n";
-print "<input type=radio name=dest value=1 checked> ",
-      "<b>$text{'cuform_select'}</b>\n";
-print "<input name=users size=30> ",&user_chooser_button("users",1),"<br>\n";
-print "<input type=radio name=dest value=2> ",
-      "<b>$text{'cuform_members'}</b>\n";
-print "<input name=groups size=30> ",&group_chooser_button("groups",1),"<br>\n";
-print "<input type=submit value=$text{'cuform_doit'}></form>\n";
-print "</ul>\n";
+print &ui_form_start("copy_user.cgi");
+print &ui_hidden("user", $in{'user'});
+print &ui_radio_table("dest", 1,
+       [ [ 0, $text{'cuform_all'} ],
+         [ 1, $text{'cuform_select'}, &ui_textbox("users", undef, 40)." ".
+                                      &user_chooser_button("users",1) ],
+         [ 2, $text{'cuform_members'}, &ui_textbox("groups", undef, 40)." ".
+                                       &group_chooser_button("groups",1) ],
+       ]);
+print &ui_form_end([ [ undef, $text{'cuform_doit'} ] ]);
 
 &ui_print_footer("user_filesys.cgi?user=$in{'user'}", $text{'cuform_return'});

diff --git a/quota/edit_group_quota.cgi b/quota/edit_group_quota.cgi
index 2f120dc..9b7f199 100755 (executable)
--- a/quota/edit_group_quota.cgi
+++ b/quota/edit_group_quota.cgi
@@ -17,64 +17,77 @@ $first = (@quot == 0);
 $bsize = &block_size($fs);
 $fsbsize = &block_size($fs, 1);
 
-print "<table border width=100%>\n";
-print "<form action=save_group_quota.cgi>\n";
-print "<input type=hidden name=group value=\"$u\">\n";
-print "<input type=hidden name=filesys value=\"$fs\">\n";
-print "<input type=hidden name=source value=$in{'source'}>\n";
-print "<tr $tb> <td colspan=2><b>",&text('egroup_quotas', &html_escape($u), $fs),"</b></td> </tr>\n";
-print "<tr $cb> <td width=50%><table width=100%>\n";
+print &ui_form_start("save_group_quota.cgi");
+print &ui_hidden("group", $u);
+print &ui_hidden("filesys", $fs);
+print &ui_hidden("source", $in{'source'});
+print &ui_table_start(&text('egroup_quotas', &html_escape($u), $fs),
+                     "width=100%", 4);
 
+# Soft block limit
+print &ui_table_row($bsize ? $text{'egroup_sklimit'} : $text{'egroup_sblimit'},
+       &quota_input("sblocks", $quot[1], $bsize));
+
+# Hard block limit
+print &ui_table_row($bsize ? $text{'egroup_hklimit'} : $text{'egroup_hblimit'},
+       &quota_input("hblocks", $quot[2], $bsize));
+
+# Space used
 if (!$first) {
        if ($bsize) {
-               print "<tr> <td><b>$text{'egroup_kused'}</b></td> ",
-                     "<td>",&nice_size($quot[0]*$bsize),"</td> </tr>\n",
+               print &ui_table_row($text{'egroup_kused'},
+                                   &nice_size($quot[0]*$bsize));
                }
        else {
-               print "<tr> <td><b>$text{'egroup_bused'}</b></td> ",
-                     "<td>$quot[0]</td> </tr>\n",
+               print &ui_table_row($text{'egroup_bused'},
+                                   $quot[0]);
                }
        }
-print "<tr> <td><b>",$bsize ? $text{'egroup_sklimit'} :
-                             $text{'egroup_sblimit'},"</b></td>\n";
-&quota_input("sblocks", $quot[1], $bsize);
-print "<tr> <td><b>",$bsize ? $text{'egroup_hklimit'} :
-                             $text{'egroup_hblimit'},"</b></td>\n";
-&quota_input("hblocks", $quot[2], $bsize);
+
 if ($access{'diskspace'}) {
+       # Filesystem space
        ($binfo, $finfo) = &filesystem_info($fs, undef, undef, $fsbsize);
-       print "<tr> <td><b>",$bsize ? $text{'euser_kdisk'} :
-                                     $text{'euser_bdisk'},"</b></td>\n";
-       print "<td>$binfo</td> </tr>\n";
+       print &ui_table_row($bsize ? $text{'euser_sdisk'}
+                                  : $text{'euser_bdisk'}, $binfo);
        }
 
-print "</table></td><td width=50%><table width=100%>\n";
+print &ui_table_hr();
+
+# Soft file limit
+print &ui_table_row($text{'egroup_sflimit'},
+       &quota_input("sfiles", $quot[4]));
+
+# Hard file limit
+print &ui_table_row($text{'egroup_hflimit'},
+       &quota_input("hfiles", $quot[5]));
+
+# Files used
 if (!$first) {
-       print "<tr> <td><b>$text{'egroup_fused'}</b></td> <td>$quot[3]</td> </tr>\n",
+       print &ui_table_row($text{'egroup_fused'}, $quot[3]);
        }
-print "<tr> <td><b>$text{'egroup_sflimit'}</b></td>\n";
-&quota_input("sfiles", $quot[4]);
-print "<tr> <td><b>$text{'egroup_hflimit'}</b></td>\n";
-&quota_input("hfiles", $quot[5]);
+
+# Filesystem files
 if ($access{'diskspace'}) {
-       print "<tr> <td><b>$text{'euser_fdisk'}</b></td>\n";
-       print "<td>$finfo</td> </tr>\n";
+       print &ui_table_row($text{'euser_fdisk'}, $finfo);
        }
 
-print "</table></td></tr></table>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'egroup_update'} ] ]);
 
-print "<table width=100%><tr>\n";
-print "<td><input type=submit value=$text{'egroup_update'}></td>\n";
-print "</form><form action=group_filesys.cgi>\n";
-print "<input type=hidden name=group value=\"$u\">\n";
-print "<td align=right><input type=submit value=\"$text{'egroup_listall'}\"></td>\n";
-print "</form></tr></table>\n";
+print &ui_hr();
+print &ui_buttons_start();
+print &ui_buttons_row("group_filesys.cgi", $text{'egroup_listall'},
+                     $text{'egroup_listalldesc'},
+                     &ui_hidden("group", $u));
+print &ui_buttons_end();
 
 if ($in{'source'}) {
-       &ui_print_footer("group_filesys.cgi?group=".&urlize($u),$text{'egroup_freturn'});
+       &ui_print_footer("group_filesys.cgi?group=".&urlize($u),
+                        $text{'egroup_freturn'});
        }
 else {
-       &ui_print_footer("list_groups.cgi?dir=".&urlize($fs), $text{'egroup_greturn'});
+       &ui_print_footer("list_groups.cgi?dir=".&urlize($fs),
+                        $text{'egroup_greturn'});
        }
 
 

diff --git a/quota/edit_user_quota.cgi b/quota/edit_user_quota.cgi
index f3e6a3c..7170963 100755 (executable)
--- a/quota/edit_user_quota.cgi
+++ b/quota/edit_user_quota.cgi
@@ -17,64 +17,78 @@ $first = (@quot == 0);
 $bsize = &block_size($fs);
 $fsbsize = &block_size($fs, 1);
 
-print "<table border width=100%>\n";
-print "<form action=save_user_quota.cgi>\n";
-print "<input type=hidden name=user value=\"$u\">\n";
-print "<input type=hidden name=filesys value=\"$fs\">\n";
-print "<input type=hidden name=source value=$in{'source'}>\n";
-print "<tr $tb> <td colspan=2><b>",&text('euser_quotas', &html_escape($u), $fs),"</b></td> </tr>\n";
-print "<tr $cb> <td width=50%><table width=100%>\n";
+print &ui_form_start("save_user_quota.cgi");
+print &ui_hidden("user", $u);
+print &ui_hidden("filesys", $fs);
+print &ui_hidden("source", $in{'source'});
+print &ui_table_start(&text('euser_quotas', &html_escape($u), $fs),
+                     "width=100%", 4);
 
+# Soft block limit
+print &ui_table_row($bsize ? $text{'euser_sklimit'} : $text{'euser_sblimit'},
+       &quota_input("sblocks", $quot[1], $bsize));
+
+# Hard block limit
+print &ui_table_row($bsize ? $text{'euser_hklimit'} : $text{'euser_hblimit'},
+       &quota_input("hblocks", $quot[2], $bsize));
+
+# Space used
 if (!$first) {
        if ($bsize) {
-               print "<tr> <td><b>$text{'euser_kused'}</b></td> ",
-                     "<td>",&nice_size($quot[0]*$bsize),"</td> </tr>\n",
+               print &ui_table_row($text{'euser_kused'},
+                                   &nice_size($quot[0]*$bsize));
                }
        else {
-               print "<tr> <td><b>$text{'euser_bused'}</b></td> ",
-                     "<td>$quot[0]</td> </tr>\n",
+               print &ui_table_row($text{'euser_bused'},
+                                   $quot[0]);
                }
        }
-print "<tr> <td><b>",$bsize ? $text{'euser_sklimit'} :
-                             $text{'euser_sblimit'},"</b></td>\n";
-&quota_input("sblocks", $quot[1], $bsize);
-print "<tr> <td><b>",$bsize ? $text{'euser_hklimit'} :
-                             $text{'euser_hblimit'},"</b></td>\n";
-&quota_input("hblocks", $quot[2], $bsize);
+
 if ($access{'diskspace'}) {
+       # Filesystem space
        ($binfo, $finfo) = &filesystem_info($fs, undef, undef, $fsbsize);
-       print "<tr> <td><b>",$bsize ? $text{'euser_sdisk'} :
-                                     $text{'euser_bdisk'},"</b></td>\n";
-       print "<td>$binfo</td> </tr>\n";
+       print &ui_table_row($bsize ? $text{'euser_sdisk'}
+                                  : $text{'euser_bdisk'}, $binfo);
        }
 
-print "</table></td><td width=50%><table width=100%>\n";
+print &ui_table_hr();
+
+# Sort file limit
+print &ui_table_row($text{'euser_sflimit'},
+       &quota_input("sfiles", $quot[4]));
+
+# Hard file limit
+print &ui_table_row($text{'euser_hflimit'},
+       &quota_input("hfiles", $quot[5]));
+
+# Files used
 if (!$first) {
-       print "<tr> <td><b>$text{'euser_fused'}</b></td> <td>$quot[3]</td> </tr>\n",
+       print &ui_table_row($text{'euser_fused'}, $quot[3]);
        }
-print "<tr> <td><b>$text{'euser_sflimit'}</b></td>\n";
-&quota_input("sfiles", $quot[4]);
-print "<tr> <td><b>$text{'euser_hflimit'}</b></td>\n";
-&quota_input("hfiles", $quot[5]);
+
 if ($access{'diskspace'}) {
-       print "<tr> <td><b>$text{'euser_fdisk'}</b></td>\n";
-       print "<td>$finfo</td> </tr>\n";
+       # Number of files
+       print &ui_table_row($text{'euser_fdisk'}, $finfo);
        }
 
-print "</table></td></tr></table>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'euser_update'} ] ]);
+
+print &ui_hr();
 
-print "<table width=100%><tr>\n";
-print "<td><input type=submit value=$text{'euser_update'}></td>\n";
-print "</form><form action=user_filesys.cgi>\n";
-print "<input type=hidden name=user value=\"$u\">\n";
-print "<td align=right><input type=submit value=\"$text{'euser_listall'}\"></td>\n";
-print "</form></tr></table>\n";
+print &ui_buttons_start();
+print &ui_buttons_row("user_filesys.cgi", $text{'euser_listall'},
+                     $text{'euser_listalldesc'},
+                     &ui_hidden("user", $u));
+print &ui_buttons_end();
 
 if ($in{'source'}) {
-       &ui_print_footer("user_filesys.cgi?user=".&urlize($u), $text{'euser_freturn'});
+       &ui_print_footer("user_filesys.cgi?user=".&urlize($u),
+                        $text{'euser_freturn'});
        }
 else {
-       &ui_print_footer("list_users.cgi?dir=".&urlize($fs), $text{'euser_ureturn'});
+       &ui_print_footer("list_users.cgi?dir=".&urlize($fs),
+                        $text{'euser_ureturn'});
        }
 
 

diff --git a/quota/group_filesys.cgi b/quota/group_filesys.cgi
index 7dfd935..2ce8da9 100755 (executable)
--- a/quota/group_filesys.cgi
+++ b/quota/group_filesys.cgi
@@ -31,7 +31,9 @@ if ($n) {
        # Generate top header (showing blocks/files)
        @hcols = ( undef, $variable_bsize ? $text{'ufilesys_blocks'}
                                          : $text{'ufilesys_space'},
-                  $text{'ufilesys_files'});
+                  $config{'show_grace'} ? ( undef ) : ( ),
+                  $text{'ufilesys_files'},
+                  $config{'show_grace'} ? ( undef ) : ( ));
        print &ui_columns_start(\@hcols, 100, 0,
                [ undef, "colspan=3 align=center", "colspan=3 align=center" ]);
 
@@ -78,22 +80,26 @@ else {
        }
 
 if (!$access{'ro'}) {
-       print "<table width=100%><tr>\n";
-       print "<form action=edit_group_quota.cgi>\n";
-       print "<input type=hidden name=group value=\"$u\">\n";
-       print "<input type=hidden name=source value=1>\n";
-       print "<td align=left><input type=submit value=\"$text{'gfilesys_edit'}\">\n";
-       print "<select name=filesys>\n";
-       foreach $f (@fslist) { print "<option>$f\n"; }
-       print "</select></td></form>\n";
+       print &ui_hr();
+       print &ui_buttons_start();
+
+       # Form to edit quota on other filesystems
+       print &ui_buttons_row("edit_group_quota.cgi",
+               $text{'gfilesys_edit'},
+               $text{'gfilesys_editdesc'},
+               &ui_hidden("group", $u).&ui_hidden("source", 1),
+               &ui_select("filesys", undef, \@fslist)
+               );
 
        if ($access{'filesys'} eq "*") {
-               print "<form action=copy_group_form.cgi>\n";
-               print "<input type=hidden name=group value=\"$u\">\n";
-               print "<td align=right><input type=submit value=\"$text{'gfilesys_copy'}\">\n";
-               print "</td></form>\n";
+               # Button to copy quotas
+               print &ui_buttons_row("copy_group_form.cgi",
+                       $text{'gfilesys_copy'},
+                       $text{'gfilesys_copydesc'},
+                       &ui_hidden("group", $u));
                }
-       print "</tr></table>\n";
+
+       print &ui_buttons_end();
        }
 
 &ui_print_footer("", $text{'gfilesys_return'});

diff --git a/quota/lang/en b/quota/lang/en
index c7ebaf7..8fb2416 100644 (file)
--- a/quota/lang/en
+++ b/quota/lang/en
@@ -86,6 +86,7 @@ egroup_sflimit=Soft file Limit
 egroup_hflimit=Hard file Limit
 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_freturn=filesystem list
@@ -108,6 +109,7 @@ euser_sflimit=Soft file limit
 euser_hflimit=Hard file limit
 euser_update=Update
 euser_listall=List All Quotas
+euser_listalldesc=Click this button to display a list of all filesystems on which this user has disk quotas, with links to edit them.
 
 gfilesys_title=Group Quotas
 gfilesys_return=filesystems list
@@ -124,6 +126,8 @@ gfilesys_hard=Hard Limit
 gfilesys_nogquota=Group <tt>$1</tt> does not have quotas on any filesystem
 gfilesys_edit=Edit Quota On:
 gfilesys_copy=Copy Quotas
+gfilesys_editdesc=View and edit the quotas for this group on some other filesystem that it currently does not have quotas on.
+gfilesys_copydesc=Copy quota limits for this group on all filesystems to some or all other groups.
 
 ggracef_title=Grace Times
 ggracef_return=group list
@@ -210,6 +214,8 @@ ufilesys_soft=Soft Limit
 ufilesys_hard=Hard Limit
 ufilesys_nouquota=User <tt>$1</tt> does not have quotas on any filesystem
 ufilesys_edit=Edit Quota On:
+ufilesys_editdesc=View and edit the quotas for this user on some other filesystem that he currently does not have quotas on.
+ufilesys_copydesc=Copy quota limits for this user on all filesystems to some or all other users.
 ufilesys_copy=Copy Quotas
 ufilesys_grace=Grace
 

diff --git a/quota/quota-lib.pl b/quota/quota-lib.pl
index b96af98..11cdb95 100755 (executable)
--- a/quota/quota-lib.pl
+++ b/quota/quota-lib.pl
@@ -200,10 +200,9 @@ $ENV{'QUOTA_FUNITS'} = $_[4];
 # Prints an input for selecting a quota or unlimited, in a table
 sub quota_input
 {
-print "<td nowrap>",&ui_radio($_[0]."_def", $_[1] == 0 ? 1 : 0,
-                             [ [ 1, $text{'quota_unlimited'} ], [ 0, " " ] ]);
-print &quota_inputbox(@_);
-print "</td> </tr>\n";
+return &ui_radio($_[0]."_def", $_[1] == 0 ? 1 : 0,
+                [ [ 1, $text{'quota_unlimited'} ], [ 0, " " ] ])." ".
+       &quota_inputbox(@_);
 }
 
 # quota_inputbox(name, value, [blocksize])

diff --git a/quota/user_filesys.cgi b/quota/user_filesys.cgi
index 55932a7..5d1fd08 100755 (executable)
--- a/quota/user_filesys.cgi
+++ b/quota/user_filesys.cgi
@@ -31,7 +31,9 @@ if ($n) {
        # Generate top header (showing blocks/files)
        @hcols = ( undef, $variable_bsize ? $text{'ufilesys_blocks'}
                                          : $text{'ufilesys_space'},
-                  $text{'ufilesys_files'});
+                  $config{'show_grace'} ? ( undef ) : ( ),
+                  $text{'ufilesys_files'},
+                  $config{'show_grace'} ? ( undef ) : ( ) );
        print &ui_columns_start(\@hcols, 100, 0,
                [ undef, "colspan=3 align=center", "colspan=3 align=center" ]);
 
@@ -78,22 +80,26 @@ else {
        }
 
 if (!$access{'ro'}) {
-       print "<table width=100%><tr>\n";
-       print "<form action=edit_user_quota.cgi>\n";
-       print "<input type=hidden name=user value=\"$u\">\n";
-       print "<input type=hidden name=source value=1>\n";
-       print "<td align=left><input type=submit value=\"$text{'ufilesys_edit'}\">\n";
-       print "<select name=filesys>\n";
-       foreach $f (@fslist) { print "<option>$f\n"; }
-       print "</select></td></form>\n";
+       print &ui_hr();
+       print &ui_buttons_start();
+
+       # Form to edit quota on other filesystems
+       print &ui_buttons_row("edit_user_quota.cgi",
+               $text{'ufilesys_edit'},
+               $text{'ufilesys_editdesc'},
+               &ui_hidden("user", $u).&ui_hidden("source", 1),
+               &ui_select("filesys", undef, \@fslist)
+               );
 
        if ($access{'filesys'} eq "*") {
-               print "<form action=copy_user_form.cgi>\n";
-               print "<input type=hidden name=user value=\"$u\">\n";
-               print "<td align=right><input type=submit value=\"$text{'ufilesys_copy'}\">\n";
-               print "</td></form>\n";
+               # Button to copy quotas
+               print &ui_buttons_row("copy_user_form.cgi",
+                       $text{'ufilesys_copy'},
+                       $text{'ufilesys_copydesc'},
+                       &ui_hidden("user", $u));
                }
-       print "</tr></table>\n";
+
+       print &ui_buttons_end();
        }
 
 &ui_print_footer("", $text{'ufilesys_return'});