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

Merged in [8856] from rjsparks@nostrum.com:

Browse source 
Show out-of-area ads on /wg/. Fixes #1555. Related to #1557.
 - Legacy-Id: 8890
Note: SVN reference [8856] has been migrated to Git commit 56f9260acb
This commit is contained in:
Henrik Levkowetz 2015-01-21 20:08:16 +00:00
parent 05b048bfc4 56f9260acb
commit 56f979b79b
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ietf/group/info.py
View file

@ -205,6 +205,7 @@ def active_wgs(request):
area.urls = area.groupurl_set.all().order_by("name")
for group in area.groups:
group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
group.ad_out_of_area = group.ad_role().person not in [role.person for role in area.ads]
# get the url for mailing list subscription
if group.list_subscribe.startswith('http'):
group.list_subscribe_url = group.list_subscribe

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

@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% block title %}Active IETF Working Groups{% endblock %}
{% block morecss %}
.ietf-wg-table { width: 100%; max-width:70em; }
.ietf-wg-table { width: 100%; max-width:80em; }
.ietf-wg-table tr { vertical-align:top; }
{% endblock morecss %}
@ -80,12 +80,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<table class="ietf-wg-table">
{% for group in area.groups %}
<tr>
<td width="8%;"><a href="{% url "ietf.group.info.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
<td width="1%">{% for ad in area.ads %}{% if ad.person_id == group.ad_role.person.id %}<span title="AD for {{ group.acronym }}: {{ ad.person }}" class="square bgcolor{{forloop.counter}}"></span>{% endif %}{% endfor %}</td>
<td width="35%">{{ group.name }}</td>
<td width="15%"><a href="{{ group.list_archive }}"><span title="Click to view list archive">{{ group.list_email }}</span></a></td>
<td width="8%"><a href="{{ group.list_subscribe_url }}">subscribe</a></td>
<td width="33%">{% for chair in group.chairs %}<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
<td width="7%;"><a href="{% url "ietf.group.info.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
<td width="1%"><span title="AD for {{ group.acronym }}: {{ group.ad_role.person }}" class="square {% if group.ad_out_of_area %}bgcolor3{% else %}{% for ad in area.ads %}{% if ad.person_id == group.ad_role.person.id %}bgcolor{{forloop.counter}}{% endif %}{% endfor %}{% endif %} "></span></td>
<td width="31%">{{ group.name }}</td>
<td width="13%"><a href="{{ group.list_archive }}"><span title="Click to view list archive">{{ group.list_email }}</span></a></td>
<td width="7%"><a href="{{ group.list_subscribe_url }}">subscribe</a></td>
<td width="41%">{% for chair in group.chairs %}<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</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>
</tr>
{% endfor %}
</table>

1
static/css/base2.css
View file

@ -188,6 +188,7 @@ form table .help, form table .helptext {
.color2 { color: #00ffff; }
.bgcolor1 { background-color: #ffb000; }
.bgcolor2 { background-color: #00ffff; }
.bgcolor3 { background-color: #f00000; }
.square { width: 0.8ex; height: 0.8ex; margin: 0; padding: 0; display: inline-block; position: relative; top: 0.8ex; }
.big { font-size: 109.5%; margin: 0; padding: 0; }
.large { font-size: 120%; margin: 0; padding: 0; }