use css class row-fluid instead of row to use relative widths rather than absolute pixels

rename roa_request_confirm_delete.html to roarequest_confirm_delete.html to match the other roarequest templates

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

11 files changed, 74 insertions, 105 deletions

diff --git a/rpkid/rpki/gui/app/templates/app/child_detail.html b/rpkid/rpki/gui/app/templates/app/child_detail.html
index d2896209..a30ad3e3 100644
--- a/rpkid/rpki/gui/app/templates/app/child_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/child_detail.html
@@ -5,25 +5,12 @@
   <h1>Child: {{ object.handle }}</h1>
 </div>
 
-<div class='row'>
-  <div class='span2'>
-    <p><strong>Child Handle</strong>
-  </div>
-  <div class='span2'>
-    <p>{{ object.handle }}
-  </div>
-</div>
-<div class='row'>
-  <div class='span2'>
-    <p><strong>Valid until</strong>
-  </div>
-  <div class='span4'>
-    <p>{{ object.valid_until }}
-  </div>
+<div class='row-fluid'>
+    <p><strong>Valid until</strong> {{ object.valid_until }}
 </div>
 
-<div class='row'>
-  <div class='span4'>
+<div class='row-fluid'>
+  <div class='span6'>
     <strong>Addresses</strong>
     {% if object.address_ranges.all %}
     <ul class='unstyled'>
@@ -35,7 +22,7 @@
     <p style='font-style:italic'>none</p>
     {% endif %}
   </div>
-  <div class='span4'>
+  <div class='span6'>
     <strong>ASNs</strong>
     {% if object.asns.all %}
     <ul class='unstyled'>
diff --git a/rpkid/rpki/gui/app/templates/app/client_detail.html b/rpkid/rpki/gui/app/templates/app/client_detail.html
index 2808cf20..f596b84b 100644
--- a/rpkid/rpki/gui/app/templates/app/client_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/client_detail.html
@@ -5,20 +5,16 @@
   <h1>Repository Client: {{ object.handle }}</h1>
 </div>
 
-<div class='row'>
-  <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>
+<table class="table">
+  <tr>
+    <td>Name</td>
+    <td>{{ object.handle }} </td>
+  </tr>
+  <tr>
+    <td>SIA</td>
+    <td>{{ object.sia_base }}</td>
+  </tr>
+</table>
 
 {% block action %}
 <a class="btn" href="{% url rpki.gui.app.views.client_delete object.pk %}"><i class="icon-trash"></i> Delete</a>
diff --git a/rpkid/rpki/gui/app/templates/app/dashboard.html b/rpkid/rpki/gui/app/templates/app/dashboard.html
index d7a660c4..b6a7a9cb 100644
--- a/rpkid/rpki/gui/app/templates/app/dashboard.html
+++ b/rpkid/rpki/gui/app/templates/app/dashboard.html
@@ -7,8 +7,8 @@
 {% endblock sidebar_extra %}
 
 {% block content %}
-<div class='row'>
-  <div class='span5'>
+<div class='row-fluid'>
+  <div class='span6'>
     <div class="page-header">
       <h1>Resources</h1>
     </div>
@@ -60,7 +60,7 @@
     </table>
     <a class='btn' href="{% url rpki.gui.app.views.refresh %}" title="refresh resource list from rpkid"><i class="icon-refresh"></i> refresh</a></li>
   </div>
-  <div class='span5'>
+  <div class='span6'>
     <h2>Unallocated Resources</h2>
     <p>The following resources have not been allocated to a child, nor appear in a ROA.
 
@@ -91,8 +91,8 @@
   </div><!-- /span -->
 </div><!-- /row -->
 
-<div class="row">
-  <div class="span5">
+<div class="row-fluid">
+  <div class="span6">
 <div class="page-header">
   <h1>ROA Requests</h1>
 </div>
@@ -114,7 +114,7 @@
 <a class="btn" href="{% url rpki.gui.app.views.roa_create %}"><i class="icon-plus-sign"></i> Create</a>
 </div>
 
-  <div class="span5">
+  <div class="span6">
 <div class="page-header">
   <h1>Ghostbuster Requests</h1>
 </div>
@@ -138,8 +138,8 @@
 </div><!-- /span -->
 </div><!-- /row -->
 
-<div class="row">
-  <div class="span5">
+<div class="row-fluid">
+  <div class="span6">
     <div class="page-header">
       <h1>Children</h1>
     </div>
@@ -156,7 +156,7 @@
     </table>
     <a class="btn" href="{% url rpki.gui.app.views.child_import %}"><i class="icon-upload"></i> Import</a>
   </div><!-- /span -->
-  <div class="span5">
+  <div class="span6">
     <div class="page-header">
       <h1>Parents</h1>
     </div>
@@ -175,8 +175,8 @@
   </div><!-- /span -->
 </div><!-- /row -->
 
-<div class="row">
-  <div class="span5">
+<div class="row-fluid">
+  <div class="span6">
     <div class="page-header">
       <h1>Repositories</h1>
     </div>
@@ -194,7 +194,7 @@
     <a class="btn" href="{% url rpki.gui.app.views.repository_import %}"><i class="icon-upload"></i> Import</a>
   </div><!-- /span -->
   {% if request.user.is_superuser %}
-  <div class="span5">
+  <div class="span6">
     <div class="page-header">
       <h1>Repository Clients</h1>
     </div>
diff --git a/rpkid/rpki/gui/app/templates/app/parent_detail.html b/rpkid/rpki/gui/app/templates/app/parent_detail.html
index 590cedc1..aa0685ca 100644
--- a/rpkid/rpki/gui/app/templates/app/parent_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/parent_detail.html
@@ -32,8 +32,8 @@
   </tr>
 </table>
 
-<div class='row'>
-  <div class='span4'>
+<div class='row-fluid'>
+  <div class='span6'>
     <h3>Delegated Addresses</h3>
     <ul class='unstyled'>
       {% for c in object.certs.all %}
@@ -46,7 +46,7 @@
       {% endfor %}
     </ul>
   </div>
-  <div class='span4'>
+  <div class='span6'>
     <h3>Delegated ASNs</h3>
     <ul class='unstyled'>
       {% for c in object.certs.all %}
diff --git a/rpkid/rpki/gui/app/templates/app/repository_detail.html b/rpkid/rpki/gui/app/templates/app/repository_detail.html
index caae7f53..d9d6994d 100644
--- a/rpkid/rpki/gui/app/templates/app/repository_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/repository_detail.html
@@ -5,22 +5,7 @@
   <h1>Repository: {{ object.handle }}</h1>
 </div>
 
-<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 }}</td>
-  </div>
-</div>
+<p><strong>SIA</strong> {{ object.sia_base }}
 
 {% block action %}
 <a class="btn" href="{% url rpki.gui.app.views.repository_delete object.pk %}" title="Delete this repository"><i class="icon-trash"></i> Delete</a>
diff --git a/rpkid/rpki/gui/app/templates/app/roa_detail.html b/rpkid/rpki/gui/app/templates/app/roa_detail.html
index f2cd53fc..2878dae2 100644
--- a/rpkid/rpki/gui/app/templates/app/roa_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/roa_detail.html
@@ -5,8 +5,8 @@
   <h1>ROA Request</h1>
 </div>
 
-<div class="row">
-  <div class="span3 well">
+<div class="row-fluid">
+  <div class="span6 well">
     <table class="table">
       <tr><th>Prefix</th><th>Max Length</th><th>AS</th></tr>
       <tr>
@@ -16,7 +16,7 @@
       </tr>
     </table>
   </div>
-  <div class="span2">
+  <div class="spa62">
     <h3>Covered Routes</h3>
     <table class="table">
       <tr><th>Prefix</th><th>AS</th></tr>
diff --git a/rpkid/rpki/gui/app/templates/app/roa_request_confirm_delete.html b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_delete.html
index 4a4bce71..c5457c7d 100644
--- a/rpkid/rpki/gui/app/templates/app/roa_request_confirm_delete.html
+++ b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_delete.html
@@ -5,8 +5,8 @@
   <h1>Delete ROA Request</h1>
 </div>
 
-<div class='row'>
-  <div class='span5'>
+<div class='row-fluid'>
+  <div class='span6'>
     <div class='alert alert-block alert-warning'>
       <p><strong>Please confirm</strong> that you would like to delete the
       following ROA Request.  The table to the right indicates how validation
@@ -35,7 +35,7 @@
     </form>
   </div>
 
-  <div class='span5'>
+  <div class='span6'>
     <h2>Matching Routes</h2>
 
     <table class='table table-striped table-condensed'>
diff --git a/rpkid/rpki/gui/app/templates/app/roarequest_confirm_form.html b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_form.html
index 18b4ce30..2c82e482 100644
--- a/rpkid/rpki/gui/app/templates/app/roarequest_confirm_form.html
+++ b/rpkid/rpki/gui/app/templates/app/roarequest_confirm_form.html
@@ -1,13 +1,12 @@
 {% extends "app/app_base.html" %}
-{% load crispy_forms_tags %}
 
 {% block content %}
 <div class='page-title'>
-  <h1>Create ROA</h1>
+  <h1>Confirm ROA Request</h1>
 </div>
 
-<div class='row'>
-  <div class='span5'>
+<div class='row-fluid'>
+  <div class='span6'>
     <div class='alert alert-block-message alert-warning'>
       <p><strong>Please confirm</strong> that you would like to create the following ROA.
       The accompanying table indicates how the validation status may change as a result.
@@ -27,7 +26,7 @@
 
       <form method='POST' action='{% url rpki.gui.app.views.roa_create_confirm %}'>
 	{% csrf_token %}
-  {{ form|crispy }}
+	{% include "app/bootstrap_form.html" %}
 
 	<div class='form-actions'>
 	  <input class='btn btn-primary' type='submit' value='Create'/>
@@ -37,7 +36,7 @@
     </div><!-- /alert-message -->
   </div>
 
-  <div class='span5'>
+  <div class='span6'>
     <h2>Matched Routes</h2>
 
     <table style='table table-striped table-condensed'>
diff --git a/rpkid/rpki/gui/app/templates/app/roarequest_form.html b/rpkid/rpki/gui/app/templates/app/roarequest_form.html
index 95eaf983..e599179c 100644
--- a/rpkid/rpki/gui/app/templates/app/roarequest_form.html
+++ b/rpkid/rpki/gui/app/templates/app/roarequest_form.html
@@ -1,10 +1,10 @@
 {% extends "app/app_base.html" %}
 
-{% load crispy_forms_tags %}
+{# This form is used for creating a new ROA request #}
 
 {% block content %}
 <div class='page-title'>
-  <h1>Create ROA</h1>
+  <h1>Create ROA Request</h1>
 </div>
 
 <script src='{{ STATIC_URL }}js/jquery-1.8.3.min.js'></script>
@@ -26,11 +26,11 @@
   $(document).ready(function(){ $("#id_prefix").change(f) })
 </script>
 
-<div class='row'>
-  <div class='span5'>
+<div class='row-fluid'>
+  <div class='span6'>
     <form method='POST' action='{{ request.get_full_path }}'>
       {% csrf_token %}
-      {{ form|crispy }}
+      {% include "app/bootstrap_form.html" %}
       <div class="form-actions">
 	<input class="btn" type="submit" value="Preview">
 	<a class="btn" href="{% url rpki.gui.app.views.dashboard %}">Cancel</a>
@@ -38,7 +38,7 @@
     </form>
   </div>
 
-  <div class='span5'>
+  <div class='span6'>
     Routes matching your prefix:
     <table class='table table-condensed table-striped' id='route_table'>
       <tr><th>Prefix</th><th>AS</th></tr>
diff --git a/rpkid/rpki/gui/app/templates/app/route_detail.html b/rpkid/rpki/gui/app/templates/app/route_detail.html
index 238d6c2a..286250a6 100644
--- a/rpkid/rpki/gui/app/templates/app/route_detail.html
+++ b/rpkid/rpki/gui/app/templates/app/route_detail.html
@@ -4,11 +4,11 @@
 
 {% block content %}
 <div class="page-header">
-  <h1>Route View</h1>
+  <h1>Route Detail</h1>
 </div>
 
-<div class="row">
-  <div class="span3 well">
+<div class="row-fluid">
+  <div class="span12 well">
     <table class="table table-striped table-condensed">
       <tr><th>Prefix</th><th>AS</th></tr>
       <tr>
@@ -20,26 +20,28 @@
   </div>
 </div>
 
-<div class="row">
-  <p>The table below lists all ROAs which cover the route described above.
+<div class="row-fluid">
+  <div class="span12">
+    <p>The table below lists all ROAs which cover the route described above.
 
-  <table class="table table-striped table-condensed">
-    <tr>
-      <th>Prefix</th>
-      <th>Max Length</th>
-      <th>ASN</th>
-      <th>Expires</th>
-      <th>URI</th>
-    </tr>
-    {% for pfx in roa_prefixes %}
-    <tr>
-      <td>{{ pfx.as_resource_range }}</td>
-      <td>{{ pfx.max_length }}</td>
-      <td>{{ pfx.roas.all.0.asid }}</td>
-      <td>{{ pfx.roas.all.0.not_after }}</td>
-      <td>{{ pfx.roas.all.0.repo.uri }}</td>
-    </tr>
-    {% endfor %}
-  </table>
+    <table class="table table-striped table-condensed">
+      <tr>
+	<th>Prefix</th>
+	<th>Max Length</th>
+	<th>ASN</th>
+	<th>Expires</th>
+	<th>URI</th>
+      </tr>
+      {% for pfx in roa_prefixes %}
+      <tr>
+	<td>{{ pfx.as_resource_range }}</td>
+	<td>{{ pfx.max_length }}</td>
+	<td>{{ pfx.roas.all.0.asid }}</td>
+	<td>{{ pfx.roas.all.0.not_after }}</td>
+	<td>{{ pfx.roas.all.0.repo.uri }}</td>
+      </tr>
+      {% endfor %}
+    </table>
+  </div>
 </div>
 {% endblock %}
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 25540a81..cfb15331 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -554,7 +554,7 @@ def roa_delete(request, pk):
         validate_route(route, qs)
         routes.append(route)
 
-    return render(request, 'app/roa_request_confirm_delete.html',
+    return render(request, 'app/roarequest_confirm_delete.html',
                   {'object': roa, 'routes': routes})