ui_link conversion -> webmin

This commit is contained in:
Nawawi Jamili
2013-12-19 15:43:46 +08:00
parent 8899315d59
commit ada20e8e2d
4 changed files with 10 additions and 11 deletions

View File

@@ -98,10 +98,8 @@ foreach $i ('cn', 'o', 'email', 'issuer_cn', 'issuer_o', 'issuer_email',
}
}
@clinks = (
"<a href='download_cert.cgi/cert.pem'>".
"$text{'ssl_pem'}</a>",
"<a href='download_cert.cgi/cert.p12'>".
"$text{'ssl_pkcs12'}</a>"
&ui_link("download_cert.cgi/cert.pem", $text{'ssl_pem'}),
&ui_link("download_cert.cgi/cert.p12", $text{'ssl_pkcs12'})
);
print &ui_table_row($text{'ssl_download'}, &ui_links_row(\@clinks), undef, [ "valign=middle","valign=middle" ]);
print &ui_table_end();
@@ -116,8 +114,8 @@ if (@ipkeys) {
$text{'ssl_cert'} ]);
foreach $k (@ipkeys) {
print &ui_columns_row([
"<a href='edit_ipkey.cgi?idx=$k->{'index'}'>".
join(", ", @{$k->{'ips'}})."</a>",
&ui_link("edit_ipkey.cgi?idx=".$k->{'index'},
join(", ", @{$k->{'ips'}}) ),
"<tt>$k->{'key'}</tt>",
$k->{'cert'} ? "<tt>$k->{'cert'}</tt>"
: $text{'ssl_cert_def'},
@@ -128,7 +126,8 @@ if (@ipkeys) {
else {
print "<b>$text{'ssl_ipkeynone'}</b><p>\n";
}
print "<a href='edit_ipkey.cgi?new=1'>$text{'ssl_addipkey'}</a><p>\n";
print &ui_link("edit_ipkey.cgi?new=1", $text{'ssl_addipkey'});
print "<p>\n";
print &ui_tabs_end_tab();
# SSL key generation form

View File

@@ -27,8 +27,8 @@ if (@wcrons) {
foreach my $w (@wcrons) {
my %minfo = &get_module_info($w->{'module'});
print &ui_checked_columns_row([
"<a href='view_webmincron.cgi?id=$w->{'id'}'>".
($minfo{'desc'} || $w->{'module'})."</a>",
&ui_link("view_webmincron.cgi?id=".$w->{'id'},
($minfo{'desc'} || $w->{'module'}) ),
$w->{'func'},
join(" ", @{$w->{'args'}}),
&cron::when_text($w, 1),

View File

@@ -30,7 +30,7 @@ else {
my $minfo = { 'os_support' => $m->[3] };
next if (!&check_os_support($minfo));
push(@table, [
"<a href='' onClick='return select(\"$m->[0]\")'>$m->[0]</a>",
&ui_link("#", $m->[0], undef, "onClick='return select(\"$m->[0]\");'"),
&html_escape($m->[4]),
]);
$cnt++;

View File

@@ -26,7 +26,7 @@ else {
$cnt = 0;
foreach $m (@$mods) {
push(@table, [
"<a href='' onClick='return select(\"$m->[2]\")'>$m->[0]</a>",
&ui_link("#", $m->[0], undef, "onClick='return select(\"$m->[2]\");'"),
$m->[1] eq "NONE" ? "" : &html_escape($m->[1]),
$m->[3],
]);