static/frontend/vuln: display (withdrawn) instead of vuln details
For withdrawn vulns, display the phrase "(withdrawn)" instead of
the vuln details on the vuln list pages. The user can still view
the full details by clicking on the vulnerability entry page.
Change-Id: I4b9dd9907b4727342907c5791c6af4f3981f5d23
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/580995
Run-TryBot: Tatiana Bradley <tatianabradley@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
kokoro-CI: kokoro <noreply+kokoro@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/static/frontend/vuln/entry/entry.tmpl b/static/frontend/vuln/entry/entry.tmpl
index ecab2e7..901f060 100644
--- a/static/frontend/vuln/entry/entry.tmpl
+++ b/static/frontend/vuln/entry/entry.tmpl
@@ -46,6 +46,13 @@
</div>
{{end}}
+{{define "vuln-details"}}
+ <div class="Vuln-details">
+ {{template "vuln-details-metadata" .}}
+ <p>{{.Details}}</p>
+ </div>
+{{end}}
+
{{define "affected"}}
<h2>Affected Packages</h2>
<ul class="VulnEntryPackages VulnEntryPackages-container">
diff --git a/static/frontend/vuln/list/list.tmpl b/static/frontend/vuln/list/list.tmpl
index c560606..1f885b3 100644
--- a/static/frontend/vuln/list/list.tmpl
+++ b/static/frontend/vuln/list/list.tmpl
@@ -47,7 +47,7 @@
{{template "vuln-chips" .}}
</div>
<div class="VulnList-details">
- {{template "vuln-details" .}}
+ {{template "vuln-details-short" .}}
</div>
{{end}}
{{end}}
diff --git a/static/frontend/vuln/main/main.tmpl b/static/frontend/vuln/main/main.tmpl
index ab8eb11..2d7ed87 100644
--- a/static/frontend/vuln/main/main.tmpl
+++ b/static/frontend/vuln/main/main.tmpl
@@ -39,7 +39,7 @@
{{template "vuln-chips" .}}
</div>
<div class="VulnMain-details">
- {{template "vuln-details" .}}
+ {{template "vuln-details-short" .}}
</div>
{{end}}
<a href="/vuln/list">View all reports</a>
diff --git a/static/frontend/vuln/vuln.tmpl b/static/frontend/vuln/vuln.tmpl
index 9e9ef44..b252c0b 100644
--- a/static/frontend/vuln/vuln.tmpl
+++ b/static/frontend/vuln/vuln.tmpl
@@ -17,9 +17,19 @@
</main>
{{end}}
-{{define "vuln-details"}}
+{{define "vuln-details-short"}}
{{/* . is Entry */}}
<div class="Vuln-details">
+ {{template "vuln-details-metadata" .}}
+ {{if .Withdrawn}}
+ <p>(withdrawn)</p>
+ {{else}}
+ <p>{{.Details}}</p>
+ {{end}}
+ </div>
+{{end}}
+
+{{define "vuln-details-metadata"}}
<ul class="Vuln-detailsMetadata">
{{with $aliases := .Aliases}}
<li class="go-textSubtle Vuln-alias">
@@ -45,8 +55,6 @@
<li class="go-textSubtle">Withdrawn: {{.Format "Jan 02, 2006"}}</li>
{{end}}
</ul>
- <p>{{.Details}}</p>
- </div>
{{end}}
{{define "vuln-search"}}
diff --git a/tests/screentest/testdata/ci/vuln-540x1080.a.png b/tests/screentest/testdata/ci/vuln-540x1080.a.png
index 5ed7bab..26de513 100644
--- a/tests/screentest/testdata/ci/vuln-540x1080.a.png
+++ b/tests/screentest/testdata/ci/vuln-540x1080.a.png
Binary files differ
diff --git a/tests/screentest/testdata/ci/vuln-list-540x1080.a.png b/tests/screentest/testdata/ci/vuln-list-540x1080.a.png
index 3ff8ebb..ffd470d 100644
--- a/tests/screentest/testdata/ci/vuln-list-540x1080.a.png
+++ b/tests/screentest/testdata/ci/vuln-list-540x1080.a.png
Binary files differ
diff --git a/tests/screentest/testdata/ci/vuln-list.a.png b/tests/screentest/testdata/ci/vuln-list.a.png
index 6776a0c..b76f75c 100644
--- a/tests/screentest/testdata/ci/vuln-list.a.png
+++ b/tests/screentest/testdata/ci/vuln-list.a.png
Binary files differ
diff --git a/tests/screentest/testdata/ci/vuln.a.png b/tests/screentest/testdata/ci/vuln.a.png
index 1c4d74a..729846b 100644
--- a/tests/screentest/testdata/ci/vuln.a.png
+++ b/tests/screentest/testdata/ci/vuln.a.png
Binary files differ
