altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Changed mentions of people with roles on the various group pages to link to both their profile page and their email address.

Browse source 
- Legacy-Id: 13664
This commit is contained in:
Henrik Levkowetz 2017-06-17 17:05:38 +00:00
parent bb089c182d
commit e6c8b6621c
7 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/static/ietf/css/ietf.css
View file

@ -430,6 +430,10 @@ td.area-director div { border-bottom: solid #ccc 1px; }
h1 small .pull-right { margin-top: 10.5px; }
/* from bootstrap: .small { font-size: 84%; } */
.tiny { font-size: 70%; }
.large {font-size: 120%;}
.llarge {font-size: 144%;}
.lllarge {font-size: 172.8%;}

9
ietf/templates/group/active_ags.html
View file

@ -28,17 +28,20 @@
<td>{{ group.name }}</td>
<td>
{% for ad in group.ads %}
<a href="mailto:{{ ad.email.address }}">{{ ad.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'ietf.person.views.profile' email_or_name=ad.person.name %}">{{ ad.person.plain_name }}
</a><a href="mailto:{{ ad.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %}, {% endif %}
{% endfor %}
</td>
<td>
{% for secretary in group.secretaries %}
<a href="mailto:{{ secretary.email.address }}">{{ secretary.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'ietf.person.views.profile' email_or_name=secretary.personname %}">{{ secretary.person.plain_name }}
</a><a href="mailto:{{ secretary.email.address }}"><span class="fa fa-envelope-o tiny"></span></a> {% if not forloop.last %}, {% endif %}
{% endfor %}
</td>
<td>
{% for chair in group.chairs %}
<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}
</a><a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %}, {% endif %}
{% endfor %}
</td>
</tr>

9
ietf/templates/group/active_dirs.html
View file

@ -31,17 +31,20 @@
<td><a href="{% url "ietf.group.views.group_home" acronym=group.parent.acronym %}">{{ group.parent.acronym }}</a></td>
<td>
{% for ad in group.ads %}
<a href="mailto:{{ ad.email.address }}">{{ ad.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'ietf.person.views.profile' email_or_name=ad.person.name %}">{{ ad.person.plain_name }}
</a><a href="mailto:{{ ad.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %}, {% endif %}
{% endfor %}
</td>
<td>
{% for secretary in group.secretaries %}
<a href="mailto:{{ secretary.email.address }}">{{ secretary.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'ietf.person.views.profile' email_or_name=secretary.personname %}">{{ secretary.person.plain_name }}</a>
<a href="mailto:{{ secretary.email.address }}"><span class="fa fa-envelope-o tiny"></span></a> {% if not forloop.last %}, {% endif %}
{% endfor %}
</td>
<td>
{% for chair in group.chairs %}
<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}</a>
<a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %}, {% endif %}
{% endfor %}
</td>
</tr>

11
ietf/templates/group/active_rgs.html
View file

@ -13,7 +13,10 @@
<h1>Active IRTF research groups</h1>
<h2>IRTF chair</h2>
<p><a href="mailto:irtf-chair@irtf.org">{{ irtf.chair.person.plain_name }}</a></p>
<p>
<a href="mailto:{{ irtf.chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>
<a href="{% url 'ietf.person.views.profile' email_or_name=irtf.chair.person.name %}">{{ irtf.chair.person.plain_name }}</a>
</p>
<h2>Active research groups</h2>
<a class="btn btn-default" href="{% url "ietf.group.views.all_status" %}">Status Reports</a>
@ -32,7 +35,11 @@
<tr>
<td><a href="{% url "ietf.group.views.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
<td>{{ group.name }}</td>
<td>{% for chair in group.chairs %}<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
<td>
{% for chair in group.chairs %}
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}</a>
<a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %} , {% endif %}
{% endfor %}</td>
</tr>
{% endfor %}
</tbody>

3
ietf/templates/group/active_teams.html
View file

@ -27,7 +27,8 @@
<td>{{ group.name }}</td>
<td>
{% for chair in group.chairs %}
<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}</a>
<a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %} , {% endif %}
{% endfor %}
</td>
</tr>

9
ietf/templates/group/active_wgs.html
View file

@ -30,7 +30,8 @@
<ul class="list-unstyled">
{% for ad in area.ads %}
<li>
{{ ad.person.plain_name }} (<a href="mailto:{{ ad.email.address }}">{{ ad.email.address }}</a>)
<a href="mailto:{{ ad.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>
<a href="{% url 'ietf.person.views.profile' email_or_name=ad.person.name %}">{{ ad.person.plain_name }}</a>
{% if ad.name == "pre-ad" %} (Incoming AD){% endif %}
</li>
{% endfor %}
@ -62,12 +63,14 @@
<tr>
<td><a href="{% url "ietf.group.views.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
<td>
<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>
<a href="mailto:{{ group.ad_role.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>
<a href="{% url 'ietf.person.views.profile' email_or_name=group.ad_role.person.name %}">{{ group.ad_role.person.plain_name.split.0 }}</a>
</td>
<td>{{ group.name }}</td>
<td>
{% for chair in group.chairs %}
<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'ietf.person.views.profile' email_or_name=chair.person.name %}">{{ chair.person.plain_name }}</a>
<a href="mailto:{{ chair.email.address }}"><span class="fa fa-envelope-o tiny"></span></a>{% if not forloop.last %} , {% endif %}
{% endfor %}
{% if group.ad_out_of_area %}(Assigned AD: <a href="mailto:{{ group.ad_role.email.address }}">{{ group.ad_role.person.plain_name }}</a>){% endif %}
</td>

3
ietf/utils/test_data.py
View file

@ -99,10 +99,11 @@ def make_immutable_base_data():
# second area
opsarea = create_group(name="Operations", acronym="ops", type_id="area", parent=ietf)
create_person(opsarea, "ad")
ops_ad = create_person(opsarea, "ad")
sops = create_group(name="Server Operations", acronym="sops", type_id="wg", parent=opsarea)
create_person(sops, "chair", name="Sops Chairman", username="sopschairman")
create_person(sops, "secr", name="Sops Secretary", username="sopssecretary")
Role.objects.create(name_id='ad', group=sops, person=ops_ad, email=ops_ad.email())
# create a bunch of ads for swarm tests
for i in range(1, 10):