summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/mirrors/status.html4
-rw-r--r--templates/mirrors/status_table.html4
-rw-r--r--templates/packages/search.html4
-rw-r--r--templates/packages/signoff_cell.html2
-rw-r--r--templates/packages/signoffs.html12
-rw-r--r--templates/public/keys.html56
-rw-r--r--templates/releng/result_section.html1
7 files changed, 60 insertions, 23 deletions
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
index 307b96dd..cce6d983 100644
--- a/templates/mirrors/status.html
+++ b/templates/mirrors/status.html
@@ -89,7 +89,7 @@
</thead>
<tbody>
{% for log in error_logs %}
- <tr class="{% cycle 'odd' 'even' %}">
+ {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
<td>{{ log.url__url }}</td>
<td>{{ log.url__protocol__protocol }}</td>
<td>{{ log.country }}</td>
@@ -97,7 +97,7 @@
<td>{{ log.last_occurred|date:'Y-m-d H:i' }}</td>
<td>{{ log.error_count }}</td>
</tr>
- {% endfor %}
+ {% endspaceless %}{% endfor %}
</tbody>
</table>
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index 72de25dc..bd70115c 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -15,7 +15,7 @@
</thead>
<tbody>
{% for m_url in urls %}
- <tr class="{% cycle 'odd' 'even' %}">
+ {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
<td>{{ m_url.url }}</td>
<td>{{ m_url.protocol }}</td>
<td>{{ m_url.real_country }}</td>
@@ -26,6 +26,6 @@
<td>{{ m_url.duration_stddev|floatformat:2 }}</td>
<td>{{ m_url.score|floatformat:1|default:'∞' }}</td>
</tr>
- {% endfor %}
+ {% endspaceless %}{% endfor %}
</tbody>
</table>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index b344af1f..974c190b 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -77,7 +77,7 @@
</thead>
<tbody>
{% for pkg in package_list %}
- <tr class="{% cycle 'odd' 'even' %}">
+ {% spaceless %}<tr class="{% cycle 'odd' 'even' %}">
{% if perms.main.change_package %}
<td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
{% endif %}
@@ -94,7 +94,7 @@
<td>{{ pkg.last_update|date }}</td>
<td>{{ pkg.flag_date|date }}</td>
</tr>
- {% endfor %}
+ {% endspaceless %}{% endfor %}
</tbody>
</table>
{% include "packages/search_paginator.html" %}
diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html
index 01a5d58d..7d9e1972 100644
--- a/templates/packages/signoff_cell.html
+++ b/templates/packages/signoff_cell.html
@@ -1,4 +1,3 @@
-{% spaceless %}
{% if group.signoffs %}
<ul class="signoff-list">
{% for signoff in group.signoffs %}
@@ -22,4 +21,3 @@
<a class="signoff-options" href="{{ group.package.get_absolute_url }}signoff/options/">Signoff Options</a>
</div>
{% endif %}
-{% endspaceless %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 2d7b04cd..7b79c35b 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -52,6 +52,7 @@
<tbody id="tbody_signoffs">
{% for group in signoff_groups %}
<tr class="{% cycle 'odd' 'even' %} {{ group.arch.name }} {{ group.target_repo|lower }}">
+ {% spaceless %}
<td>{% pkg_details_link group.package %} {{ group.version }}</td>
<td>{{ group.arch.name }}</td>
<td>{{ group.target_repo }}</td>
@@ -68,12 +69,13 @@
{% endif %}
{% endif %}
<td>{% include "packages/signoff_cell.html" %}</td>
- <td class="wrap">{% if not group.default_spec %}{% with group.specification as spec %}
- {% if spec.required != 2 %}Required signoffs: {{ spec.required }}<br/>{% endif %}
- {% if not spec.enabled %}Signoffs are not currently enabled<br/>{% endif %}
- {% if spec.known_bad %}Package is known to be bad<br/>{% endif %}
- {{ spec.comments|default:""|linebreaksbr }}
+ <td class="wrap">{% if not group.default_spec %}{% with group.specification as spec %}{% comment %}
+ {% endcomment %}{% if spec.required != 2 %}Required signoffs: {{ spec.required }}<br/>{% endif %}{% comment %}
+ {% endcomment %}{% if not spec.enabled %}Signoffs are not currently enabled<br/>{% endif %}{% comment %}
+ {% endcomment %}{% if spec.known_bad %}Package is known to be bad<br/>{% endif %}{% comment %}
+ {% endcomment %}{{ spec.comments|default:""|linebreaksbr }}
{% endwith %}{% endif %}</td>
+ {% endspaceless %}
</tr>
{% endfor %}
</tbody>
diff --git a/templates/public/keys.html b/templates/public/keys.html
index 43b1b067..f0aa310e 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -15,15 +15,6 @@
<p>The {{ keys|length }} key{{ keys|pluralize }} listed below should be
regarded as the current set of master keys. They are available on public
keyservers and should be signed by the owner of the key.</p>
- <p>All official Arch Linux developers and trusted users should have their
- key signed by at least three of these master keys. This is in accordance
- with the PGP <em>web of trust</em> concept. If a user is willing to
- marginally trust all of the master keys, three signatures from different
- master keys will consider a given developer's key as valid. For more
- information on trust, please consult the
- <a href="http://www.gnupg.org/gph/en/manual.html">GNU Privacy Handbook</a>
- and <a href="http://www.gnupg.org/gph/en/manual.html#AEN385">Using trust to
- validate keys</a>.</p>
<table class="pretty2">
<thead>
@@ -55,5 +46,52 @@
{% endfor %}
</tbody>
</table>
+
+ <p>The following table shows all active developers and trusted users along
+ with the status of their personal signing key. A 'Yes' indicates that the
+ personal key of the developer is signed by the given master key. A 'No'
+ indicates it has not been signed; however, this does not necessarily mean
+ the key should not be trusted.</p>
+ <p>All official Arch Linux developers and trusted users should have their
+ key signed by at least three master keys if they are responsible for
+ packaging software in the repositories. This is in accordance with the PGP
+ <em>web of trust</em> concept. If a user is willing to marginally trust all
+ of the master keys, three signatures from different master keys will
+ consider a given developer's key as valid. For more information on trust,
+ please consult the
+ <a href="http://www.gnupg.org/gph/en/manual.html">GNU Privacy Handbook</a>
+ and <a href="http://www.gnupg.org/gph/en/manual.html#AEN385">Using trust to
+ validate keys</a>.</p>
+
+ <table class="pretty2" id="key-status">
+ <thead>
+ <tr>
+ <th></th>
+ <th>PGP Key</th>
+ {% for key in keys %}
+ <th>{{ key.owner.get_full_name }}</th>
+ {% endfor %}
+ </tr>
+ <tr>
+ <th></th>
+ <th></th>
+ {% for key in keys %}
+ <th>{% pgp_key_link key.pgp_key %}</th>
+ {% endfor %}
+ </tr>
+ </thead>
+ <tbody>
+ {% for user in active_users %}
+ <tr>
+ <th>{{ user.get_full_name }}</th>
+ <td>{% pgp_key_link user.userprofile.pgp_key %}</td>
+ {% spaceless %}{% for key in keys %}
+ {% signature_exists signatures key.pgp_key user.userprofile.pgp_key as signed %}
+ <td class="signed-{{ signed|yesno }}">{{ signed|yesno|capfirst }}</td>
+ {% endfor %}{% endspaceless %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
</div>
{% endblock %}
diff --git a/templates/releng/result_section.html b/templates/releng/result_section.html
index 45838b86..91a75613 100644
--- a/templates/releng/result_section.html
+++ b/templates/releng/result_section.html
@@ -7,7 +7,6 @@
{% for item in option.values %}
<tr>
<td>
- <a href="{% url releng-results-for option.field_name item.value.pk %}">
<a href="{% url 'releng-results-for' option.field_name item.value.pk %}">
{{ item.value.name|lower }}
</a>