diff --git a/help/index.cgi b/help/index.cgi index 768446fd4..b3a8f9062 100755 --- a/help/index.cgi +++ b/help/index.cgi @@ -11,13 +11,13 @@ foreach $m (&list_modules()) { print &ui_form_start("search.cgi", "post"); print &ui_table_start($text{'index_header'}, undef, 2); -print &ui_table_row($text{'index_terms'}, &ui_textbox("terms", undef, 50)); +print &ui_table_row($text{'index_terms'}, &ui_textbox("terms", undef, 50), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'index_mods'}, &ui_radio("all", 1, [ [ 1, $text{'index_all'} ], - [ 0, $text{'index_sel'} ] ])); + [ 0, $text{'index_sel'} ] ]), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row(" ", - &ui_select("mods", undef, \@list_modules, 5, 1) ); + &ui_select("mods", undef, \@list_modules, 5, 1), undef, [ "valign=top" ]); print &ui_table_row(" ", &ui_submit($text{'index_search'})." ".&ui_reset($text{'index_reset'})); print ui_table_end(); diff --git a/servers/edit_serv.cgi b/servers/edit_serv.cgi index b992bc9ac..27f0957cc 100755 --- a/servers/edit_serv.cgi +++ b/servers/edit_serv.cgi @@ -30,21 +30,21 @@ print &ui_hidden("id", $in{'id'}); print &ui_table_start($text{'edit_details'}, undef, 2); print &ui_table_row($text{'edit_host'}, - &ui_textbox("host", $s->{'host'}, 60)); + &ui_textbox("host", $s->{'host'}, 60), undef, [ "valign=middle","valign=middle" ]); if ($in{'new'} || $s->{'port'}) { print &ui_table_row($text{'edit_port'}, - &ui_textbox("port", $s->{'port'}, 5)); + &ui_textbox("port", $s->{'port'}, 5), undef, [ "valign=middle","valign=middle" ]); } else { print &ui_table_row($text{'edit_port'}, &ui_opt_textbox("port", $s->{'port'}, 5, - $text{'edit_portnone'})); + $text{'edit_portnone'}), undef, [ "valign=middle","valign=middle" ]); } if ($s->{'realhost'}) { print &ui_table_row($text{'edit_realhost'}, - "$s->{'realhost'}"); + "$s->{'realhost'}", undef, [ "valign=middle","valign=middle" ]); } if ($access{'forcetype'}) { @@ -54,16 +54,16 @@ else { print &ui_table_row($text{'edit_type'}, &ui_select("type", $s->{'type'}, [ map { [ $_->[0], $_->[1] ] } - sort { $a->[1] cmp $b->[1] } &get_server_types() ])); + sort { $a->[1] cmp $b->[1] } &get_server_types() ]), undef, [ "valign=middle","valign=middle" ]); } print &ui_table_row($text{'edit_ssl'}, - &ui_yesno_radio("ssl", int($s->{'ssl'}))); + &ui_yesno_radio("ssl", int($s->{'ssl'})), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'edit_desc'}, $config{'show_ip'} ? &ui_textbox("desc", $s->{'desc'}, 40, 0, 40) : - &ui_opt_textbox("desc", $s->{'desc'}, 40, $text{'edit_desc_def'})); + &ui_opt_textbox("desc", $s->{'desc'}, 40, $text{'edit_desc_def'}), undef, [ "valign=middle","valign=middle" ]); if ($access{'forcegroup'}) { # Cannot change group @@ -82,7 +82,7 @@ else { } my $gtable = &ui_grid_table(\@grid, 4); $gtable .= $text{'edit_new'}." ".&ui_textbox("newgroup", undef, 10); - print &ui_table_row($text{'edit_group'}, $gtable, 3); + print &ui_table_row($text{'edit_group'}, $gtable, 3, [ "valign=middle","valign=middle","valign=middle" ]); } my $mode = $in{'new'} ? $config{'deflink'} : @@ -92,9 +92,9 @@ if ($access{'forcelink'}) { print &ui_hidden("mode", $mode),"\n"; if ($mode == 1) { print &ui_table_row($text{'edit_luser'}, - &ui_textbox("wuser", $s->{'user'}, 10)); + &ui_textbox("wuser", $s->{'user'}, 10), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'edit_lpass'}, - &ui_password("wpass", $s->{'pass'}, 10)); + &ui_password("wpass", $s->{'pass'}, 10), undef, [ "valign=middle","valign=middle" ]); } } else { @@ -111,7 +111,7 @@ else { (defined($main::remote_pass) ? "" : "($text{'edit_same'})
") ] ) : ( ) ) ]); - print &ui_table_row($text{'edit_link'}, $linksel); + print &ui_table_row($text{'edit_link'}, $linksel, undef, [ "valign=top","valign=top" ]); } if ($access{'forcefast'}) { @@ -125,13 +125,13 @@ else { &ui_radio("fast", $config{'deffast'}, [ [ 1, $text{'yes'} ], [ 2, $text{'edit_auto'} ], - [ 0, $text{'no'} ] ])); + [ 0, $text{'no'} ] ]), undef, [ "valign=middle","valign=middle" ]); } else { print &ui_table_row($text{'edit_fast'}, &ui_radio("fast", int($s->{'fast'}), [ [ 1, $text{'yes'} ], - [ 0, $text{'no'} ] ])); + [ 0, $text{'no'} ] ]), undef, [ "valign=middle","valign=middle" ]); } } diff --git a/servers/index.cgi b/servers/index.cgi index 95ca16098..7fa463b42 100755 --- a/servers/index.cgi +++ b/servers/index.cgi @@ -115,17 +115,19 @@ if ($access{'find'} || $access{'auto'}) { my $port = $config{'listen'} || $miniserv{'listen'} || 10000; print &ui_buttons_row("find.cgi", $text{'index_broad'}, $text{'index_findmsg'}); - print &ui_buttons_row("find.cgi", $text{'index_scan'}, + my $t = &ui_buttons_row("find.cgi", $text{'index_scan'}, &text('index_scanmsg', &ui_textbox("scan", $myscan, 15)). "
\n". - "\n". - "". + "\n". + "". "\n". - "". + "". "\n". - "". + "". "
$text{'index_defuser'}".&ui_textbox("defuser", undef, 20)."
$text{'index_defuser'}".&ui_textbox("defuser", undef, 20)."
$text{'index_defpass'}".&ui_password("defpass", undef, 20)."
".&ui_password("defpass", undef, 20)."
$text{'index_defport'}".&ui_textbox("port", $port, 20)."
".&ui_textbox("port", $port, 20)."
\n" ); + $t =~ s/valign=top class=ui_buttons_value/valign=middle class=ui_buttons_value/g; + print $t; } if ($access{'auto'}) { # Button for auto-discovery form diff --git a/ui-lib.pl b/ui-lib.pl index 711771a63..f19d6c58e 100755 --- a/ui-lib.pl +++ b/ui-lib.pl @@ -1430,7 +1430,7 @@ return "
\n". "". ($before ? $before." " : ""). &ui_submit($label).($after ? " ".$after : "")."\n". - "". + "". $desc."\n". "
\n"; } diff --git a/webmin/edit_advanced.cgi b/webmin/edit_advanced.cgi index 3f13a6cf3..5598ff9c3 100755 --- a/webmin/edit_advanced.cgi +++ b/webmin/edit_advanced.cgi @@ -13,13 +13,13 @@ print &ui_table_row($text{'advanced_temp'}, &ui_opt_textbox("tempdir", $gconfig{'tempdir'}, 30, $text{'advanced_tempdef'})."
". &ui_checkbox("tempdirdelete", 1, $text{'advanced_tdd'}, - $gconfig{'tempdirdelete'})); + $gconfig{'tempdirdelete'}), undef, [ "valign=top","valign=middle" ]); # Temp files clearing period print &ui_table_row($text{'advanced_tempdelete'}, &ui_opt_textbox("tempdelete", $gconfig{'tempdelete_days'}, 5, $text{'advanced_nodelete'})." ". - $text{'advanced_days'}); + $text{'advanced_days'}, undef, [ "valign=middle","valign=middle" ]); # Per-module temp directories @mods = sort { $a->{'desc'} cmp $b->{'desc'} } &get_all_module_infos(); @@ -36,7 +36,7 @@ foreach $d (&get_tempdirs(\%gconfig), [ ]) { $i++; } $ttable .= &ui_columns_end(); -print &ui_table_row($text{'advanced_tempmods'}, $ttable); +print &ui_table_row($text{'advanced_tempmods'}, $ttable, undef, [ "valign=top","valign=top" ]); @preloads = &get_preloads(\%miniserv); if (!@preloads && (!$miniserv{'premodules'} || @@ -44,12 +44,12 @@ if (!@preloads && (!$miniserv{'premodules'} || # New-style preload possible or enabled print &ui_table_row($text{'advanced_preload'}, &ui_yesno_radio("preload", - $miniserv{'premodules'} eq 'WebminCore')); + $miniserv{'premodules'} eq 'WebminCore'), undef, [ "valign=middle","valign=middle" ]); } elsif ($preloads[0]->[0] eq "main" && $preloads[0]->[1] eq "web-lib-funcs.pl") { # Old-style preloads enabled print &ui_table_row($text{'advanced_preload'}, - &ui_yesno_radio("preload", 1)); + &ui_yesno_radio("preload", 1), undef, [ "valign=middle","valign=middle" ]); } # Files to pre-cache @@ -61,16 +61,16 @@ print &ui_table_row($text{'advanced_precache'}, [ 1, $text{'advanced_precache1'}."
" ], [ 2, &text('advanced_precache2', &ui_textbox("precache", - $mode == 2 ? $miniserv{'precache'} : "", 40)) ] ])); + $mode == 2 ? $miniserv{'precache'} : "", 40)) ] ]), undef, [ "valign=top","valign=middle" ]); # Umask for created files print &ui_table_row($text{'advanced_umask'}, - &ui_opt_textbox("umask", $gconfig{'umask'}, 5, $text{'default'})); + &ui_opt_textbox("umask", $gconfig{'umask'}, 5, $text{'default'}), undef, [ "valign=middle","valign=middle" ]); # Overwrite immutable files if (&has_command("chattr")) { print &ui_table_row($text{'advanced_chattr'}, - &ui_yesno_radio("chattr", $gconfig{'chattr'})); + &ui_yesno_radio("chattr", $gconfig{'chattr'}), undef, [ "valign=middle","valign=middle" ]); } # Nice level for cron jobs @@ -80,7 +80,7 @@ if (&foreign_check("proc")) { &ui_radio("nice_def", $gconfig{'nice'} eq '' ? 1 : 0, [ [ 1, $text{'default'} ], [ 0, $text{'advanced_pri'}." ". - &proc::nice_selector("nice", $gconfig{'nice'} || 0) ] ])); + &proc::nice_selector("nice", $gconfig{'nice'} || 0) ] ]), undef, [ "valign=middle","valign=middle" ]); # IO scheduling class and priority if (defined(&proc::os_list_scheduling_classes) && @@ -88,13 +88,13 @@ if (&foreign_check("proc")) { print &ui_table_row($text{'advanced_sclass'}, &ui_select("sclass", $gconfig{'sclass'}, [ [ undef, $text{'default'} ], - @classes ])); + @classes ]), undef, [ "valign=middle","valign=middle" ]); @prios = &proc::os_list_scheduling_priorities(); print &ui_table_row($text{'advanced_sprio'}, &ui_select("sprio", $gconfig{'sprio'}, [ [ undef, $text{'default'} ], - @prios ])); + @prios ]), undef, [ "valign=middle","valign=middle" ]); } } diff --git a/webmin/edit_blocked.cgi b/webmin/edit_blocked.cgi index 6bb0a800d..fa4bd898f 100755 --- a/webmin/edit_blocked.cgi +++ b/webmin/edit_blocked.cgi @@ -18,7 +18,7 @@ if (@blocked) { $b->{'user'} || $b->{'host'}, $b->{'fails'}, &make_date($b->{'when'}), - ]); + ], [ "valign=middle","valign=middle","valign=middle","valign=middle" ]); } print &ui_columns_end(); print &ui_hr(); diff --git a/webmin/edit_ca.cgi b/webmin/edit_ca.cgi index c798549b8..461028a66 100755 --- a/webmin/edit_ca.cgi +++ b/webmin/edit_ca.cgi @@ -38,27 +38,27 @@ print ui_form_start("setup_ca.cgi", "post"); print ui_table_start($text{'ca_header1'}, undef, 2); print &ui_table_row($text{'ca_cn'}, - &ui_textbox("commonName", undef, 30)); + &ui_textbox("commonName", undef, 30), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ca_email'}, - &ui_textbox("emailAddress", undef, 30)); + &ui_textbox("emailAddress", undef, 30), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ca_ou'}, - &ui_textbox("organizationalUnitName", undef, 30)); + &ui_textbox("organizationalUnitName", undef, 30), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ca_o'}, - &ui_textbox("organizationName", undef, 30)); + &ui_textbox("organizationName", undef, 30), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ca_sp'}, - &ui_textbox("stateOrProvinceName", undef, 15)); + &ui_textbox("stateOrProvinceName", undef, 15), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ca_c'}, - &ui_textbox("countryName", undef, 2)); + &ui_textbox("countryName", undef, 2), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ssl_size'}, &ui_opt_textbox("size", undef, 6, "$text{'default'} ($default_key_size)"). - " ".$text{'ssl_bits'}); + " ".$text{'ssl_bits'}, undef, [ "valign=middle","valign=middle" ]); print ui_table_end(); print ui_form_end([ [ "create", $text{'ca_create'} ] ]); diff --git a/webmin/edit_debug.cgi b/webmin/edit_debug.cgi index 0f7274e91..9889975ad 100755 --- a/webmin/edit_debug.cgi +++ b/webmin/edit_debug.cgi @@ -9,20 +9,20 @@ print &ui_table_start($text{'debug_header'}, undef, 2); # Debugging mode enabled print &ui_table_row($text{'debug_enabled'}, - &ui_yesno_radio("debug_enabled", $gconfig{'debug_enabled'})); + &ui_yesno_radio("debug_enabled", $gconfig{'debug_enabled'}), undef, [ "valign=middle","valign=middle" ]); # What to log print &ui_table_row($text{'debug_what'}, join("
\n", map { &ui_checkbox('debug_what_'.$_, 1, $text{'debug_what_'.$_}, $gconfig{'debug_what_'.$_}) } - @debug_what_events)); + @debug_what_events), undef, [ "valign=top","valign=top" ]); # Log to where print &ui_table_row($text{'debug_file'}, &ui_opt_textbox("debug_file", $gconfig{'debug_file'}, 50, $text{'default'}. - " ($main::default_debug_log_file)")); + " ($main::default_debug_log_file)"), undef, [ "valign=middle","valign=middle" ]); # Maximum size print &ui_table_row($text{'debug_size'}, @@ -30,7 +30,7 @@ print &ui_table_row($text{'debug_size'}, [ [ 1, $text{'default'}. " (".&nice_size($main::default_debug_log_size).")" ], [ 0, &ui_bytesbox("debug_size", $gconfig{'debug_size'}) ] ] - )); + ), undef, [ "valign=middle","valign=middle" ]); # Debug background processes? print &ui_table_row($text{'debug_procs'}, @@ -39,7 +39,7 @@ print &ui_table_row($text{'debug_procs'}, &ui_checkbox("debug_cmd", 1, $text{'debug_cmd'}, !$gconfig{'debug_nocmd'})."\n". &ui_checkbox("debug_cron", 1, $text{'debug_cron'}, - !$gconfig{'debug_nocron'})); + !$gconfig{'debug_nocron'}), undef, [ "valign=middle","valign=middle" ]); # Modules to debug # Modules to log in @@ -50,7 +50,7 @@ print &ui_table_row($text{'debug_inmods'}, &ui_select("modules", [ split(/\s+/, $gconfig{'debug_modules'}) ], [ map { [ $_->{'dir'}, $_->{'desc'} ] } sort { $a->{'desc'} cmp $b->{'desc'} } - &get_all_module_infos() ], 5, 1)); + &get_all_module_infos() ], 5, 1), undef, [ "valign=top","valign=middle" ]); print &ui_table_end(); print &ui_form_end([ [ "save", $text{'save'} ] ]); diff --git a/webmin/edit_ipkey.cgi b/webmin/edit_ipkey.cgi index d5e76c167..98efa8059 100755 --- a/webmin/edit_ipkey.cgi +++ b/webmin/edit_ipkey.cgi @@ -20,16 +20,16 @@ print &ui_table_start($text{'ipkey_header'}, undef, 2); print &ui_table_row($text{'ipkey_ips'}, &ui_textarea("ips", join("\n", @{$ipkey->{'ips'}}), - 3, 20)); + 3, 60), undef, [ "valign=top","valign=top" ]); print &ui_table_row($text{'ssl_key'}, &ui_textbox("key", $ipkey->{'key'}, 40)."\n". - &file_chooser_button("key")); + &file_chooser_button("key"), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ssl_cert'}, &ui_opt_textbox("cert", $ipkey->{'cert'}, 40, - $text{'ssl_cert_def'})."\n". - &file_chooser_button("cert")); + $text{'ssl_cert_def'})." ". + &file_chooser_button("cert"), undef, [ "valign=middle","valign=middle" ]); $mode = $ipkey->{'extracas'} eq "none" ? 2 : $ipkey->{'extracas'} ? 1 : 0; @@ -42,7 +42,7 @@ print &ui_table_row($text{'ssl_extracas'}, $mode == 1 ? join("\n",split(/\s+/, $ipkey->{'extracas'})) : "", 3, 60)." ". - &file_chooser_button("extracas", 0, undef, undef, 1)); + "
".&file_chooser_button("extracas", 0, undef, undef, 1), undef, [ "valign=top","valign=middle" ]); print &ui_table_end(); if ($in{'new'}) { diff --git a/webmin/edit_lock.cgi b/webmin/edit_lock.cgi index 16e6a2cad..628a56f56 100755 --- a/webmin/edit_lock.cgi +++ b/webmin/edit_lock.cgi @@ -17,7 +17,7 @@ push(@grid, &ui_radio("lockmode", int($gconfig{'lockmode'}), [ 3, $text{'lock_except'} ] ])); push(@grid, &ui_textarea("lockdirs", join("\n", split(/\t+/, $gconfig{'lockdirs'})), 10, 60)); -print &ui_table_row(undef, &ui_grid_table(\@grid, 2), 2); +print &ui_table_row(undef, &ui_grid_table(\@grid, 2), 2, [ "valign=top","valign=top" ]); print &ui_table_end(); print &ui_form_end([ [ "save", $text{'save'} ] ]); diff --git a/webmin/edit_mobile.cgi b/webmin/edit_mobile.cgi index d73d0d42c..4cfcaee10 100755 --- a/webmin/edit_mobile.cgi +++ b/webmin/edit_mobile.cgi @@ -16,20 +16,20 @@ print &ui_table_row($text{'mobile_theme'}, &ui_select("theme", defined($m) ? $m : "*", [ [ "*", $text{'mobile_themeglob'} ], [ "", $text{'themes_default'} ], - map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ])); + map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]), undef, [ "valign=middle","valign=middle" ]); # Skip session login for mobile devices print &ui_table_row($text{'mobile_nosession'}, - &ui_yesno_radio("nosession", int($miniserv{'mobile_nosession'}))); + &ui_yesno_radio("nosession", int($miniserv{'mobile_nosession'})), undef, [ "valign=middle","valign=middle" ]); # Extra user agents print &ui_table_row($text{'mobile_agents'}, &ui_textarea("agents", - join("\n", split(/\t+/, $miniserv{'mobile_agents'})), 5, 50)); + join("\n", split(/\t+/, $miniserv{'mobile_agents'})), 5, 50), undef, [ "valign=top","valign=top" ]); # Hostname prefixes for mobile print &ui_table_row($text{'mobile_prefixes'}, - &ui_textbox("prefixes", $miniserv{'mobile_prefixes'}, 50)); + &ui_textbox("prefixes", $miniserv{'mobile_prefixes'}, 50), undef, [ "valign=middle","valign=middle" ]); print &ui_table_end(); print &ui_form_end([ [ "save", $text{'save'} ] ]); diff --git a/webmin/edit_referers.cgi b/webmin/edit_referers.cgi index a380e5499..0848bd917 100755 --- a/webmin/edit_referers.cgi +++ b/webmin/edit_referers.cgi @@ -11,14 +11,14 @@ print &ui_table_start(undef, undef, 2); print &ui_table_row($text{'referers_referer'}, &ui_radio("referer", $gconfig{'referer'}, - [ [ 0, $text{'yes'} ], [ 1, $text{'no'} ] ])); + [ [ 0, $text{'yes'} ], [ 1, $text{'no'} ] ]), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'referers_list'}, &ui_textarea("referers", join("\n", split(/\s+/, $gconfig{'referers'})), 5, 60)."
\n". &ui_checkbox("referers_none", 1, $text{'referers_none'}, - !$gconfig{'referers_none'})); + !$gconfig{'referers_none'}), undef, [ "valign=top","valign=middle" ]); print &ui_table_end(); print &ui_form_end([ [ undef, $text{'save'} ] ]); diff --git a/webmin/edit_sendmail.cgi b/webmin/edit_sendmail.cgi index 881826641..00ef676b8 100755 --- a/webmin/edit_sendmail.cgi +++ b/webmin/edit_sendmail.cgi @@ -14,7 +14,7 @@ print &ui_table_start($text{'sendmail_header'}, undef, 2); # Mail server type $ms = $mconfig{'mail_system'}; print &ui_table_row($text{'sendmail_system'}, - $mailboxes::text{'index_system'.$ms}); + $mailboxes::text{'index_system'.$ms}, undef, [ "valign=middle","valign=middle" ]); # SMTP server $smtp = $mconfig{'send_mode'}; @@ -27,7 +27,7 @@ print &ui_table_row($text{'sendmail_smtp'}, [ 2, $text{'sendmail_smtp2'} ] ]). " ".&ui_textbox("smtp", $mode == 2 ? $smtp : "", 40). " ".$text{'sendmail_port'}. - " ".&ui_textbox("port", $port, 6)); + " ".&ui_textbox("port", $port, 6), undef, [ "valign=top","valign=middle" ]); # SMTP login and password $user = $mconfig{'smtp_user'}; @@ -38,14 +38,14 @@ print &ui_table_row($text{'sendmail_login'}, [ 0, $text{'sendmail_login0'} ] ])." ". &ui_textbox("login_user", $user, 20)." ". $text{'sendmail_pass'}." ". - &ui_textbox("login_pass", $pass, 20)); + &ui_textbox("login_pass", $pass, 20), undef, [ "valign=top","valign=middle" ]); # Authentication method $auth = $mconfig{'smtp_auth'}; print &ui_table_row($text{'sendmail_auth'}, &ui_select("auth", $auth, [ [ undef, $text{'default'} ], - "Cram-MD5", "Digest-MD5", "Plain", "Login" ])); + "Cram-MD5", "Digest-MD5", "Plain", "Login" ]), undef, [ "valign=middle","valign=middle" ]); # From address $from = $mconfig{'webmin_from'}; @@ -53,7 +53,7 @@ $fromdef = "webmin\@".&mailboxes::get_from_domain(); print &ui_table_row($text{'sendmail_from'}, &ui_opt_textbox("from", $from, 40, &text('sendmail_fromdef', $fromdef)."
", - $text{'sendmail_fromaddr'})); + $text{'sendmail_fromaddr'}), undef, [ "valign=top","valign=middle" ]); print &ui_table_end(); print &ui_form_end([ [ "", $text{'save'} ] ]); @@ -66,10 +66,10 @@ print &ui_form_start("test_sendmail.cgi", "post"); print &ui_table_start($text{'sendmail_header2'}, undef, 2); print &ui_table_row($text{'sendmail_to'}, - &ui_textbox("to", undef, 40)); + &ui_textbox("to", undef, 40), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'sendmail_subject'}, - &ui_textbox("subject", "Test email from Webmin", 40)); + &ui_textbox("subject", "Test email from Webmin", 40), undef, [ "valign=middle","valign=middle" ]); $msg = "This is a test message from Webmin, sent with the settings :\n". "\n". @@ -78,7 +78,7 @@ $msg = "This is a test message from Webmin, sent with the settings :\n". "SMTP login: ".($user || "None")."\n". "SMTP authentication: ".($auth || "Default")."\n"; print &ui_table_row($text{'sendmail_body'}, - &ui_textarea("body", $msg, 8, 80)); + &ui_textarea("body", $msg, 8, 80), undef, [ "valign=top","valign=top" ]); print &ui_table_end(); print &ui_form_end([ [ "", $text{'sendmail_send'} ] ]); diff --git a/webmin/edit_ssl.cgi b/webmin/edit_ssl.cgi index e9617bb61..7e14fa02c 100755 --- a/webmin/edit_ssl.cgi +++ b/webmin/edit_ssl.cgi @@ -36,32 +36,32 @@ print &ui_form_start("change_ssl.cgi", "post"); print &ui_table_start($text{'ssl_header'}, undef, 2); print &ui_table_row($text{'ssl_on'}, - &ui_yesno_radio("ssl", $miniserv{'ssl'})); + &ui_yesno_radio("ssl", $miniserv{'ssl'}), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ssl_key'}, &ui_textbox("key", $miniserv{'keyfile'}, 40)." ". - &file_chooser_button("key")); + &file_chooser_button("key"), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ssl_cert'}, &ui_opt_textbox("cert", $miniserv{'certfile'}, 40, $text{'ssl_cert_def'}."
",$text{'ssl_cert_oth'})." ". - &file_chooser_button("cert")); + &file_chooser_button("cert"), undef, [ "valign=top","valign=middle" ]); print &ui_table_row($text{'ssl_redirect'}, - &ui_yesno_radio("ssl_redirect", $miniserv{'ssl_redirect'})); + &ui_yesno_radio("ssl_redirect", $miniserv{'ssl_redirect'}), undef, [ "valign=middle","valign=middle" ]); if ($miniserv{'ssl_version'}) { print &ui_table_row($text{'ssl_version'}, &ui_opt_textbox("version", $miniserv{'ssl_version'}, 4, - $text{'ssl_auto'})); + $text{'ssl_auto'}), undef, [ "valign=middle","valign=middle" ]); } print &ui_table_row($text{'ssl_compression'}, - &ui_yesno_radio("ssl_compression", !$miniserv{'no_sslcompression'})); + &ui_yesno_radio("ssl_compression", !$miniserv{'no_sslcompression'}), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ssl_honorcipherorder'}, &ui_yesno_radio("ssl_honorcipherorder", - $miniserv{'ssl_honorcipherorder'})); + $miniserv{'ssl_honorcipherorder'}), undef, [ "valign=middle","valign=middle" ]); $clist = $miniserv{'ssl_cipher_list'}; $cmode = !$clist ? 1 : @@ -75,12 +75,12 @@ print &ui_table_row($text{'ssl_cipher_list'}, [ 3, $text{'ssl_pfs'}."
" ], [ 0, $text{'ssl_clist'}." ". &ui_textbox("cipher_list", - $cmode == 0 ? $clist : "", 30) ] ])); + $cmode == 0 ? $clist : "", 30) ] ]), undef, [ "valign=top","valign=middle" ]); print &ui_table_row($text{'ssl_extracas'}, &ui_textarea("extracas", join("\n",split(/\s+/, $miniserv{'extracas'})), 3, 60)." ". - &file_chooser_button("extracas", 0, undef, undef, 1)); + "
".&file_chooser_button("extracas", 0, undef, undef, 1), undef, [ "valign=top","valign=top" ]); print &ui_table_end(); print &ui_form_end([ [ "", $text{'save'} ] ]); @@ -94,7 +94,7 @@ $info = &cert_info($miniserv{'certfile'} || $miniserv{'keyfile'}); foreach $i ('cn', 'o', 'email', 'issuer_cn', 'issuer_o', 'issuer_email', 'notafter', 'type') { if ($info->{$i}) { - print &ui_table_row($text{'ca_'.$i}, $info->{$i}); + print &ui_table_row($text{'ca_'.$i}, $info->{$i}, undef, [ "valign=middle","valign=middle" ]); } } @clinks = ( @@ -103,7 +103,7 @@ foreach $i ('cn', 'o', 'email', 'issuer_cn', 'issuer_o', 'issuer_email', "". "$text{'ssl_pkcs12'}" ); -print &ui_table_row($text{'ssl_download'}, &ui_links_row(\@clinks)); +print &ui_table_row($text{'ssl_download'}, &ui_links_row(\@clinks), undef, [ "valign=middle","valign=middle" ]); print &ui_table_end(); print &ui_tabs_end_tab(); @@ -121,7 +121,7 @@ if (@ipkeys) { "$k->{'key'}", $k->{'cert'} ? "$k->{'cert'}" : $text{'ssl_cert_def'}, - ]); + ], [ "valign=middle","valign=middle", "valign=middle" ]); } print &ui_columns_end(); } @@ -150,10 +150,10 @@ print &show_ssl_key_form($host, undef, "Webmin Webserver on ".&get_system_hostname()); print &ui_table_row($text{'ssl_newfile'}, - &ui_textbox("newfile", "$config_directory/miniserv.pem", 40)); + &ui_textbox("newfile", "$config_directory/miniserv.pem", 40), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ssl_usenew'}, - &ui_yesno_radio("usenew", 1)); + &ui_yesno_radio("usenew", 1), undef, [ "valign=middle","valign=middle" ]); print &ui_table_end(); print &ui_form_end([ [ "", $text{'ssl_create'} ] ]); @@ -174,10 +174,10 @@ print &show_ssl_key_form($host, undef, "Webmin Webserver on ".&get_system_hostname()); print &ui_table_row($text{'ssl_newfile'}, - &ui_textbox("newfile", "$config_directory/miniserv.newkey", 40)); + &ui_textbox("newfile", "$config_directory/miniserv.newkey", 40), undef, [ "valign=middle","valign=middle" ]); print &ui_table_row($text{'ssl_csrfile'}, - &ui_textbox("csrfile", "$config_directory/miniserv.csr", 40)); + &ui_textbox("csrfile", "$config_directory/miniserv.csr", 40), undef, [ "valign=middle","valign=middle" ]); print &ui_table_end(); print &ui_form_end([ [ "", $text{'ssl_create'} ] ]); @@ -205,7 +205,7 @@ print &ui_table_row($text{'ssl_privkey'}, &ui_textarea("key", $keydata, 7, 70)."
\n". "$text{'ssl_upload'}\n". &ui_upload("keyfile"). - ($keydata ? "
".$text{'ssl_fromcsr'} : "")); + ($keydata ? "
".$text{'ssl_fromcsr'} : ""), undef, [ "valign=top","valign=top" ]); print &ui_table_row($text{'ssl_privcert'}, &ui_radio("cert_def", 1, @@ -213,7 +213,7 @@ print &ui_table_row($text{'ssl_privcert'}, [ 0, $text{'ssl_below'} ] ])."
\n". &ui_textarea("cert", undef, 7, 70)."
\n". "$text{'ssl_upload'}\n". - &ui_upload("certfile")); + &ui_upload("certfile"), undef, [ "valign=top","valign=top" ]); print &ui_table_row($text{'ssl_privchain'}, &ui_radio("chain_def", 1, @@ -222,7 +222,7 @@ print &ui_table_row($text{'ssl_privchain'}, [ 0, $text{'ssl_below'} ] ])."
\n". &ui_textarea("chain", undef, 7, 70)."
\n". "$text{'ssl_upload'}\n". - &ui_upload("chainfile")); + &ui_upload("chainfile"), undef, [ "valign=top","valign=top" ]); print &ui_table_end(); print &ui_form_end([ [ "save", $text{'save'} ] ]); diff --git a/webmin/edit_status.cgi b/webmin/edit_status.cgi index fc65dc6e1..21762ff5d 100755 --- a/webmin/edit_status.cgi +++ b/webmin/edit_status.cgi @@ -13,15 +13,15 @@ $i = $system_status::config{'collect_interval'}; print &ui_table_row($text{'status_interval'}, &ui_opt_textbox("interval", $i eq 'none' ? undef : $i, 5, $text{'status_interval1'}, $text{'status_interval0'}). - " ".$text{'status_mins'}); + " ".$text{'status_mins'}, undef, [ "valign=middle","valign=middle" ]); # Collect packages? print &ui_table_row($text{'status_pkgs'}, - &ui_yesno_radio("pkgs", $system_status::config{'collect_pkgs'})); + &ui_yesno_radio("pkgs", $system_status::config{'collect_pkgs'}), undef, [ "valign=middle","valign=middle" ]); # Collect drive temps? print &ui_table_row($text{'status_temp'}, - &ui_yesno_radio("temp", !$system_status::config{'collect_notemp'})); + &ui_yesno_radio("temp", !$system_status::config{'collect_notemp'}), undef, [ "valign=middle","valign=middle" ]); print &ui_table_end(); print &ui_form_end([ [ "save", $text{'save'} ] ]); diff --git a/webmin/edit_web.cgi b/webmin/edit_web.cgi index 69b94e3b4..ababfb3e5 100755 --- a/webmin/edit_web.cgi +++ b/webmin/edit_web.cgi @@ -11,7 +11,7 @@ print &ui_table_start($text{'web_header'}, undef, 2); # Default content expiry time print &ui_table_row($text{'web_expires'}, &ui_opt_textbox("expires", $miniserv{'expires'}, 10, - $text{'web_expiresdef'}, $text{'web_expiressecs'})); + $text{'web_expiresdef'}, $text{'web_expiressecs'}), undef, [ "valign=middle","valign=middle" ]); # Additonal expiry times based on path my @expires_paths; @@ -31,20 +31,20 @@ for(my $i=0; $i<@expires_paths; $i++) { ]); } $etable .= &ui_columns_end(); -print &ui_table_row($text{'web_expirespaths'}, $etable); +print &ui_table_row($text{'web_expirespaths'}, $etable, undef, [ "valign=top","valign=top" ]); # Show call stack on error print &ui_table_row($text{'advanced_stack'}, - &ui_yesno_radio("stack", int($gconfig{'error_stack'}))); + &ui_yesno_radio("stack", int($gconfig{'error_stack'})), undef, [ "valign=middle","valign=middle" ]); # Show CGI errors print &ui_table_row($text{'advanced_showstderr'}, - &ui_yesno_radio("showstderr", int(!$miniserv{'noshowstderr'}))); + &ui_yesno_radio("showstderr", int(!$miniserv{'noshowstderr'})), undef, [ "valign=middle","valign=middle" ]); if (!$miniserv{'session'}) { # Pass passwords to CGI programs print &ui_table_row($text{'advanced_pass'}, - &ui_yesno_radio("pass", int($miniserv{'pass_password'}))); + &ui_yesno_radio("pass", int($miniserv{'pass_password'})), undef, [ "valign=middle","valign=middle" ]); } # Gzip static files? @@ -52,13 +52,13 @@ print &ui_table_row($text{'advanced_gzip'}, &ui_radio("gzip", $miniserv{'gzip'}, [ [ '', $text{'advanced_gzipauto'} ], [ 0, $text{'advanced_gzip0'} ], - [ 1, $text{'advanced_gzip1'} ] ])); + [ 1, $text{'advanced_gzip1'} ] ]), undef, [ "valign=middle","valign=middle" ]); # Redirect type print &ui_table_row($text{'advanced_redir'}, &ui_radio("redir", $gconfig{'relative_redir'} ? 1 : 0, [ [ 1, $text{'advanced_redir1'} ], - [ 0, $text{'advanced_redir0'} ] ])); + [ 0, $text{'advanced_redir0'} ] ]), undef, [ "valign=middle","valign=middle" ]); print &ui_table_end(); print &ui_form_end([ [ "save", $text{'save'} ] ]); diff --git a/webmin/edit_webmincron.cgi b/webmin/edit_webmincron.cgi index 288eef4c9..ecbc43112 100755 --- a/webmin/edit_webmincron.cgi +++ b/webmin/edit_webmincron.cgi @@ -15,7 +15,7 @@ my @wcrons = &webmincron::list_webmin_crons(); join(" ", @{$a->{'args'}}) cmp join(" ", @{$b->{'args'}}) } @wcrons; if (@wcrons) { - my @tds = ( "width=5" ); + my @tds = ( "width=5 valign=top", "valign=top", "valign=top", "valign=top" ); print &ui_form_start("delete_webmincron.cgi"); print &ui_columns_start([ "", $text{'webmincron_module'}, diff --git a/webmin/view_webmincron.cgi b/webmin/view_webmincron.cgi index 1453ee769..838c0cee1 100755 --- a/webmin/view_webmincron.cgi +++ b/webmin/view_webmincron.cgi @@ -21,17 +21,17 @@ print &ui_table_start($text{'webmincron_header'}, undef, 2); # Run from module %minfo = &get_module_info($wcron->{'module'}); print &ui_table_row($text{'webmincron_module'}, - $minfo{'desc'} || $wcron->{'module'}); + $minfo{'desc'} || $wcron->{'module'}, undef, [ "valign=middle","valign=middle" ]); # Function to call print &ui_table_row($text{'webmincron_func'}, - "$wcron->{'func'}"); + "$wcron->{'func'}", undef, [ "valign=middle","valign=middle" ]); # Function params, if any if (@{$wcron->{'args'}}) { print &ui_table_row($text{'webmincron_args'}, join("
\n", map { "".&html_escape($_)."" } - @{$wcron->{'args'}})); + @{$wcron->{'args'}}), undef, [ "valign=middle","valign=middle" ]); } # Run-time (editable) diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl index 1a1b7d931..e0f1e4162 100755 --- a/webmin/webmin-lib.pl +++ b/webmin/webmin-lib.pl @@ -1840,33 +1840,33 @@ my $rv; $rv .= &ui_table_row($text{'ssl_cn'}, &ui_opt_textbox("commonName", $defhost, 30, - $text{'ssl_all'})); + $text{'ssl_all'}), undef, [ "valign=middle","valign=middle" ]); $rv .= &ui_table_row($text{'ca_email'}, - &ui_textbox("emailAddress", $defemail, 30)); + &ui_textbox("emailAddress", $defemail, 30), undef, [ "valign=middle","valign=middle" ]); $rv .= &ui_table_row($text{'ca_ou'}, - &ui_textbox("organizationalUnitName", undef, 30)); + &ui_textbox("organizationalUnitName", undef, 30), undef, [ "valign=middle","valign=middle" ]); $rv .= &ui_table_row($text{'ca_o'}, - &ui_textbox("organizationName", $deforg, 30)); + &ui_textbox("organizationName", $deforg, 30), undef, [ "valign=middle","valign=middle" ]); $rv .= &ui_table_row($text{'ca_city'}, - &ui_textbox("cityName", undef, 30)); + &ui_textbox("cityName", undef, 30), undef, [ "valign=middle","valign=middle" ]); $rv .= &ui_table_row($text{'ca_sp'}, - &ui_textbox("stateOrProvinceName", undef, 15)); + &ui_textbox("stateOrProvinceName", undef, 15), undef, [ "valign=middle","valign=middle" ]); $rv .= &ui_table_row($text{'ca_c'}, - &ui_textbox("countryName", undef, 2)); + &ui_textbox("countryName", undef, 2), undef, [ "valign=middle","valign=middle" ]); $rv .= &ui_table_row($text{'ssl_size'}, &ui_opt_textbox("size", undef, 6, "$text{'default'} ($default_key_size)"). - " ".$text{'ssl_bits'}); + " ".$text{'ssl_bits'}, undef, [ "valign=middle","valign=middle" ]); $rv .= &ui_table_row($text{'ssl_days'}, - &ui_textbox("days", 1825, 8)); + &ui_textbox("days", 1825, 8), undef, [ "valign=middle","valign=middle" ]); return $rv; }