summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-11-15 14:03:36 -0600
committerDan McGee <dan@archlinux.org>2011-11-15 14:04:39 -0600
commit5b63c29fe1c37ce9d946adedeaf13f5ad94d144a (patch)
tree76ec0d8be088bc04886c7e0be4b6412699b7fedd
parent12408702eaf89ea338670ba808da9ef49e35c562 (diff)
Show full names on developer user list pages
The old display format doesn't really make sense. Also fix the invalid HTML generated by the PGP tag link- we need to escape using &amp; inside the generated URLs. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--main/templatetags/pgp.py2
-rw-r--r--media/archweb.css4
-rw-r--r--templates/public/developer_list.html2
-rw-r--r--templates/public/userlist.html2
4 files changed, 6 insertions, 4 deletions
diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py
index f875c11e..67f5e08d 100644
--- a/main/templatetags/pgp.py
+++ b/main/templatetags/pgp.py
@@ -21,7 +21,7 @@ def pgp_key_link(key_id):
pgp_server = getattr(settings, 'PGP_SERVER', None)
if not pgp_server:
return format_key(key_id)
- url = 'http://%s/pks/lookup?op=vindex&fingerprint=on&exact=on&search=0x%s' % \
+ url = 'http://%s/pks/lookup?op=vindex&amp;fingerprint=on&amp;exact=on&amp;search=0x%s' % \
(pgp_server, key_id)
values = (url, format_key(key_id), key_id[-8:])
return '<a href="%s" title="PGP key search for %s">0x%s</a>' % values
diff --git a/media/archweb.css b/media/archweb.css
index c5477422..f4bb92fa 100644
--- a/media/archweb.css
+++ b/media/archweb.css
@@ -802,6 +802,10 @@ div#arch-bio-toc {
text-align: center;
}
+ div#arch-bio-toc a {
+ white-space: nowrap;
+ }
+
table.arch-bio-entry td.pic {
vertical-align: top;
padding-right: 15px;
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 2abbbfe4..0ac444e5 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -4,7 +4,7 @@
<p>
{% for dev in dev_list %}
<a href="#{{ dev.username }}" title="Jump to profile for {{ dev.get_full_name }}">
- {{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a> &nbsp;&nbsp;
+ {{ dev.first_name }} {{ dev.last_name }}</a> &nbsp;&nbsp;
{% endfor %}
</p>
</div>
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index c51215c3..0077f611 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -6,7 +6,6 @@
{% block content %}
{% cache 600 dev-tu-profiles user_type %}
<div id="dev-tu-profiles" class="box">
-
<h2>Arch Linux {{user_type}}</h2>
<p>{{description}}</p>
@@ -14,7 +13,6 @@
{% with users as dev_list %}
{% include 'public/developer_list.html' %}
{% endwith %}
-
</div>
{% endcache %}
{% endblock %}