Skip to content

Commit 56e1cc2

Browse files
levkowetzlevkowetz
committed
Added a colour indication to the Area/WG overview page showing responsible AD for each WG. Also some html reformatting for better readability.
 - Legacy-Id: 3623
1 parent e308b55 commit 56e1cc2

2 files changed

Lines changed: 56 additions & 40 deletions

File tree

‎ietf/templates/wginfo/wg-dir.html‎

Lines changed: 47 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -44,49 +44,56 @@
4444
{% block content %}
4545
<h1>Active IETF Working Groups</h1>
4646

47-
<p>See also: <a href="http://www.ietf.org/wg/concluded/">Concluded
48-
Working Groups (www.ietf.org)</a>, <a href="http://tools.ietf.org/wg/concluded/">Concluded Working Groups (tools.ietf.org)</a>, <a href="http://www.ietf.org/dyn/wg/charter/history/">Historic Charters</a>.</p>
47+
<p>See also:
48+
<a href="http://www.ietf.org/wg/concluded/">Concluded Working Groups (www.ietf.org)</a>,
49+
<a href="http://tools.ietf.org/wg/concluded/">Concluded Working Groups (tools.ietf.org)</a>,
50+
<a href="http://www.ietf.org/dyn/wg/charter/history/">Historic Charters</a>.
51+
</p>
4952

50-
{% for area in areas|dictsort:"area_acronym.name" %}
51-
<h2 class="ietf-divider" id="{{area.area_acronym.name|cut:" "}}">{{ area.area_acronym.name }}</h2>
53+
{% for area in areas|dictsort:"area_acronym.name" %}
54+
<h2 class="ietf-divider" id="{{area.area_acronym.name|cut:" "}}">{{ area.area_acronym.name }}</h2>
5255

53-
{% for ad in area.areadirector_set.all|dictsort:"person.last_name" %}
54-
{% if forloop.first %}
55-
<p>Area Director{{ forloop.revcounter|pluralize }}:</p>
56-
<p style="margin-left: 2em">
57-
{% endif %}
58-
<a href="mailto:{{ ad.person.email.1 }}">{{ ad.person }} &lt;{{ ad.person.email.1 }}&gt;</a>{% if not forloop.last %}<br/>{% endif %}
59-
{% if forloop.last %}
60-
</p>
61-
{% endif %}
62-
{% endfor %}
56+
{% for ad in area.areadirector_set.all|dictsort:"person.last_name" %}
57+
{% if forloop.first %}
58+
<p>Area Director{{ forloop.revcounter|pluralize }}:</p>
59+
<p style="margin-left: 2em">
60+
{% endif %}
61+
<span class="square bgcolor{{forloop.counter}}">&nbsp;</span>&nbsp;<a href="mailto:{{ ad.person.email.1 }}">{{ ad.person }} &lt;{{ ad.person.email.1 }}&gt;</a>{% if not forloop.last %}<br/>{% endif %}
62+
{% if forloop.last %}
63+
</p>
64+
{% endif %}
65+
{% endfor %}
6366

64-
{% for url in area.additional_urls %}
65-
{% if forloop.first %}
66-
<p>Area Specific Web Page{{ forloop.revcounter|pluralize}}:</p>
67-
<p style="margin-left: 2em">
68-
{% endif %}
69-
<a href="{{url.url}}">{{ url.description }}</a>{% if not forloop.last %}<br/>{% endif %}
70-
{% if forloop.last %}
71-
</p>
72-
{% endif %}
73-
{% endfor %}
67+
{% for url in area.additional_urls %}
68+
{% if forloop.first %}
69+
<p>Area Specific Web Page{{ forloop.revcounter|pluralize}}:</p>
70+
<p style="margin-left: 2em">
71+
{% endif %}
72+
<a href="{{url.url}}">{{ url.description }}</a>{% if not forloop.last %}<br/>{% endif %}
73+
{% if forloop.last %}
74+
</p>
75+
{% endif %}
76+
{% endfor %}
7477

75-
{% for wg in area.active_wgs %}
76-
{% if forloop.first %}
77-
<p>Active Working Groups:</p>
78-
<div style="margin-left:2em;">
79-
<table class="ietf-wg-table">
80-
{% endif %}
81-
<tr><td width="10%;"><a href="/wg/{{wg}}/">{{ wg }}</a></td><td width="50%">{{ wg.group_acronym.name }}</td>
82-
<td width="39%">{% for chair in wg.chairs %}<a href="mailto:{{chair.person.email.1}}">{{chair.person}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td></tr>
83-
{% if forloop.last %}
84-
</table>
85-
</div>
86-
{% endif %}
87-
{% empty %}
88-
<p>No Active Working Groups</p>
89-
{% endfor %}{# wg #}
78+
{% for wg in area.active_wgs %}
79+
{% if forloop.first %}
80+
<p>Active Working Groups:</p>
81+
<div style="margin-left:2em;">
82+
<table class="ietf-wg-table">
83+
{% endif %}
84+
<tr>
85+
<td width="10%;"><a href="/wg/{{wg}}/">{{ wg }}</a></td>
86+
<td width="1%">{% for ad in area.areadirector_set.all|dictsort:"person.last_name" %}{% ifequal ad wg.area_director %}<span class="square bgcolor{{forloop.counter}}">&nbsp;</span>{% endifequal %}{% endfor %}</td>
87+
<td width="50%">{{ wg.group_acronym.name }}</td>
88+
<td width="39%">{% for chair in wg.chairs %}<a href="mailto:{{chair.person.email.1}}">{{chair.person}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
89+
</tr>
90+
{% if forloop.last %}
91+
</table>
92+
</div>
93+
{% endif %}
94+
{% empty %}
95+
<p>No Active Working Groups</p>
96+
{% endfor %}{# wg #}
9097

91-
{% endfor %}{# area #}
98+
{% endfor %}{# area #}
9299
{% endblock %}

‎static/css/base2.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,12 @@ form table .help {
159159
}
160160

161161
@media print { .noprint { display: none } }
162+
163+
.color1 { color: #ffb000; }
164+
.color2 { color: #00ffff; }
165+
.bgcolor1 { background-color: #ffb000; }
166+
.bgcolor2 { background-color: #00ffff; }
167+
.square { width: 0.8ex; height: 0.8ex; margin: 0; padding: 0; display: inline-block; position: relative; top: 0.8ex }
168+
.big { font-size: 109.5%; margin: 0; padding: 0; }
169+
.large { font-size: 120%; margin: 0; padding: 0; }
170+
.huge { font-size: 144%; margin: 0; padding: 0; }

0 commit comments

Comments
 (0)