summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2014-11-02 10:43:09 -0600
committerDan McGee <dan@archlinux.org>2014-11-02 10:44:03 -0600
commit5bfe138a86a98b52f0b6746b900af6431cd4d17a (patch)
treedd10f445fe972c93aafe5ca56d86530a5ac042a2 /templates
parent0c72812fde64f3ed039d807b9e8b3914960b7d6b (diff)
Add new StaffGroup object
This will allow us to be a bit more dynamic in showing the people listings on the website. We'll be adding a Support Staff category to recognize those that do things around here but aren't technically developers. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'templates')
-rw-r--r--templates/public/developer_list.html4
-rw-r--r--templates/public/index.html6
-rw-r--r--templates/public/userlist.html8
3 files changed, 9 insertions, 9 deletions
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 4401d97b..954216ce 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -21,7 +21,7 @@
<meta itemprop="name" content="{{ dev.get_full_name|escape }}"/>
<meta itemprop="givenName" content="{{ dev.first_name|escape }}"/>
<meta itemprop="familyName" content="{{ dev.last_name|escape }}"/>
- <meta itemprop="jobTitle" content="{{ user_title|escape }}"/>
+ <meta itemprop="jobTitle" content="{{ group.member_title|escape }}"/>
<div style="display:none" itemprop="memberOf" itemscope itemtype="http://schema.org/Organization">
<meta itemprop="name" content="Arch Linux"/>
</div>
@@ -53,7 +53,7 @@
<th>Occupation:</th>
<td>{{ prof.occupation }}</td>
</tr><tr>
- <th>YOB:</th>
+ <th>Birth Year:</th>
<td itemprop="birthDate">{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
</tr><tr>
<th>Location:</th>
diff --git a/templates/public/index.html b/templates/public/index.html
index 3b17803c..c78303ce 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -172,9 +172,9 @@
<h4>People</h4>
<ul>
- <li><a href="{% url 'page-devs' %}" title="Active developers">Developers</a></li>
- <li><a href="{% url 'page-tus' %}" title="Active Trusted Users (TUs)">Trusted Users</a></li>
- <li><a href="{% url 'page-fellows' %}" title="Retired Developers">Fellows</a></li>
+ {% for group in staff_groups %}
+ <li><a href="{% url 'people' group.slug %}" title="More info about {{ group.name }}">{{ group.name }}</a></li>
+ {% endfor %}
<li><a href="{% url 'page-keys' %}"
title="Package/Database signing master keys">Signing Master Keys</a></li>
</ul>
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index 35104317..b49c5de2 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -2,16 +2,16 @@
{% load static from staticfiles %}
{% load cache %}
-{% block title %}Arch Linux - {{ user_type }}{% endblock %}
+{% block title %}Arch Linux - {{ group.name }}{% endblock %}
{% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %}
{% block content %}
-{% cache 600 dev-tu-profiles user_type %}
+{% cache 600 dev-tu-profiles group.name %}
<div id="dev-tu-profiles" class="box">
- <h2>Arch Linux {{user_type}}</h2>
+ <h2>Arch Linux {{ group.name }}</h2>
- <p>{{description}}</p>
+ <p>{{ group.description }}</p>
{% with users as dev_list %}
{% include 'public/developer_list.html' %}