Merge pull request #180 from gavsto/dev

ENHANCEMENT: Changed colours around on BPA
KelvinTegelaar · Nov 3, 2021 · d54ee51 · d54ee51
2 parents 9f3a8b7 + 1a83e67
commit d54ee51
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/js/datatables/datatablesDomainAnalyser.js b/js/datatables/datatablesDomainAnalyser.js
@@ -168,7 +168,7 @@ $(document).ready(function () {
  } else if (data === "None") {
  return '<h5><span class="badge bg-danger">Report Only</span></h5>'
  } else {
- return '<h5><span class="badge bg-secondary">No DMARC</span></h5>'
+ return '<h5><span class="badge bg-danger">No DMARC</span></h5>'
  }
  }
  },
@@ -190,7 +190,7 @@ $(document).ready(function () {
  if (data === false) {
  return '<h5><span class="badge bg-danger">Partial or None Analysed</span></h5>';
  } else {
- return '<h5><span class="badge bg-secondary">No DMARC</span></h5>'
+ return '<h5><span class="badge bg-danger">No DMARC</span></h5>'
  }
  }
  },
@@ -234,7 +234,7 @@ $(document).ready(function () {
  if (data === false) {
  return '<h5><span class="badge bg-danger">DKIM Disabled</span></h5>';
  } else {
- return '<h5><span class="badge bg-secondary">No Data</span></h5>'
+ return '<h5><span class="badge bg-warning">No Data</span></h5>'
  }
  }
  },
@@ -244,7 +244,7 @@ $(document).ready(function () {
  if (type === "export" || type === "sort" || type === "filter") {
  return 'No Data'
  }
- return '<button type="button" class="btn btn-warning btn-sm" data-bs-toggle="modal" data-bs-target="#' + row.GUID + 'MoreInfo">More</button><!-- Modal --><div class="modal fade" id="' + row.GUID + 'MoreInfo" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="exampleModalLabel">More Information</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><h3>Tenant: ' + row.Tenant + '</h3><br /><br /><strong>Score Explanation: </strong>' + row.ScoreExplanation + '<br /><br /><strong>Expected SPF Record: </strong> ' + row.ExpectedSPFRecord + '<br /><strong>Actual SPF Record: </strong>' + row.ActualSPFRecord + '<br /><br /><strong>DMARC Full Policy: </strong>' + row.DMARCFullPolicy + '<br /><br /><strong>Expected MX Record: </strong>' + row.ExpectedMXRecord + '<br /><strong>Actual MX Record: </strong>' + row.ActualMXRecord + '<br /><br /><strong>Supported Services: </strong>' + row.SupportedServices + '<br /><strong>Is Default Domain: </strong>' + row.IsDefault + '<br /><strong>Data Last Refreshed:</strong>' + row.LastRefresh + '</div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button></div></div></div></div>'
+ return '<button type="button" class="btn btn-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#' + row.GUID + 'MoreInfo">More</button><!-- Modal --><div class="modal fade" id="' + row.GUID + 'MoreInfo" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="exampleModalLabel">More Information</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><h3>Tenant: ' + row.Tenant + '</h3><br /><br /><strong>Score Explanation: </strong>' + row.ScoreExplanation + '<br /><br /><strong>Expected SPF Record: </strong> ' + row.ExpectedSPFRecord + '<br /><strong>Actual SPF Record: </strong>' + row.ActualSPFRecord + '<br /><br /><strong>DMARC Full Policy: </strong>' + row.DMARCFullPolicy + '<br /><br /><strong>Expected MX Record: </strong>' + row.ExpectedMXRecord + '<br /><strong>Actual MX Record: </strong>' + row.ActualMXRecord + '<br /><br /><strong>Supported Services: </strong>' + row.SupportedServices + '<br /><strong>Is Default Domain: </strong>' + row.IsDefault + '<br /><strong>Data Last Refreshed:</strong>' + row.LastRefresh + '</div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button></div></div></div></div>'
  }
  }
  ],