Merge branch 'bugfix-ui-0305'

Kristan Kenney · Kristan Kenney · commit 197e238f5faa · 2020-03-06T10:50:41.000-04:00
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html
@@ -96,14 +96,17 @@
                                     <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
                                         <tr>
                                             <td class="input-label vst-text">
+                                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.MAIL.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
                                                 <span class="alert alert-info alert-with-icon">
                                                     <i class="fas fa-exclamation"></i>
-                                                    <?=__("Let's Encrypt for mail needs a dns record for mail.$v_domain and $v_webmail_alias!")?><br/>
+                                                    <?=__("To enable Let's Encrypt SSL, ensure that DNS records exist for mail.$v_domain and $v_webmail_alias!")?><br/>
                                                 </span>
-                                                <label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.MAIL.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
                                             </td>
                                         </tr>
-                                      
                                         <tr>
                                             <td class="vst-text input-label">
                                                 <?php print __('SSL Certificate');?>
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
@@ -125,13 +125,13 @@
             <div class="clearfix l-unit__stat-col--left text-center"><b>
                       <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
                           <? if($data[$key]['ALIAS'] == ''){ ?>
-                            0
+                            <i class="fas fa-minus-circle"></i>
                           <? } else {?>
                             <i class="fas fa-check-circle status-icon green"></i>
                           <? } ?>
                       <? } else {?>
                         <? if($data[$key]['ALIAS'] == ''){ ?>
-                          0
+                          <i class="fas fa-minus-circle"></i>
                         <? } else {?>
                           <i class="fas fa-check-circle"></i>
                         <? } ?>
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
@@ -125,13 +125,13 @@
             <div class="clearfix l-unit__stat-col--left text-center"><b>
                       <? if($data[$key]['SUSPENDED'] == 'no'){ ?>
                           <? if($data[$key]['ALIAS'] == ''){ ?>
-                            0
+                            <i class="fas fa-minus-circle"></i>
                           <? } else {?>
                             <i class="fas fa-check-circle status-icon green"></i>
                           <? } ?>
                       <? } else {?>
                         <? if($data[$key]['ALIAS'] == ''){ ?>
-                          0
+                          <i class="fas fa-minus-circle"></i>
                         <? } else {?>
                           <i class="fas fa-check-circle"></i>
                         <? } ?>
