From 01663e4e0dfd8aa7c36520745029fc687d5b4478 Mon Sep 17 00:00:00 2001
From: Nick Malcolm <nick@malcolm.net.nz>
Date: Mon, 14 Jun 2021 20:57:28 +1200
Subject: [PATCH] Page width improvements. Use the 'link' icon for the link to
 docs, to cut down on page width. Remove the status column to save width, and
 also remove redundancy (colour coding and Result column serve the same
 purpose). Remove the column widths that added to over 100%.

---
 include/html_report | 13 ++++++-------
 include/outputs     |  7 +------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/include/html_report b/include/html_report
index 8db263d5..d9b08f36 100644
--- a/include/html_report
+++ b/include/html_report
@@ -124,7 +124,6 @@ addHtmlHeader() {
         <table class="table compact stripe row-border ordering" id="findingsTable" data-order='[[ 5, "asc" ]]' data-page-length='100'>
           <thead class="thead-light">
             <tr>
-              <th style="align-content:center" scope="col">Status</th>
               <th scope="col">Result</th>
               <th scope="col">Severity</th>
               <th scope="col">AccountID</th>
@@ -132,12 +131,12 @@ addHtmlHeader() {
               <th scope="col">Compliance</th>
               <th scope="col">Service</th>
               <th scope="col">CheckID</th>
-              <th style="width:40%" scope="col">Check Title</th>
-              <th style="width:40%" scope="col">Check Output</th>
+              <th style="width:20%" scope="col">Check Title</th>
+              <th style="width:20%" scope="col">Check Output</th>
               <th scope="col">CAF Epic</th>
-              <th style="width:40%" scope="col">Risk</th>
-              <th style="width:40%" scope="col">Remediation</th>
-              <th style="width:40%" scope="col">Link to doc</th>
+              <th scope="col">Risk</th>
+              <th scope="col">Remediation</th>
+              <th scope="col">Docs</th>
             </tr>
           </thead>
           <tbody>
@@ -181,7 +180,7 @@ addHtmlFooter() {
                   show: false
               },
               // Hide Compliance, Check ID (in favour of Check Title), CAF Epic, Risk, Remediation, Link
-              targets: [0,5, 7, 10, 11, 12, 13]
+              targets: [4, 6, 9, 10, 11, 12]
           }
         ]
       });
diff --git a/include/outputs b/include/outputs
index b8434ff1..34503944 100644
--- a/include/outputs
+++ b/include/outputs
@@ -350,23 +350,18 @@ generateHtmlOutput(){
 
   if [[ $status == "INFO" ]];then
     local ROW_CLASS='table-info'
-    local STATUS_ICON="fa-info-circle"
   fi
   if [[ $status == "PASS" ]];then
     local ROW_CLASS='p-3 mb-2 bg-success'
-    local STATUS_ICON="fa-thumbs-up"
   fi
   if [[ $status == "FAIL" ]];then
     local ROW_CLASS='table-danger'
-    local STATUS_ICON="fa-thumbs-down"
   fi
   if [[ $status == "WARN" ]];then
     local ROW_CLASS='table-warning'
-    local STATUS_ICON="fa-exclamation-triangle"
   fi
 
   echo '<tr class="'$ROW_CLASS'">' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
-  echo '  <td><i class="fas '$STATUS_ICON'"></i></td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
   echo '  <td>'$status'</td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
   echo '  <td>'$CHECK_SEVERITY'</td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
   echo '  <td>'$ACCOUNT_NUM'</td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
@@ -379,7 +374,7 @@ generateHtmlOutput(){
   echo '  <td>'$CHECK_CAF_EPIC'</td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
   echo '  <td><p class="show-read-more">'$CHECK_RISK'</p></td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
   echo '  <td><p class="show-read-more">'$CHECK_REMEDIATION'</p></td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
-  echo '  <td><a href="'$CHECK_DOC'">'$CHECK_DOC'</a></td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
+  echo '  <td><a href="'$CHECK_DOC'"><i class="fas fa-external-link-alt"></i></a></td>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
   echo '</tr>' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML
   echo '' >> ${OUTPUT_FILE_NAME}.$EXTENSION_HTML