From e1dbbf991ac91b7a07816664c23369869caa7811 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 5 Dec 2021 00:20:51 +0100
Subject: [PATCH] chore(docs): cleanup helm security scan output a bit more

---
 charts/stable/jackett/Chart.yaml | 2 +-
 docs/_static/trivy.css           | 8 ++++++++
 templates/security.tpl           | 2 ++
 templates/trivy-config.tpl       | 6 +++---
 templates/trivy-container.tpl    | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml
index 3534770a3b5..db21d06c0ed 100644
--- a/charts/stable/jackett/Chart.yaml
+++ b/charts/stable/jackett/Chart.yaml
@@ -21,7 +21,7 @@ name: jackett
 sources:
 - https://github.com/Jackett/Jackett
 type: application
-version: 9.0.33
+version: 9.0.34
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/docs/_static/trivy.css b/docs/_static/trivy.css
index 5a0d3b129aa..3d4190a2de6 100644
--- a/docs/_static/trivy.css
+++ b/docs/_static/trivy.css
@@ -24,3 +24,11 @@ table tr td:first-of-type {
   display: none;
 }
 a.toggle-more-links { cursor: pointer; }
+
+.md-typeset__table {
+   min-width: 100%;
+}
+
+.md-typeset table:not([class]) {
+    display: table;
+}
diff --git a/templates/security.tpl b/templates/security.tpl
index 94df2fdba5f..ed9eddfc8cf 100644
--- a/templates/security.tpl
+++ b/templates/security.tpl
@@ -5,6 +5,8 @@ hide:
 
 # Security Scan
 
+<link href="https://truecharts.org/_static/trivy.css" type="text/css" rel="stylesheet" />
+
 ## Helm-Chart
 
 ##### Scan Results
diff --git a/templates/trivy-config.tpl b/templates/trivy-config.tpl
index 6f4e91d717d..e2a8ed34539 100644
--- a/templates/trivy-config.tpl
+++ b/templates/trivy-config.tpl
@@ -7,10 +7,10 @@
 |:---------------------------------|
 
       {{ else }}
-| Type         |    Misconfiguration ID   |   Check  |  Severity | Explaination |                   Solution                   | Links  |
-|:----------------|:------------------:|:-----------:|:------------------:|:-------------:|-----------------------------------------|-----------------------------------------|
+| Type         |    Misconfiguration ID   |   Check  |  Severity |                   Explaination                   | Links  |
+|:----------------|:------------------:|:-----------:|:------------------:|-----------------------------------------|-----------------------------------------|
         {{- range .Misconfigurations }}
-| {{ escapeXML .Type }}         |    {{ escapeXML .ID }}   |   {{ escapeXML .Title }}  |  {{ escapeXML .Severity }} | {{ escapeXML .Description }} | {{ escapeXML .Message }} | <details><summary>Click to expand!</summary>{{ range .References }}<a href={{ escapeXML . | printf "%q" }}>{{ escapeXML . }}</a><br>{{ end }}</details>  |
+| {{ escapeXML .Type }}         |    {{ escapeXML .ID }}   |   {{ escapeXML .Title }}  |  {{ escapeXML .Severity }} | <details><summary>Expand...</summary> {{ escapeXML .Description }} <br> <hr> <br> {{ escapeXML .Message }} </details>| <details><summary>Expand...</summary>{{ range .References }}<a href={{ escapeXML . | printf "%q" }}>{{ escapeXML . }}</a><br>{{ end }}</details>  |
         {{- end }}
       {{- end }}
     {{- end }}
diff --git a/templates/trivy-container.tpl b/templates/trivy-container.tpl
index 3688cc884cb..4fac72aa707 100644
--- a/templates/trivy-container.tpl
+++ b/templates/trivy-container.tpl
@@ -12,7 +12,7 @@
 | Package         |    Vulnerability   |   Severity  |  Installed Version | Fixed Version |                   Links                   |
 |:----------------|:------------------:|:-----------:|:------------------:|:-------------:|-----------------------------------------|
         {{- range .Vulnerabilities }}
-| {{ escapeXML .PkgName }}         |    {{ escapeXML .VulnerabilityID }}   |   {{ escapeXML .Vulnerability.Severity }}  |  {{ escapeXML .InstalledVersion }} | {{ escapeXML .FixedVersion }} | <details><summary>Click to expand!</summary>{{ range .Vulnerability.References }}<a href={{ escapeXML . | printf "%q" }}>{{ escapeXML . }}</a><br>{{ end }}</details>  |
+| {{ escapeXML .PkgName }}         |    {{ escapeXML .VulnerabilityID }}   |   {{ escapeXML .Vulnerability.Severity }}  |  {{ escapeXML .InstalledVersion }} | {{ escapeXML .FixedVersion }} | <details><summary>Expand...</summary>{{ range .Vulnerability.References }}<a href={{ escapeXML . | printf "%q" }}>{{ escapeXML . }}</a><br>{{ end }}</details>  |
         {{- end }}
       {{- end }}
     {{- end }}