diff options
Diffstat (limited to 'templates/public')
-rw-r--r-- | templates/public/developer_list.html | 4 | ||||
-rw-r--r-- | templates/public/index.html | 6 | ||||
-rw-r--r-- | templates/public/userlist.html | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html index 15a6c8bb..041780d7 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="{{ BRANDING_DISTRONAME }}"/> </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 14b93427..6686d7bb 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -174,9 +174,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 6292af83..d49a1539 100644 --- a/templates/public/userlist.html +++ b/templates/public/userlist.html @@ -2,16 +2,16 @@ {% load static from staticfiles %} {% load cache %} -{% block title %}{{ BRANDING_DISTRONAME }} - {{ user_type }}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ 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>{{BRANDING_DISTRONAME}} {{user_type}}</h2> + <h2>{{BRANDING_DISTRONAME}} {{ group.name }}</h2> - <p>{{description}}</p> + <p>{{ group.description }}</p> {% with users as dev_list %} {% include 'public/developer_list.html' %} |