Skip to content

Commit e6c8b66

Browse files
levkowetzlevkowetz
committed
Changed mentions of people with roles on the various group pages to link to both their profile page and their email address.
 - Legacy-Id: 13664
1 parent bb089c1 commit e6c8b66

7 files changed

Lines changed: 35 additions & 13 deletions

File tree

‎ietf/static/ietf/css/ietf.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@ td.area-director div { border-bottom: solid #ccc 1px; }
430430

431431
h1 small .pull-right { margin-top: 10.5px; }
432432

433+
/* from bootstrap: .small { font-size: 84%; } */
434+
435+
.tiny { font-size: 70%; }
436+
433437
.large {font-size: 120%;}
434438
.llarge {font-size: 144%;}
435439
.lllarge {font-size: 172.8%;}

‎ietf/templates/group/active_ags.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,20 @@ <h1>Active area groups</h1>
2828
<td>{{ group.name }}</td>
2929
<td>
3030
{% for ad in group.ads %}
31-
<a href="mailto:{{ ad.email.address }}">{{ ad.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
31+
<a href="{% url 'ietf.person.views.profile' email_or_name=ad.person.name %}">{{ ad.person.plain_name }}
32+
</a><a href="mailto:{{ ad.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %}, {% endif %}
3233
{% endfor %}
3334
</td>
3435
<td>
3536
{% for secretary in group.secretaries %}
36-
<a href="mailto:{{ secretary.email.address }}">{{ secretary.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
37+
<a href="{% url 'ietf.person.views.profile' email_or_name=secretary.personname %}">{{ secretary.person.plain_name }}
38+
</a><a href="mailto:{{ secretary.email.address }}"><span class="fa fa-envelope-o tiny"></span></a> {% if not forloop.last %}, {% endif %}
3739
{% endfor %}
3840
</td>
3941
<td>
4042
{% for chair in group.chairs %}
41-
<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
43+
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}
44+
</a><a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %}, {% endif %}
4245
{% endfor %}
4346
</td>
4447
</tr>

‎ietf/templates/group/active_dirs.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,20 @@ <h1>Active Directorates</h1>
3131
<td><a href="{% url "ietf.group.views.group_home" acronym=group.parent.acronym %}">{{ group.parent.acronym }}</a></td>
3232
<td>
3333
{% for ad in group.ads %}
34-
<a href="mailto:{{ ad.email.address }}">{{ ad.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
34+
<a href="{% url 'ietf.person.views.profile' email_or_name=ad.person.name %}">{{ ad.person.plain_name }}
35+
</a><a href="mailto:{{ ad.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %}, {% endif %}
3536
{% endfor %}
3637
</td>
3738
<td>
3839
{% for secretary in group.secretaries %}
39-
<a href="mailto:{{ secretary.email.address }}">{{ secretary.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
40+
<a href="{% url 'ietf.person.views.profile' email_or_name=secretary.personname %}">{{ secretary.person.plain_name }}</a>
41+
<a href="mailto:{{ secretary.email.address }}"><span class="fa fa-envelope-o tiny"></span></a> {% if not forloop.last %}, {% endif %}
4042
{% endfor %}
4143
</td>
4244
<td>
4345
{% for chair in group.chairs %}
44-
<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
46+
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}</a>
47+
<a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %}, {% endif %}
4548
{% endfor %}
4649
</td>
4750
</tr>

‎ietf/templates/group/active_rgs.html‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
<h1>Active IRTF research groups</h1>
1414

1515
<h2>IRTF chair</h2>
16-
<p><a href="mailto:irtf-chair@irtf.org">{{ irtf.chair.person.plain_name }}</a></p>
16+
<p>
17+
<a href="mailto:{{ irtf.chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>
18+
<a href="{% url 'ietf.person.views.profile' email_or_name=irtf.chair.person.name %}">{{ irtf.chair.person.plain_name }}</a>
19+
</p>
1720

1821
<h2>Active research groups</h2>
1922
<a class="btn btn-default" href="{% url "ietf.group.views.all_status" %}">Status Reports</a>
@@ -32,7 +35,11 @@ <h2>Active research groups</h2>
3235
<tr>
3336
<td><a href="{% url "ietf.group.views.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
3437
<td>{{ group.name }}</td>
35-
<td>{% for chair in group.chairs %}<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
38+
<td>
39+
{% for chair in group.chairs %}
40+
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}</a>
41+
<a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %} , {% endif %}
42+
{% endfor %}</td>
3643
</tr>
3744
{% endfor %}
3845
</tbody>

‎ietf/templates/group/active_teams.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ <h1>Active teams</h1>
2727
<td>{{ group.name }}</td>
2828
<td>
2929
{% for chair in group.chairs %}
30-
<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
30+
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}</a>
31+
<a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %} , {% endif %}
3132
{% endfor %}
3233
</td>
3334
</tr>

‎ietf/templates/group/active_wgs.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ <h3>{{ area.acronym }} Area Director{{ area.ads|pluralize }} (AD{{ area.ads|plur
3030
<ul class="list-unstyled">
3131
{% for ad in area.ads %}
3232
<li>
33-
{{ ad.person.plain_name }} (<a href="mailto:{{ ad.email.address }}">{{ ad.email.address }}</a>)
33+
<a href="mailto:{{ ad.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>
34+
<a href="{% url 'ietf.person.views.profile' email_or_name=ad.person.name %}">{{ ad.person.plain_name }}</a>
3435
{% if ad.name == "pre-ad" %} (Incoming AD){% endif %}
3536
</li>
3637
{% endfor %}
@@ -62,12 +63,14 @@ <h3>{{ area.acronym }} active WG{{ area.groups|pluralize}}</h3>
6263
<tr>
6364
<td><a href="{% url "ietf.group.views.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
6465
<td>
65-
<a href="mailto:{{ group.ad_role.email.address }}" title="{{ group.ad_role.person.plain_name }} &lt;{{ group.ad_role.email.address }}&gt;">{{ group.ad_role.person.plain_name.split.0 }}</a>
66+
<a href="mailto:{{ group.ad_role.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>
67+
<a href="{% url 'ietf.person.views.profile' email_or_name=group.ad_role.person.name %}">{{ group.ad_role.person.plain_name.split.0 }}</a>
6668
</td>
6769
<td>{{ group.name }}</td>
6870
<td>
6971
{% for chair in group.chairs %}
70-
<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
72+
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}</a>
73+
<a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %} , {% endif %}
7174
{% endfor %}
7275
{% if group.ad_out_of_area %}(Assigned AD: <a href="mailto:{{ group.ad_role.email.address }}">{{ group.ad_role.person.plain_name }}</a>){% endif %}
7376
</td>

‎ietf/utils/test_data.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,11 @@ def make_immutable_base_data():
9999

100100
# second area
101101
opsarea = create_group(name="Operations", acronym="ops", type_id="area", parent=ietf)
102-
create_person(opsarea, "ad")
102+
ops_ad = create_person(opsarea, "ad")
103103
sops = create_group(name="Server Operations", acronym="sops", type_id="wg", parent=opsarea)
104104
create_person(sops, "chair", name="Sops Chairman", username="sopschairman")
105105
create_person(sops, "secr", name="Sops Secretary", username="sopssecretary")
106+
Role.objects.create(name_id='ad', group=sops, person=ops_ad, email=ops_ad.email())
106107

107108
# create a bunch of ads for swarm tests
108109
for i in range(1, 10):

0 commit comments

Comments
 (0)