1 files changed, 54 insertions, 2 deletions
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 4afc6d6b..c6da6c37 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -48,6 +48,16 @@
         </tbody>
     </table>
 
+    <ul>
+        <li><a href="#master-sigs">Master Key Signatures</a></li>
+        <li><a href="#visualization">Visualization of PGP Master and Developer Keys</a></li>
+        <li><a href="#cross-sigs">Developer Cross-Signatures</a></li>
+    </ul>
+</div>
+
+<div class="box">
+    <h2 id="master-sigs">Master Key Signatures</h2>
+
     <p>The following table shows all active developers and trusted users along
     with the status of their personal signing key. A 'Yes' indicates that the
     personal key of the developer is signed by the given master key. A 'No'
@@ -89,14 +99,56 @@
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+
+<div class="box">
+    <h2 id="visualization">Visualization of PGP Master and Developer Keys</h2>
+
+    <div id="visualize-keys" class="visualize-chart"></div>
+</div>
+
+<div class="box">
+    <h2 id="cross-sigs">Developer Cross-Signatures</h2>
+
+    <p>This table lists signatures directly between developer keys.</p>
+
+    <table class="pretty2" id="cross-signatures">
+        <thead>
+            <tr>
+                <th>Signer</th>
+                <th>Signee</th>
+                <th>Created</th>
+                <th>Expires</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for sig in cross_signatures %}
+            <tr>
+                <td>{% user_pgp_key_link sig.signer %}</td>
+                <td>{% user_pgp_key_link sig.signee %}</td>
+                <td>{{ sig.created }}</td>
+                <td>{{ sig.expires|default:"" }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
+<script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript" src="{% static "visualize.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#key-status").tablesorter({
+        sortLocaleCompare: true,
         headers: { 1: { sorter: false } }
     });
+    $("#cross-signatures").tablesorter({
+        sortLocaleCompare: true
+    });
+});
+$(document).ready(function() {
+    developer_keys("#visualize-keys", "{% url 'pgp-keys-json' %}");
 });
 </script>
 {% endblock %}