Skip to content

Commit f2404e4

Browse files
author
Kristan Kenney
committed
Update string and visibility of LE warning in Add Web Domain
1 parent 6ea3d05 commit f2404e4

File tree

1 file changed

+39
-31
lines changed

1 file changed

+39
-31
lines changed

web/templates/admin/edit_web.html

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,16 @@
8282
<textarea size="20" class="vst-textinput short" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
8383
</td>
8484
</tr>
85+
<? if ($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') {?>
8586
<tr>
8687
<td>
8788
<span class="alert alert-info alert-with-icon">
88-
<i class="fas fa-exclamation"></i>
89-
<?php print _('Changes to Aliases will cause Lets Encrypt to obtain a new SSL certificate if enabled.');?>
90-
</span>
89+
<i class="fas fa-exclamation"></i>
90+
<?php print _('Lets Encrypt will obtain a new SSL certificate if web domain aliases are changed.');?>
91+
</span>
9192
</td>
9293
</tr>
94+
<? } ?>
9395
<tr>
9496
<td class="vst-text input-label">
9597
<?php print _('IP Address');?>
@@ -221,7 +223,7 @@
221223
<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
222224
<tr>
223225
<td class="input-label vst-text">
224-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" id="letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"><?php print _('Lets Encrypt Support');?></label>
226+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" id="letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="elementHideShow('ssl-details');App.Actions.WEB.toggle_letsencrypt(this)"><?php print _('Lets Encrypt Support');?></label>
225227
</td>
226228
</tr>
227229
<tr>
@@ -248,35 +250,41 @@
248250
</select>
249251
</td>
250252
</tr>
251-
<tr>
252-
<td class="vst-text input-label step-top">
253-
<?php print _('SSL Certificate');?>
254-
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=$v_domain?>"><?=_('Generate CSR')?></a></span>
255-
</td>
256-
</tr>
257-
<tr>
258-
<td>
259-
<textarea size="20" class="vst-textinput short console" name="v_ssl_crt" id="ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
260-
</td>
261-
</tr>
262-
<tr>
263-
<td class="vst-text input-label">
264-
<?php print _('SSL Key');?>
265-
</td>
266-
</tr>
267253
<tr>
268254
<td>
269-
<textarea size="20" class="vst-textinput short console" name="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
270-
</td>
271-
</tr>
272-
<tr>
273-
<td class="vst-text input-label">
274-
<?php print _('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?php print _('optional');?>)</span>
275-
</td>
276-
</tr>
277-
<tr>
278-
<td>
279-
<textarea size="20" class="vst-textinput short console" name="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
255+
<table id="ssl-details" style="<? if ($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') { echo 'display: none;'; } ?>">
256+
<tr>
257+
<td class="vst-text input-label step-top">
258+
<?php print _('SSL Certificate');?>
259+
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?=$v_domain?>"><?=_('Generate CSR')?></a></span>
260+
</td>
261+
</tr>
262+
<tr>
263+
<td>
264+
<textarea size="20" class="vst-textinput short console" name="v_ssl_crt" id="ssl_crt"><?=htmlentities(trim($v_ssl_crt, "'"))?></textarea>
265+
</td>
266+
</tr>
267+
<tr>
268+
<td class="vst-text input-label">
269+
<?php print _('SSL Key');?>
270+
</td>
271+
</tr>
272+
<tr>
273+
<td>
274+
<textarea size="20" class="vst-textinput short console" name="v_ssl_key"><?=htmlentities(trim($v_ssl_key, "'"))?></textarea>
275+
</td>
276+
</tr>
277+
<tr>
278+
<td class="vst-text input-label">
279+
<?php print _('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?php print _('optional');?>)</span>
280+
</td>
281+
</tr>
282+
<tr>
283+
<td>
284+
<textarea size="20" class="vst-textinput short console" name="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
285+
</td>
286+
</tr>
287+
</table>
280288
</td>
281289
</tr>
282290
<?

0 commit comments

Comments
 (0)