From: Michael Tremer Date: Tue, 4 Dec 2012 11:54:57 +0000 (+0100) Subject: Redesign key management pages. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9005d830a1406f3e5f30d4c8524e6df8d69f8a7;p=pbs.git Redesign key management pages. --- diff --git a/data/templates/base.html b/data/templates/base.html index 8fac1c54..ac7e85ae 100644 --- a/data/templates/base.html +++ b/data/templates/base.html @@ -75,7 +75,7 @@
  • - {{ _("Key management") }} + {{ _("Key Management") }}
    • diff --git a/data/templates/keys-delete.html b/data/templates/keys-delete.html index e52c7c12..0c4f6715 100644 --- a/data/templates/keys-delete.html +++ b/data/templates/keys-delete.html @@ -9,11 +9,11 @@ /
  • - {{ _("Key management") }} + {{ _("Key Management") }} /
  • - {{ key.uids }} + {{ key.fingerprint }} /
  • @@ -22,26 +22,27 @@
    -

    - {{ _("Key") }}: {{ key.uids }} - {{ key.fingerprint }} -

    +

    {{ _("Key") }}: {{ key.fingerprint }}

    -
    -
    -

    - {{ _("You are going to delete the key %s.") % key.uids }} -

    +

    + {{ _("You are going to delete the key %s.") % key.fingerprint }} +

    -
    -
    - - {{ _("Delete key") }} - - {{ _("Cancel") }} -
    -
    +
      + {% for uid in key.uids %} +
    • {{ uid }}
      • + {% end %} +
    + +
    +
    + + {{ _("Delete key") }} + + {{ _("Cancel") }}
    + +
    {% end block %} diff --git a/data/templates/keys-import.html b/data/templates/keys-import.html index 47eed8b1..e69fe0c4 100644 --- a/data/templates/keys-import.html +++ b/data/templates/keys-import.html @@ -9,7 +9,7 @@ /
  • - {{ _("Key management") }} + {{ _("Key Management") }} /
  • @@ -18,30 +18,26 @@
    -

    {{ _("Import a new key") }}

    +

    {{ _("Import a new key") }}

    -
    -
    -
    - {% raw xsrf_form_html() %} -
    -
    - -
    - + + {% raw xsrf_form_html() %} +
    +
    + +
    + -

    - {{ _("Paste the key to import.") }} -

    -
    -
    +

    + {{ _("Paste the key to import.") }} +

    +
    +
    -
    - -
    -
    -
    -
    -
    +
    + +
    + + {% end block %} diff --git a/data/templates/keys-list.html b/data/templates/keys-list.html index 5b70f43a..2c695f8f 100644 --- a/data/templates/keys-list.html +++ b/data/templates/keys-list.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}{{ _("Import new key") }}{% end block %} +{% block title %}{{ _("Key Management") }}{% end block %} {% block body %}
    -

    {{ _("Key management") }}

    +

    {{ _("Key Management") }}

    -
    -
    -

    - {{ _("The keys are a very important component when it comes to security.") }} - {{ _("Each package in the Pakfire Build Service is signed to prove its authenticity.") }} -

    -
    -
    - -
    -
    - - - - - - - - - +

    + {{ _("The keys are a very important component when it comes to security.") }} + {{ _("Each package in the Pakfire Build Service is signed to prove its authenticity.") }} +

    - - {% for key in keys %} - - - - +
     {{ _("Fingerprint") }}{{ _("Created") }}{{ _("Expires") }}
    - - {% for uid in key.uids %} - {{ uid }}
    - {% end %} -     -     		-
    - - - {{ _("Lookup") }} - - - - {{ _("Download") }} - -
    +
    - {% if current_user and current_user.has_perm("manage_keys") and key.can_be_deleted() %} -
    -
    - - - {{ _("Remove") }} - -
    - {% end %} -
    + + + + + + + + - {% for subkey in key.subkeys %} - - - - - - + {% for key in keys %} + + + - + {% if current_user and current_user.has_perm("manage_keys") and key.can_be_deleted() %} +
    + + + {{ _("Remove") }} + +
    {% end %} + + - - - - {% end %} - -
     {{ _("Fingerprint") }}{{ _("Created") }}{{ _("Expires") }}
      - {% if subkey.algo %} - {{ _("Subkey") }} ({{ subkey.algo }}): - {% else %} - {{ _("Subkey") }}: - {% end %} - {{ subkey.fingerprint }}{{ format_date(subkey.time_created) }} - {% if subkey.time_expires %} - {% if subkey.expired %} - - {% end %} +
    + + {% for uid in key.uids %} + {{ uid }}
    + {% end %} +     +     		+
    + + + {{ _("Lookup") }} + + + + {{ _("Download") }} + +
    - {{ format_date(subkey.time_expires, full_format=True) }} - {% else %} - {{ _("This key does not expire.") }} - {% end %} -
     
    -
    -
    + {% for subkey in key.subkeys %} + +   + + {% if subkey.algo %} + {{ _("Subkey") }} ({{ subkey.algo }}): + {% else %} + {{ _("Subkey") }}: + {% end %} + + {{ subkey.fingerprint }} + {{ format_date(subkey.time_created) }} + + {% if subkey.time_expires %} + {% if subkey.expired %} + + {% end %} + + {{ format_date(subkey.time_expires, full_format=True) }} + {% else %} + {{ _("This key does not expire.") }} + {% end %} + + + {% end %} + + +   + + {% end %} + + {% if current_user and current_user.has_perm("manage_keys") %} -
    -
    - - - {{ _("Import new key") }} - -
    -
    + + + {{ _("Import new key") }} + {% end %} {% end block %}