Correct position of page titles on CSR generation pages

Add status icons to message text on CSR page


Adjust page title label for CSR page

Author: Kristan Kenney

web/inc/i18n/en.php

@@ -132,7 +132,7 @@
     'Adding IP address'  => 'Add IP Address',
     'Editing IP Address'  => 'Edit IP Address',
     'Editing Backup Exclusions' => 'Edit Backup Exclusions',
-    'Generating CSR' => 'Generate New Self-Signed SSL Certificate',
+    'Generating CSR' => 'New Self-Signed SSL Certificate',
     'Listing'  => 'Listing',
     'Search Results'  => 'Search Results',
     'Adding Firewall Rule' => 'Add Firewall Rule',

web/templates/admin/generate_ssl.html

@@ -39,12 +39,12 @@
                         </table>
                     </td>
                     <td class="data-dotted">
-                        <table>
+                        <table class="data-col2">
                             <tr>
-                                <td><span class="step-top page-title"><?=__('Generating CSR')?></span></td>
+                                <td class="step-top">
+                                    <span class="page-title"><?=__('Generating CSR')?></span>
+                                </td>
                             </tr>
-                        </table>
-                        <table class="data-col2">
                             <tr>
                                 <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>

web/templates/admin/list_ssl.html

@@ -1,16 +1,7 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <div class="l-sort-toolbar clearfix float-left">
-                <span class="title"><b><?=__('Generating CSR')?></b></span>
-                  <?php
-                    if (!empty($_SESSION['error_msg'])) {
-                      echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
-                    } else {
-                      if (!empty($_SESSION['ok_msg'])) {
-                        echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
-                      }
-                    }
-                  ?>
+
         </div>
       </div>
     </div>
@@ -41,6 +32,25 @@
                     </td>
                     <td class="data-dotted">
                         <table class="data-col2">
+                            <tr>
+                                <td class="step-top">
+                                    <span class="page-title"><?=__('Generating CSR')?></span>
+                                </td>
+                            <tr>
+                                <td>
+                                    <?php
+                                        if (!empty($_SESSION['error_msg'])) {
+                                          echo "<span class=\"vst-error\"><i class=\"fas fa-exclamation-circle status-icon red\"></i> ".$_SESSION['error_msg']."</span>";
+                                        } else {
+                                          if (!empty($_SESSION['ok_msg'])) {
+                                            echo "<span class=\"vst-ok\"><i class=\"fas fa-check-circle status-icon green\"></i> ".$_SESSION['ok_msg']."</span>";
+                                          }
+                                        }
+                                    ?>
+                                </td>
+
+                            </tr>
+                            </tr>
                             <tr>
                                 <td class="vst-text" style="padding: 12px 0 0 0;"><?php print __('SSL Certificate');?>
                                 </td>