From ba4de07ad8ee82bc6bc99ca06dc824acf069d2ac Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Tue, 12 Dec 2017 19:49:30 +0200 Subject: [PATCH] Improve certificate details view, make information more concise (#1021) The "Description" field can now display multi-line text content. The "Authority" field now displays the authority name in Lemur (if known) as well as issuer's name. For imported certs, "Imported" is displayed. --- .../angular/certificates/view/view.tpl.html | 93 ++++++++----------- lemur/static/app/styles/lemur.css | 3 + 2 files changed, 44 insertions(+), 52 deletions(-) diff --git a/lemur/static/app/angular/certificates/view/view.tpl.html b/lemur/static/app/angular/certificates/view/view.tpl.html index 5c1e73ca..965e86c8 100644 --- a/lemur/static/app/angular/certificates/view/view.tpl.html +++ b/lemur/static/app/angular/certificates/view/view.tpl.html @@ -71,63 +71,52 @@ Basic Info -
    -
  • - Creator - - {{ certificate.user.email }} - -
  • -
  • - Not Before - - {{ momentService.createMoment(certificate.notBefore) }} - -
  • -
  • - Not After - - {{ momentService.createMoment(certificate.notAfter) }} - -
  • -
  • - San - +
    + +
    +
    Creator
    +
    {{ certificate.user.email }}
    +
    Owner
    +
    {{ certificate.owner }}
    +
    Description
    +
    {{ certificate.description }}
    +
    + +
    +
    Certificate Authority
    +
    {{ certificate.authority ? certificate.authority.name : "Imported" }} ({{ certificate.issuer }})
    +
    Serial
    +
    +
    Hex: {{ certificate.serialHex }}
    +
    Decimal: {{ certificate.serial }}
    +
    +
    Valid From
    +
    {{ certificate.notBefore }} ({{ momentService.createMoment(certificate.notBefore) }})
    +
    Valid To
    +
    {{ certificate.notAfter }} ({{ momentService.createMoment(certificate.notAfter) }})
    +
    SAN
    +
    - -
  • -
  • - Bits - {{ certificate.bits }} -
  • -
  • - Signing Algorithm - {{ certificate.signingAlgorithm }} -
  • -
  • - Serial - {{ certificate.serial }} -
  • -
  • - Serial (Hex) - {{ certificate.serialHex }} -
  • -
  • - Validity - + + + +
    +
    Key Length
    +
    {{ certificate.bits }}
    +
    Signing Algorithm
    +
    {{ certificate.signingAlgorithm }}
    +
    +
    +
    Validity
    +
    Unknown Revoked Valid - -
  • -
  • - Description -

    {{ certificate.description }}

    -
  • -
+ + +
Endpoints diff --git a/lemur/static/app/styles/lemur.css b/lemur/static/app/styles/lemur.css index 85ba72a0..4aff7bdc 100644 --- a/lemur/static/app/styles/lemur.css +++ b/lemur/static/app/styles/lemur.css @@ -185,3 +185,6 @@ a { text-align:center; } +.multiline { + white-space: pre-line; +}