3 files changed, 57 insertions, 31 deletions
diff --git a/portal-gui/rpkigui/templates/myrpki/asn_view.html b/portal-gui/rpkigui/templates/myrpki/asn_view.html
index 587b73db..c7720a47 100644
--- a/portal-gui/rpkigui/templates/myrpki/asn_view.html
+++ b/portal-gui/rpkigui/templates/myrpki/asn_view.html
@@ -1,5 +1,11 @@
 {% extends "base.html" %}
 
+{% block css %}
+table { border-collapse: collapse }
+th { border: solid 1px; padding: 1em }
+td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1em }
+{% endblock %}
+
 {% block content %}
 <p>Handle: <a href="/myrpki/">{{ request.session.handle }}</a>
 
@@ -39,6 +45,25 @@
 
 {% endif %}
 
+{% if roas %}
+<h2>ROAs</h2>
+<table>
+    <tr><th>Prefixes</th></tr>
+    {% for r in roas %}
+    <tr>
+        <td style='text-align: left'>
+            <ul>
+            {% for p in r.from_roa_request.all %}
+                <li><a href="{{ p.prefix.get_absolute_url }}">{{ p.prefix }}</a>
+            {% endfor %}
+            </ul>
+        </td>
+    </tr>
+    {% endfor %}
+    </ul>
+</table>
+{% endif %} <!-- roas -->
+
 {% if form %}
 <h2>Edit</h2>
 <form method="POST" action="{{ request.get_full_path }}">
diff --git a/portal-gui/rpkigui/templates/myrpki/dashboard.html b/portal-gui/rpkigui/templates/myrpki/dashboard.html
index 24ad515b..be3b70b1 100644
--- a/portal-gui/rpkigui/templates/myrpki/dashboard.html
+++ b/portal-gui/rpkigui/templates/myrpki/dashboard.html
@@ -23,17 +23,17 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 {% for cert in parent.resources.all %}
 
 {% for asn in cert.asn.all %}
-<tr><td><a href="{{ asn.get_absolute_url }}">{{ asn }}</a></td>
-<td style='text-align: center'>{{cert.not_before}}</td>
-<td style='text-align: center'>{{cert.not_after}}</td>
+<tr><td style='text-align:left'><a href="{{ asn.get_absolute_url }}">{{ asn }}</a></td>
+<td>{{cert.not_before}}</td>
+<td>{{cert.not_after}}</td>
 </tr>
 {% endfor %}
 
 {% for address in cert.address_range.all %}
-<tr><td>
-<a href="{{ address.get_absolute_url }}">{{ address }}</a>
-</td><td style='text-align: center'>{{cert.not_before}}</td>
-<td style='text-align: center'>{{cert.not_after}}</td>
+<tr>
+    <td style='text-align: left'><a href="{{ address.get_absolute_url }}">{{ address }}</a></td>
+    <td>{{cert.not_before}}</td>
+    <td>{{cert.not_after}}</td>
 </tr>
 {% endfor %}
 
@@ -77,22 +77,22 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 
 </div>
 
-<div style="border: outset">
+<div style="border: outset"> <!-- ROAs -->
 <h1 style="text-align: center">My ROA [request]s</h1>
 
 <table>
-<tr>
-<th>Prefix</th>
-<th>ASN</th>
-</tr>
+<tr> <th>Prefix</th> <th>ASN</th> </tr>
 
 {% for roa in request.session.handle.roas.all %}
-<tr><td>
+<tr>
+    <td style='text-align: left'>
+        <ul style='list-style-position: outside'>
 {% for req in roa.from_roa_request.all %}
-<li><a href="{{ req.prefix.get_absolute_url }}">{{ req.as_roa_prefix }}</a>
+            <li><a href="{{ req.prefix.get_absolute_url }}">{{ req.as_roa_prefix }}</a>
 {% endfor %}
-</td>
-<td>{{ roa.asn }}</td>
+        </ul>
+    </td>
+    <td>{{ roa.asn }}</td>
 </tr>
 {% endfor %}
 </table>
@@ -104,14 +104,14 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
 <table>
     {% for asn in asns %}
 <tr>
-<td><a href="{{ asn.get_absolute_url }}">{{ asn }}</a></td>
-<td style='padding-left: 2em'> <a href="{{ asn.get_absolute_url }}/allocate">give</a></td>
+<td style='text-align: left'><a href="{{ asn.get_absolute_url }}">{{ asn }}</a></td>
+<td><a href="{{ asn.get_absolute_url }}/allocate">give</a></td>
 </tr>
     {% endfor %}
     {% for addr in ars %}
 <tr>
-<td><a href="{{ addr.get_absolute_url }}">{{ addr }}</a></td>
-<td style='padding-left: 2em'><a href="{{ addr.get_absolute_url }}/allocate">give</a>
+<td style='text-align: left'><a href="{{ addr.get_absolute_url }}">{{ addr }}</a></td>
+<td><a href="{{ addr.get_absolute_url }}/allocate">give</a>
 | <a href="{{ addr.get_absolute_url }}/split">split</a>
 | <a href="{{ addr.get_absolute_url }}/roa">roa</a></td>
 </tr>
diff --git a/portal-gui/rpkigui/templates/myrpki/prefix_view.html b/portal-gui/rpkigui/templates/myrpki/prefix_view.html
index be273f05..ec4132e1 100644
--- a/portal-gui/rpkigui/templates/myrpki/prefix_view.html
+++ b/portal-gui/rpkigui/templates/myrpki/prefix_view.html
@@ -30,34 +30,35 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
     <tr><td>Validity:</td><td>{{ addr.from_cert.all.0.not_before }} - {{ addr.from_cert.all.0.not_after }} </td></tr>
 
     {% if addr.allocated %}
-    <tr><td>Allocated:</td><td><a href="{{addr.allocated.get_absolute_url}}">{{addr.allocated.handle}}</a></td></tr>
+    <tr>
+        <td>Allocated:</td>
+        <td><a href="{{addr.allocated.get_absolute_url}}">{{ addr.allocated.handle }}</a></td>
+    </tr>
     {% endif %}
 </table>
 
 {% if addr.children.count %}
 <h2>Suballocations</h2>
-
 <ul>
 {% for subaddr in addr.children.all %}
-<li><a href="{{ subaddr.get_absolute_url }}">{{ subaddr }}</a>
+    <li><a href="{{ subaddr.get_absolute_url }}">{{ subaddr }}</a>
 {% endfor %}
 </ul>
+{% endif %} <!-- suballocations -->
 
-{% endif %}
-
-{% if addr.roa_requests %}
+{% if addr.roa_requests.count %}
 <h2>ROA requests</h2>
 <table>
     <tr><th>ASN</th><th>Max Length</th></tr>
 
     {% for r in addr.roa_requests.all %}
-    <tr><td>{{ r.roa.asn }}</td>
+    <tr>
+        <td>{{ r.roa.asn }}</td>
         <td>{{ r.max_length }}</td>
-        <td><a href="{{ r.get_absolute_url }}/delete">delete</a></tr>
+        <td><a href="{{ r.get_absolute_url }}/delete">delete</a></td>
+    </tr>
     {% endfor %}
-
 </table>
-
 {% endif %} <!-- roa requests -->
 
 {% if form %}
@@ -66,7 +67,7 @@ td { border: solid 1px; text-align: center; padding-left: 1em; padding-right: 1e
     {{ form.as_p }}
     <input type="submit">
 </form>
-{% endif %}
+{% endif %} <!-- form -->
 
 <p>Action:
 <a href="{{addr.get_absolute_url}}/split">split</a> |