From bb39d752a9c56b765694eea12f8c92a84daedba7 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Sat, 18 Apr 2026 19:50:26 +0200 Subject: [PATCH] Update description text and UX --- webmin/edit_ssl.cgi | 20 ++++++++++++++++---- webmin/lang/en | 4 ++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/webmin/edit_ssl.cgi b/webmin/edit_ssl.cgi index b83e398c3..7240b2a8d 100755 --- a/webmin/edit_ssl.cgi +++ b/webmin/edit_ssl.cgi @@ -261,9 +261,22 @@ print ui_tabs_end_tab(); # Let's Encrypt form print ui_tabs_start_tab("mode", "lets"); -print "$text{'ssl_letsdesc'}

\n"; - my $err = &check_letsencrypt(); +print $text{'ssl_letsdesc'}; +if (!$err) { + print &ui_tag('span', + &ui_details({ + 'class' => 'inline inlined', + 'title' => '', + 'content' => $text{'ssl_letsdesc2'}, + }))."\n". + &ui_tag('style', + ".ui--span>details.inline>summary+span {\n". + "margin-top: 0;\n". + "}\n"); + } +print "

\n"; + if ($err) { print "",&text('ssl_letserr', $err),"

\n"; print &get_letsencrypt_install_message( @@ -273,7 +286,6 @@ if ($err) { } else { # Show form to create a cert - print "$text{'ssl_letsdesc2'}

\n"; print &ui_form_start("letsencrypt.cgi"); print &ui_table_start($text{'ssl_letsheader'}, undef, 2); @@ -367,7 +379,7 @@ else { 'content' => $acme_extra, })."\n". &ui_tag('style', - "details.inline>summary+span {\n". + "tr>td>details.inline>summary+span {\n". "margin-left: 0;\n". "}\n")); diff --git a/webmin/lang/en b/webmin/lang/en index 71850c703..f5f10f9ef 100644 --- a/webmin/lang/en +++ b/webmin/lang/en @@ -422,10 +422,10 @@ ssl_edownload=Failed to extract PEM data from certificate ssl_csralready=View most recent key and CSR .. ssl_already1=Previously generated private key : ssl_already2=Previously generated certificate signing request : -ssl_letsdesc=Use an ACME-compatible SSL provider such as Let's Encrypt to generate a trusted SSL certificate for Webmin. +ssl_letsdesc=This form lets you request a trusted SSL certificate for Webmin from an ACME-compatible provider such as Let's Encrypt. ssl_letserr=Unfortunately, this system cannot request certificates from an SSL provider : $1. ssl_letserr2=Alternately, check the module configuration page to ensure you are using the correct path to the configured ACME client command. -ssl_letsdesc2=This page can be used to request a new certificate, which will overwrite any certificate currently configured in Webmin. Before a certificate can be issued, the ACME provider must verify control of each hostname, either by fetching a temporary file from the website's document directory or, for DNS validation, by checking a temporary DNS TXT record. +ssl_letsdesc2=The new certificate will replace the one currently configured in Webmin. Before it can be issued, the ACME provider must verify control of each hostname using either a temporary file in the website's document directory or a temporary DNS TXT record. ssl_letsheader=Certificate request options ssl_letsdoms=Hostnames for certificate ssl_subset=Skip unverifiable hostnames?