Merge owlca and fix pgp permission

app/owlca/owlca/templates/owlca/certificationauthority_detail.html → app/owlca/templates/owlca/certificationauthority_detail.html

@@ -2,47 +2,44 @@
 {% load guardian_tags %}
 
 {% block content %}
-{% get_obj_perms request.user for certificationauthority as "ca_perms" %}
 
-<h2>CA: {{ certificationauthority.title }}</h2>
-<ul>
-    {% if "request_certificate" in ca_perms %}
-    <li><a href="{% url 'csr-create' certificationauthority.pk %}">Request signature</a></li>
-    {% endif %}
-</ul>
-<p>{{ certificationauthority.comment }}</p>
+<nav class="nav-breadcrumb" aria-label="breadcrumb">
+<ol>
+  <li><a href="{% url 'home' %}">Home</a></li>
+  <li aria-current="page">
+    <a href="{% url 'ca-list' %}">Certification Authorities</a>
+  </li>
+  <li aria-current="page">
+    <a href="{% url 'ca-detail' certificationauthority.pk %}">{{ certificationauthority.title }}</a>
+  </li>
+</ol>
+</nav>
 
+{% get_obj_perms request.user for certificationauthority as "ca_perms" %}
+<h2 class="h-control">
+  <div>
+    <i class="fas fa-stamp"></i>
+    {{ certificationauthority.title }}
+  </div>
+  {% if "request_certificate" in ca_perms %}
+  <a class="btn btn-outline-primary" href="{% url 'csr-create' certificationauthority.pk %}">
+    <i class="fas fa-certificate"></i> Request certificate
+  </a>
+  {% endif %}
+</h2>
+
+<p class="lead">{{ certificationauthority.comment }}</p>
 
-<h3>Self-signed certificate</h3>
 {% if certificationauthority.cert %}
-<p>Serial number: {{ certificationauthority.cert.serial_number.hex }}</p>
-<p>Fingerprint: {{ certificationauthority.cert.fingerprint.hex }}</p>
-<p>Subject: {{ certificationauthority.cert.subject }}</p>
-<p>Issuer: {{ certificationauthority.cert.issuer }}</p>
-<p>Not valid before: {{ certificationauthority.cert.not_valid_before }}</p>
-<p>Not valid after: {{ certificationauthority.cert.not_valid_after }}</p>
-{% if certificationauthority.cert.extensions %}
-<p>Extensions:
+<ul class="list-unstyled">
+    {% include 'owlca/cert_item.html' with selfsigned=True cert=certificationauthority.cert %}
 <ul>
-{% for name, value, crit in certificationauthority.cert.extensions %}
-    <li>
-    {% if crit %}<b>{% endif %}
-    {{name}}: {{value}}
-    {% if crit %} (critical)</b>{% endif %}
-    </li>
-{% endfor %}
-</ul>
-</p>
-{% endif %}
-<p><a href="{% url 'cert-download' certificationauthority.cert.pk %}">Download ca.pem</a></p>
-<pre>{{ certificationauthority.cert.pem }}</pre>
 {% else %}
 <p>No self-signed certificate!</p>
 {% endif %}
 
 
 {% if "manage_certificationauthority" in ca_perms %}
-
 <h3>CSR</h3>
 {% if certificationauthority.requests %}
 <ul>

app/owlca/templates/owlca/certificationauthority_list.html

+{% extends 'owlca/base.html' %}
+
+{% block content %}
+
+<nav class="nav-breadcrumb" aria-label="breadcrumb">
+<ol>
+  <li><a href="{% url 'home' %}">Home</a></li>
+  <li aria-current="page">
+    <a href="{% url 'ca-list' %}">Certification Authorities</a>
+  </li>
+</ol>
+</nav>
+
+<h2 class="h-control">
+  <div>Certification Authorities</div>
+  {% if perms.owlca.add_certificationauthority %}
+  <a class="btn btn-outline-primary" href="{% url 'ca-create' %}">
+    <i class="fas fa-plus"></i>
+  </a>
+  {% endif %}
+</h2>
+
+{% if certificationauthority_list %}
+<ul class="list-unstyled row row-cols-lg-3 row-cols-md-2 row-cols-1">
+{% for ca in certificationauthority_list %}
+  <li class="col">
+    <div class="card my-2">
+       <div class="card-header bg-dark text-light">
+          <h3 class="mb-0">
+            <i class="fas fa-stamp mr-2"></i>
+            <a class="stretched-link text-light" href="{% url 'ca-detail' ca.pk %}">
+              {{ ca }}
+            </a>
+          </h3>
+       </div>
+
+       <div class="card-body">
+         {{ ca.comment }}
+       </div>
+       {% if ca.common_name %}
+         <div class="card-footer">
+           <code class="text-muted"><i class="fas fa-id-card"></i>
+          CN={{ ca.common_name }}</code>
+        </div>
+      {% endif %}
+		</div>
+  </li>
+{% endfor %}
+</ul>
+{% else %}
+<p>There are no Certification Authorities visible to you.</p>
+{% endif %}
+
+{% endblock %}

app/owlca/owlca/views.py → app/owlca/views.py

@@ -197,7 +197,7 @@ def csr_create(request, pk):
 
     return render(request,
                   'owlca/certificatesignrequest_create.html',
-                  {'form': form})
+                  {'form': form, 'certificationauthority': ca})
 
 @permission_required("view_certificatesigningrequest",
                      (models.CertificateSigningRequest, "pk", "pk"))

app/pgp/templates/pgp/publickey_list.html

@@ -13,7 +13,7 @@
 
 <h2 class="h-control">
   <div>OpenPGP Public Keys</div>
-  {% if perms.pgp.add_ublickey %}
+  {% if perms.pgp.add_publickey %}
   <a class="btn btn-outline-primary" href="{% url 'publickey-create' %}">
     <i class="fas fa-plus"></i>
   </a>