From 474b616ee2c237edc4c139d2abfc8b4647d445fd Mon Sep 17 00:00:00 2001
From: Frank Sauerburger <frank@sauerburger.com>
Date: Thu, 4 Mar 2021 21:20:37 +0100
Subject: [PATCH] Tidy up PGP (sub)key summary
---
app/pgp/templates/pgp/publickey_item.html | 28 ++++++++++++++++++-----
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/app/pgp/templates/pgp/publickey_item.html b/app/pgp/templates/pgp/publickey_item.html
index e1af0ea..5b60687 100644
--- a/app/pgp/templates/pgp/publickey_item.html
+++ b/app/pgp/templates/pgp/publickey_item.html
@@ -40,11 +40,11 @@
<div class="pgpkey-fingerprint">
<div class="pgpkey-fingerprint-title">
- <i class="fas fa-fingerprint"></i> Fingerprint
+ <i class="fas fa-fingerprint"></i> Primary key
</div>
<div class="pgpkey-fingerprint-primary">
- <div class="pgpkey-fingerprint-label"><span>Primary key</span></div>
+ <div class="pgpkey-fingerprint-label"><span>Fingerprint</span></div>
<div class="pgpkey-fingerprint-hash">
<span>
{% for token in publickey.details.fingerprint %}<span>{{ token }}</span>{% endfor %}
@@ -70,13 +70,14 @@
</div>
{% if publickey.details.subkeys %}
+ {% if not fingerprint_only %}
{% for subkey in publickey.details.subkeys %}
<div class="pgpkey-fingerprint">
<div class="pgpkey-fingerprint-title">
- <i class="fas fa-fingerprint"></i> Fingerprint
+ <i class="fas fa-fingerprint"></i> Subkey
</div>
<div class="pgpkey-fingerprint-sub">
- <div class="pgpkey-fingerprint-label"><span>Subkey</span></div>
+ <div class="pgpkey-fingerprint-label"><span>Fingerprint</span></div>
<div class="pgpkey-fingerprint-hash">
<span>
{% for token in subkey.fingerprint %}<span>{{ token }}</span>{% endfor %}
@@ -85,7 +86,6 @@
</div>
</div>
- {% if not fingerprint_only %}
<div class="pgpkey-signatures">
<ul class="list-unstyled">
{% for sig in subkey.signatures %}
@@ -100,8 +100,24 @@
{% endfor %}
</ul>
</div>
- {% endif %}
{% endfor %}
+ {% else %}
+ <div class="pgpkey-fingerprint">
+ <div class="pgpkey-fingerprint-title">
+ <i class="fas fa-fingerprint"></i> Subkey{{ publickey.details.subkeys|pluralize }}
+ </div>
+ {% for subkey in publickey.details.subkeys %}
+ <div class="pgpkey-fingerprint-sub">
+ <div class="pgpkey-fingerprint-label"><span>Fingerprint</span></div>
+ <div class="pgpkey-fingerprint-hash">
+ <span>
+ {% for token in subkey.fingerprint %}<span>{{ token }}</span>{% endfor %}
+ </span>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ {% endif %}
{% endif %}
{% if not fingerprint_only %}
--
GitLab