Move PGP key visualizations to master keys page

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 21 insertions, 7 deletions

diff --git a/templates/public/keys.html b/templates/public/keys.html
index f23d1c40..81713efb 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
+{% load url from future %}
 {% load pgp %}
 
 {% block title %}Arch Linux - Master Signing Keys{% endblock %}
@@ -47,10 +48,16 @@
             {% endfor %}
         </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>Master Key Signatures</h2>
+    <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
@@ -95,7 +102,13 @@
 </div>
 
 <div class="box">
-    <h2>Developer Cross-Signatures</h2>
+    <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>
 
@@ -120,8 +133,11 @@
         </tbody>
     </table>
 </div>
+
 {% load cdn %}{% jquery %}{% jquery_tablesorter %}
+<script type="text/javascript" src="{% static "d3.v2.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({
@@ -132,5 +148,8 @@ $(document).ready(function() {
         sortLocaleCompare: true
     });
 });
+$(document).ready(function() {
+    developer_keys("#visualize-keys", "{% url 'visualize-pgp_keys' %}");
+});
 </script>
 {% endblock %}
diff --git a/templates/visualize/index.html b/templates/visualize/index.html
index 95cf6c1c..242a7f0b 100644
--- a/templates/visualize/index.html
+++ b/templates/visualize/index.html
@@ -24,11 +24,7 @@
     </div>
     <div id="visualize-archrepo" class="visualize-chart"></div>
 </div>
-<div class="box">
-    <h2>Visualization of PGP Master and Signing Keys</h2>
 
-    <div id="visualize-keys" class="visualize-chart"></div>
-</div>
 {% load cdn %}{% jquery %}
 <script type="text/javascript" src="{% static "d3.v2.min.js" %}"></script>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
@@ -40,7 +36,6 @@ $(document).ready(function() {
         "arch": { url: "{% url 'visualize-byarch' %}", color_attr: "arch" },
     };
     packages_treemap("#visualize-archrepo", orderings, "repo");
-    developer_keys("#visualize-keys", "{% url 'visualize-pgp_keys' %}");
 });
 </script>
 {% endblock %}