do not display part of the vcard that are disallowed by RFC

add new roa detail view, displaying covered routes

use {% url %} to get the url instead of hardcoding it in templates

add some missing title params to buttons

remove edit button from generic object detail

modify labels for validation statuses to use the label- suffix required by bootstrap 2.2.x

don't use object_detail for the repository_detail view

remove stub get_absolute_url() methods where they were previously used as placeholders

svn path=/branches/tk329/; revision=4900

9 files changed, 59 insertions, 30 deletions

diff --git a/rpkid/rpki/gui/app/templates/app/child_detail.html b/rpkid/rpki/gui/app/templates/app/child_detail.html
index 8d62a278..0c6a4922 100644
--- a/rpkid/rpki/gui/app/templates/app/child_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/child_detail.html
@@ -47,8 +47,9 @@
 {% endblock object_display %}
 
 {% block action %}
-{{ block.super }}
+<a class='btn' href="{% url rpki.gui.app.views.child_edit object.pk %}" title='Edit this child'><i class="icon-edit"></i> Edit</a>
 <a class='btn' href="{% url rpki.gui.app.views.child_add_asn object.pk %}" title='Delegate an ASN to this child'><i class="icon-plus-sign"></i> AS</a>
 <a class='btn' href="{% url rpki.gui.app.views.child_add_prefix object.pk %}" title='Delegate a prefix to this child'><i class="icon-plus-sign"></i> Prefix</a>
 <a class='btn' href="{% url rpki.gui.app.views.child_response object.pk %}" title='Download XML file to send to child'><i class="icon-download"></i> Export</a>
+{{ block.super }}
 {% endblock action %}
diff --git a/rpkid/rpki/gui/app/templates/app/client_detail.html b/rpkid/rpki/gui/app/templates/app/client_detail.html
index 0638e05b..bb9ea212 100644
--- a/rpkid/rpki/gui/app/templates/app/client_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/client_detail.html
@@ -2,19 +2,17 @@
 
 {% block object_display %}
 <div class='row'>
-  <div class='span2'>
-    <p><strong>Name</strong>
-  </div>
-  <div class='span6'>
-    <p>{{ object.handle }}
-  </div>
-</div>
-<div class='row'>
-  <div class='span2'>
-    <p><strong>SIA</strong>
-  </div>
-  <div class='span6'>
-    <p>{{ object.sia_base }}
+  <div class='span3'>
+    <table class="table">
+      <tr>
+	<td>Name</td>
+	<td>{{ object.handle }} </td>
+      </tr>
+      <tr>
+	<td>SIA</td>
+	<td>{{ object.sia_base }}</td>
+      </tr>
+    </table>
   </div>
 </div>
 {% endblock object_display %}
diff --git a/rpkid/rpki/gui/app/templates/app/dashboard.html b/rpkid/rpki/gui/app/templates/app/dashboard.html
index 71398115..d7a660c4 100644
--- a/rpkid/rpki/gui/app/templates/app/dashboard.html
+++ b/rpkid/rpki/gui/app/templates/app/dashboard.html
@@ -105,6 +105,7 @@
     <td>{{ roa.prefixes.all.0.max_prefixlen }}</td>
     <td>{{ roa.asn }}</td>
     <td>
+      <a class="btn btn-mini" href="{% url rpki.gui.app.views.roa_detail roa.pk %}" title="Detail"><i class="icon-info-sign"></i></a>
       <a class="btn btn-mini" href="{% url rpki.gui.app.views.roa_delete roa.pk %}" title="Delete"><i class="icon-trash"></i></a>
     </td>
   </tr>
@@ -126,6 +127,7 @@
     <td>{{ gbr.email_address }}</td>
     <td>{{ gbr.telephone }}</td>
     <td>
+      <a class="btn btn-mini" href="{% url gbr-detail gbr.pk %}" title="View"><i class="icon-info-sign"></i></a>
       <a class="btn btn-mini" href="{% url gbr-edit gbr.pk %}" title="Edit"><i class="icon-edit"></i></a>
       <a class="btn btn-mini" href="{% url gbr-delete gbr.pk %}" title="Delete"><i class="icon-trash"></i></a>
     </td>
@@ -142,11 +144,12 @@
       <h1>Children</h1>
     </div>
 <table class="table table-condensed table-striped">
+  <tr><th>Handle</th><th></th>
       {% for child in conf.children %}
       <tr>
       <td><a href="{{ child.get_absolute_url }}">{{ child.handle }}</a></td>
 	<td>
-	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.child_delete child.pk %}"><i class="icon-trash"></i></a>
+	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.child_delete child.pk %}" title="Delete"><i class="icon-trash"></i></a>
 	</td>
       </tr>
       {% endfor %}
@@ -163,7 +166,7 @@
       <tr>
 	<td><a href="{{ parent.get_absolute_url }}">{{ parent.handle }}</a></td>
 	<td>
-	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.parent_delete parent.pk %}"><i class="icon-trash"></i></a>
+	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.parent_delete parent.pk %}" title="Delete"><i class="icon-trash"></i></a>
 	</td>
       </tr>
       {% endfor %}
@@ -183,7 +186,7 @@
       <tr>
 	<td><a href="{{ repo.get_absolute_url }}">{{ repo.handle }}</a></td>
 	<td>
-	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.repository_delete repo.pk %}"><i class="icon-trash"></i></a>
+	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.repository_delete repo.pk %}" title="Delete"><i class="icon-trash"></i></a>
 	</td>
       </tr>
       {% endfor %}
@@ -201,7 +204,7 @@
       <tr>
 	<td><a href="{% url rpki.gui.app.views.client_detail client.pk %}">{{ client.handle }}</a></td>
 	<td>
-	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.client_delete client.pk %}"><i class="icon-trash"></i></a>
+	  <a class="btn btn-mini" href="{% url rpki.gui.app.views.client_delete client.pk %}" title="Delete"><i class="icon-trash"></i></a>
 	</td>
       </tr>
       {% endfor %}
diff --git a/rpkid/rpki/gui/app/templates/app/ghostbusterrequest_detail.html b/rpkid/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
index f4cb3c0f..abaa7560 100644
--- a/rpkid/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/ghostbusterrequest_detail.html
@@ -2,7 +2,7 @@
 
 {% block object_display %}
 <table class='table table-striped table-condensed'>
-  <tr><td >Full Name</td><td>{{ object.full_name }}</td></tr>
+  <tr><td>Full Name</td><td>{{ object.full_name }}</td></tr>
 
   {% if object.honorific_prefix %}
   <tr><td >Honorific Prefix</td><td>{{ object.honorific_prefix }}</td></tr>
@@ -50,3 +50,8 @@
 
 </table>
 {% endblock object_display %}
+
+{% block action %}
+{{ block.super }}
+<a class="btn" href="{% url gbr-edit object.pk %}"><i class="icon-edit"></i> Edit</a>
+{% endblock %}
diff --git a/rpkid/rpki/gui/app/templates/app/object_confirm_delete.html b/rpkid/rpki/gui/app/templates/app/object_confirm_delete.html
index da60409e..821b70b5 100644
--- a/rpkid/rpki/gui/app/templates/app/object_confirm_delete.html
+++ b/rpkid/rpki/gui/app/templates/app/object_confirm_delete.html
@@ -16,7 +16,7 @@ string specifying the concrete template to inherit from.
 
 <form action='' method='POST'>
   {% csrf_token %}
-  <input class='btn btn-danger' type='submit' value='Confirm'>
-  <a class='btn' href="{{ object.get_absolute_url }}">Cancel</a>
+  <input class='btn btn-danger' type='submit' value='Delete'>
+  <a class='btn' href="{% url rpki.gui.app.views.dashboard %}">Cancel</a>
 </form>
 {% endblock %}
diff --git a/rpkid/rpki/gui/app/templates/app/object_detail.html b/rpkid/rpki/gui/app/templates/app/object_detail.html
index 131e24cc..81fdbdf0 100644
--- a/rpkid/rpki/gui/app/templates/app/object_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/object_detail.html
@@ -12,8 +12,7 @@
 {% endblock object_display %}
 
 {% block action %}
-<a class="btn" href="{{ object.get_absolute_url }}edit"><i class="icon-edit"></i> Edit</a>
-<a class="btn btn-danger" href="{{ object.get_absolute_url }}delete"><i class="icon-trash icon-white"></i> Delete</a>
+<a class="btn" href="{{ object.get_absolute_url }}delete" title="Delete this object"><i class="icon-trash"></i> Delete</a>
 {% endblock action %}
 
 {% endblock content %}
diff --git a/rpkid/rpki/gui/app/templates/app/parent_detail.html b/rpkid/rpki/gui/app/templates/app/parent_detail.html
index 591de843..c50d37e5 100644
--- a/rpkid/rpki/gui/app/templates/app/parent_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/parent_detail.html
@@ -59,5 +59,5 @@
 
 {% block action %}
 {{ block.super }}
-<a class='btn' href='{{ object.get_absolute_url }}export' title='Download XML to send to repository operator'>Export</a>
+<a class='btn' href='{{ object.get_absolute_url }}export' title='Download XML to send to repository operator'><i class="icon-download"></i> Export</a>
 {% endblock action %}
diff --git a/rpkid/rpki/gui/app/templates/app/roa_detail.html b/rpkid/rpki/gui/app/templates/app/roa_detail.html
new file mode 100644
index 00000000..5500941f
--- /dev/null
+++ b/rpkid/rpki/gui/app/templates/app/roa_detail.html
@@ -0,0 +1,25 @@
+{% extends "app/object_detail.html" %}
+
+{% block object_display %}
+<div class="row">
+  <div class="span3 well">
+    <table class="table">
+      <tr><th>Prefix</th><th>Max Length</th><th>AS</th></tr>
+      <tr>
+	<td>{{ object.prefixes.all.0.as_roa_prefix }}</td>
+	<td>{{ object.prefixes.all.0.max_prefixlen }}</td>
+	<td>{{ object.asn }}</td>
+      </tr>
+    </table>
+  </div>
+  <div class="span2">
+    <h3>Covered Routes</h3>
+    <table class="table">
+      <tr><th>Prefix</th><th>AS</th></tr>
+      {% for r in routes %}
+      <tr><td>{{ r.as_resource_range }}</td><td>{{ r.asn }}</td></tr>
+      {% endfor %}
+    </table>
+  </div>
+</div>
+{% endblock %}
diff --git a/rpkid/rpki/gui/app/templates/app/user_list.html b/rpkid/rpki/gui/app/templates/app/user_list.html
index 607e5a9c..fed943f0 100644
--- a/rpkid/rpki/gui/app/templates/app/user_list.html
+++ b/rpkid/rpki/gui/app/templates/app/user_list.html
@@ -9,21 +9,19 @@
   <tr>
     <th>Username</th>
     <th>Email</th>
-    <th>Action</th>
+    <th></th>
   </tr>
   {% for u in users %}
   <tr>
     <td>{{ u.0.handle }}</td>
     <td>{{ u.1.email }}</td>
     <td>
-      <a class='btn small' href='{{ u.0.get_absolute_url }}/edit'>Edit</a>
-      <a class='btn small danger' href='{{ u.0.get_absolute_url }}/delete'>Delete</a>
+      <a class='btn btn-small' href='{% url rpki.gui.app.views.user_edit u.0.pk %}' title="Edit"><i class="icon-edit"></i></a>
+      <a class='btn btn-small' href='{% url rpki.gui.app.views.user_delete u.0.pk %}' title="Delete"><i class="icon-trash"></i></a>
     </td>
   </tr>
   {% endfor %}
 </table>
 
-<div class='actions'>
-  <a class='btn' href="{% url rpki.gui.app.views.user_create %}" title="create a new locally hosted resource handle">Create</a>
-</div>
+<a class='btn' href="{% url rpki.gui.app.views.user_create %}" title="create a new locally hosted resource handle">Create</a>
 {% endblock content %}