Redesign key management pages.

diff --git a/data/templates/base.html b/data/templates/base.html
index 8fac1c54dd2928814db15b0017520ef9e1070af4..ac7e85aede407319b7c655c3ca47d141110fe438 100644 (file)
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -75,7 +75,7 @@
                                                                        <li>
                                                                                <a href="/keys">
                                                                                        <i class="icon-barcode"></i>
-                                                                                       {{ _("Key management") }}
+                                                                                       {{ _("Key Management") }}
                                                                                </a>
                                                                        </li>
 

diff --git a/data/templates/keys-delete.html b/data/templates/keys-delete.html
index e52c7c12c7394c569609806b36cb1b9f387c12cb..0c4f67158a04432bc1a7d4ebc5fd3da99cf7b033 100644 (file)
--- a/data/templates/keys-delete.html
+++ b/data/templates/keys-delete.html
@@ -9,11 +9,11 @@
                        <span class="divider">/</span>
                </li>
                <li>
-                       <a href="/keys">{{ _("Key management") }}</a>
+                       <a href="/keys">{{ _("Key Management") }}</a>
                        <span class="divider">/</span>
                </li>
                <li>
-                       <a href="/key/{{ key.fingerprint }}">{{ key.uids }}</a>
+                       <a href="/key/{{ key.fingerprint }}">{{ key.fingerprint }}</a>
                        <span class="divider">/</span>
                </li>
                <li class="active">
@@ -22,26 +22,27 @@
        </ul>
 
        <div class="page-header">
-               <h1>
-                       {{ _("Key") }}: {{ key.uids }}
-                       <small>{{ key.fingerprint }}</small>
-               </h1>
+               <h2>{{ _("Key") }}: {{ key.fingerprint }}</h2>
        </div>
 
-       <div class="row">
-               <div class="span6 offset3">
-                       <p>
-                               {{ _("You are going to delete the key <strong>%s</strong>.") % key.uids }}
-                       </p>
+       <p>
+               {{ _("You are going to delete the key %s.") % key.fingerprint }}
+       </p>
 
-                       <div class="btn-toolbar">
-                               <div class="btn-group pull-right">
-                                       <a class="btn btn-danger" href="/key/{{ key.fingerprint }}/delete?confirmed=1">
-                                               {{ _("Delete key") }}
-                                       </a>
-                                       <a class="btn" href="/keys">{{ _("Cancel") }}</a>
-                               </div>
-                       </div>
+       <ul>
+               {% for uid in key.uids %}
+                       <li>{{ uid }}</li>
+               {% end %}
+       </ul>
+
+       <div class="btn-toolbar">
+               <div class="btn-group pull-right">
+                       <a class="btn btn-danger" href="/key/{{ key.fingerprint }}/delete?confirmed=1">
+                               {{ _("Delete key") }}
+                       </a>
+                       <a class="btn" href="/keys">{{ _("Cancel") }}</a>
                </div>
        </div>
+
+       <br class="clear">
 {% end block %}

diff --git a/data/templates/keys-import.html b/data/templates/keys-import.html
index 47eed8b12b5b52becd80a1a484e7a522b688e8b2..e69fe0c4d65599a6338b5568f84a136b94f731bb 100644 (file)
--- a/data/templates/keys-import.html
+++ b/data/templates/keys-import.html
@@ -9,7 +9,7 @@
                        <span class="divider">/</span>
                </li>
                <li>
-                       <a href="/keys">{{ _("Key management") }}</a>
+                       <a href="/keys">{{ _("Key Management") }}</a>
                        <span class="divider">/</span>
                </li>
                <li class="active">
@@ -18,30 +18,26 @@
        </ul>
 
        <div class="page-header">
-               <h1>{{ _("Import a new key") }}</h1>
+               <h2>{{ _("Import a new key") }}</h2>
        </div>
 
-       <div class="row">
-               <div class="span6 offset3">
-                       <form class="form-horizontal" method="POST" action="">
-                               {% raw xsrf_form_html() %}
-                               <fieldset>
-                                       <div class="control-group">
-                                               <label class="control-label" for="data">{{ _("Key") }}</label>
-                                               <div class="controls">
-                                                       <textarea name="data" id="data" rows="7"></textarea>
+       <form class="form-horizontal" method="POST" action="">
+               {% raw xsrf_form_html() %}
+               <fieldset>
+                       <div class="control-group">
+                               <label class="control-label" for="data">{{ _("Key") }}</label>
+                               <div class="controls">
+                                       <textarea name="data" id="data" rows="7"></textarea>
 
-                                                       <p class="help-block">
-                                                               {{ _("Paste the key to import.") }}
-                                                       </p>
-                                               </div>
-                                       </div>
+                                       <p class="help-block">
+                                               {{ _("Paste the key to import.") }}
+                                       </p>
+                               </div>
+                       </div>
 
-                                       <div class="form-actions">
-                                               <button type="submit" class="btn btn-primary">{{ _("Import new key") }}</button>
-                                       </div>
-                               </fieldset>
-                       </form>
-               </div>
-       </div>
+                       <div class="form-actions">
+                               <button type="submit" class="btn btn-primary">{{ _("Import new key") }}</button>
+                       </div>
+               </fieldset>
+       </form>
 {% end block %}

diff --git a/data/templates/keys-list.html b/data/templates/keys-list.html
index 5b70f43adb6cbd743c65e52d317475e52c9b91d8..2c695f8fdc92076623ee21dde159c49359b2b73d 100644 (file)
--- 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 %}
        <ul class="breadcrumb">
@@ -9,112 +9,101 @@
                        <span class="divider">/</span>
                </li>
                <li class="active">
-                       <a href="/keys">{{ _("Key management") }}</a>
+                       <a href="/keys">{{ _("Key Management") }}</a>
                </li>
        </ul>
 
        <div class="page-header">
-               <h1>{{ _("Key management") }}</h1>
+               <h2>{{ _("Key Management") }}</h2>
        </div>
 
-       <div class="row">
-               <div class="span12">
-                       <p>
-                               {{ _("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.") }}
-                       </p>
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="span12">
-                       <table class="table">
-                               <thead>
-                                       <tr>
-                                               <th colspan="2">&nbsp;</th>
-                                               <th>{{ _("Fingerprint") }}</th>
-                                               <th>{{ _("Created") }}</th>
-                                               <th>{{ _("Expires") }}</th>
-                                       </tr>
-                               </thead>
+       <p>
+               {{ _("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.") }}
+       </p>
 
-                               <tbody>
-                                       {% for key in keys %}
-                                               <tr>
-                                                       <td colspan="4">
-                                                               <strong>
-                                                                       {% for uid in key.uids %}
-                                                                               {{ uid }}<br />
-                                                                       {% end %}
-                                                               </strong>
-                                                       </td>
-                                                       <td>
-                                                               <div class="btn-group">
-                                                                       <a class="btn btn-mini" href="http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x{{ key.fingerprint }}" target="_blank">
-                                                                               <i class="icon-search"></i>
-                                                                               {{ _("Lookup") }}
-                                                                       </a>
-                                                                       <a class="btn btn-mini" href="/key/{{ key.fingerprint }}">
-                                                                               <i class="icon-download"></i>
-                                                                               {{ _("Download") }}
-                                                                       </a>
-                                                               </div>
+       <hr>
 
-                                                               {% if current_user and current_user.has_perm("manage_keys") and key.can_be_deleted() %}
-                                                                       <br />
-                                                                       <div class="btn-group">
-                                                                               <a class="btn btn-mini btn-danger" href="/key/{{ key.fingerprint }}/delete">
-                                                                                       <i class="icon-trash icon-white"></i>
-                                                                                       {{ _("Remove") }}
-                                                                               </a>
-                                                                       </div>
-                                                               {% end %}
-                                                       </td>
-                                               </tr>
+       <table class="table">
+               <thead>
+                       <tr>
+                               <th colspan="2">&nbsp;</th>
+                               <th>{{ _("Fingerprint") }}</th>
+                               <th>{{ _("Created") }}</th>
+                               <th>{{ _("Expires") }}</th>
+                       </tr>
+               </thead>
 
-                                               {% for subkey in key.subkeys %}
-                                                       <tr>
-                                                               <td>&nbsp;</td>
-                                                               <td>
-                                                                       {% if subkey.algo %}
-                                                                               {{ _("Subkey") }} ({{ subkey.algo }}):
-                                                                       {% else %}
-                                                                               {{ _("Subkey") }}:
-                                                                       {% end %}
-                                                               </td>
-                                                               <td>{{ subkey.fingerprint }}</td>
-                                                               <td>{{ format_date(subkey.time_created) }}</td>
-                                                               <td>
-                                                                       {% if subkey.time_expires %}
-                                                                               {% if subkey.expired %}
-                                                                                       <i class="icon-warning-sign"></i>
-                                                                               {% end %}
+               <tbody>
+                       {% for key in keys %}
+                               <tr>
+                                       <td colspan="4">
+                                               <strong>
+                                                       {% for uid in key.uids %}
+                                                               {{ uid }}<br />
+                                                       {% end %}
+                                               </strong>
+                                       </td>
+                                       <td>
+                                               <div class="btn-group">
+                                                       <a class="btn btn-mini" href="http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x{{ key.fingerprint }}" target="_blank">
+                                                               <i class="icon-search"></i>
+                                                               {{ _("Lookup") }}
+                                                       </a>
+                                                       <a class="btn btn-mini" href="/key/{{ key.fingerprint }}">
+                                                               <i class="icon-download"></i>
+                                                               {{ _("Download") }}
+                                                       </a>
+                                               </div>
 
-                                                                               {{ format_date(subkey.time_expires, full_format=True) }}
-                                                                       {% else %}
-                                                                               {{ _("This key does not expire.") }}
-                                                                       {% end %}
-                                                               </td>
-                                                       </tr>
+                                               {% if current_user and current_user.has_perm("manage_keys") and key.can_be_deleted() %}
+                                                       <div class="btn-group">
+                                                               <a class="btn btn-mini btn-danger" href="/key/{{ key.fingerprint }}/delete">
+                                                                       <i class="icon-trash icon-white"></i>
+                                                                       {{ _("Remove") }}
+                                                               </a>
+                                                       </div>
                                                {% end %}
+                                       </td>
+                               </tr>
 
-                                               <tr>
-                                                       <td colspan="5">&nbsp;</td>
-                                               </tr>
-                                       {% end %}
-                               </tbody>
-                       </table>
-               </div>
-       </div>
+                               {% for subkey in key.subkeys %}
+                                       <tr>
+                                               <td>&nbsp;</td>
+                                               <td>
+                                                       {% if subkey.algo %}
+                                                               {{ _("Subkey") }} ({{ subkey.algo }}):
+                                                       {% else %}
+                                                               {{ _("Subkey") }}:
+                                                       {% end %}
+                                               </td>
+                                               <td>{{ subkey.fingerprint }}</td>
+                                               <td>{{ format_date(subkey.time_created) }}</td>
+                                               <td>
+                                                       {% if subkey.time_expires %}
+                                                               {% if subkey.expired %}
+                                                                       <i class="icon-warning-sign"></i>
+                                                               {% end %}
+
+                                                               {{ format_date(subkey.time_expires, full_format=True) }}
+                                                       {% else %}
+                                                               {{ _("This key does not expire.") }}
+                                                       {% end %}
+                                               </td>
+                                       </tr>
+                               {% end %}
+
+                               <tr>
+                                       <td colspan="5">&nbsp;</td>
+                               </tr>
+                       {% end %}
+               </tbody>
+       </table>
 
        {% if current_user and current_user.has_perm("manage_keys") %}
-               <div class="row">
-                       <div class="span12">
-                               <a class="btn btn-danger pull-right" href="/key/import">
-                                       <i class="icon-star icon-white"></i>
-                                       {{ _("Import new key") }}
-                               </a>
-                       </div>
-               </div>
+               <a class="btn btn-danger pull-right" href="/key/import">
+                       <i class="icon-star icon-white"></i>
+                       {{ _("Import new key") }}
+               </a>
        {% end %}
 {% end block %}