Skip to content

Commit 611e94a

Browse files
pasieronenpasieronen
committed
First try at /wg/acronym/ pages; updated /wg/ list
 - Legacy-Id: 2009
1 parent 0cd1d1d commit 611e94a

7 files changed

Lines changed: 334 additions & 47 deletions

File tree

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

Lines changed: 19 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,50 @@
1-
{% extends "base.html" %}
1+
{% extends "idrfc/base.html" %}
22
{# Copyright The IETF Trust 2009, All Rights Reserved #}
33

44
{% block title %} Active IETF Working Groups {% endblock %}
55

66
{% block content %}
7-
<hr/>
87
<h1>Active IETF Working Groups</h1>
9-
<hr/>
10-
<p>
11-
Old WG pages can be found in
12-
the <a href="http://www.ietf.org/wg/concluded/index.html">Concluded
13-
Working Groups</a>.
14-
</p>
15-
<p>
16-
Archived WG Charters can be found in
17-
the <a href="http://www.ietf.org/dyn/wg/charter/history/">Historic
18-
Charters page</a>.
8+
9+
<p>See also: <a href="http://www.ietf.org/wg/concluded/index.html">Concluded
10+
Working Groups</a> and <a href="http://www.ietf.org/dyn/wg/charter/history/">Historic Charters</a>.
1911
</p>
20-
<hr/>
21-
<h2>Table of Contents</h2>
22-
<ul>
12+
2313
{% regroup wg_list|dictsort:"area.area.area_acronym.acronym" by area.area as wga_list %}
14+
2415
{% for area in wga_list %}
2516
{% for wg in area.list|dictsort:"group_acronym.acronym" %}
2617
{% ifequal wg.area.area.status_id 1 %}
2718
{% if forloop.first %}
28-
<li><a href="#{{ wg.area_acronym.name|cut:" " }}">{{ wg.area_acronym.name }}</a></li>
29-
{% endif %}
30-
{% endifequal %}
31-
{% endfor %}
32-
{% endfor %}
33-
</ul>
34-
{% for area in wga_list %}
35-
{% for wg in area.list|dictsort:"group_acronym.acronym" %}
36-
{% ifequal wg.area.area.status_id 1 %}
37-
{% if forloop.first %}
38-
<hr/>
19+
3920
<a name="{{ wg.area_acronym.name|cut:" " }}"></a>
40-
<h2>{{ wg.area_acronym.name }}</h2>
21+
<h2 style="background:#2647a0;color:white;padding:0.5em 1em;font-size:116%">{{ wg.area_acronym.name }}</h2>
22+
4123
{% for ad in wg.area_directors %}
4224
{% if forloop.first %}
4325
<p>Area Director{{ forloop.revcounter|pluralize }}:</p>
44-
<ul>
45-
{% endif %}
46-
<li><a href="mailto:{{ ad.person.email.1|escape }}">{{ ad.person }} &lt;{{ ad.person.email.1 }}&gt;</a></li>
47-
{% endfor %}
48-
</ul>
49-
{% for url in wg.area.area.urls.all %}
50-
{% if forloop.first %}
51-
<p>Additional Area Information:</p>
52-
<ul>
26+
<p style="margin-left: 2em">
5327
{% endif %}
54-
<li><a href="{{url.url}}">{{url.url_label}}</a></li>
28+
<a href="mailto:{{ ad.person.email.1 }}">{{ ad.person }} &lt;{{ ad.person.email.1 }}&gt;</a>{% if not forloop.last %}<br/>{% endif %}
5529
{% if forloop.last %}
56-
</ul>
30+
</p>
5731
{% endif %}
5832
{% endfor %}
59-
<p>Working Groups:</p>
60-
<table>
61-
<colgroup align="center">
62-
<col width="10%"/>
63-
<col width="10%"/>
64-
<col width="80%"/>
65-
</colgroup>
33+
34+
<p>Active Working Groups:</p>
35+
<div style="margin-left:2em;">
36+
<table width="100%" style="max-width:50em;">
6637
{% endif %}
6738
{% if wg.start_date %}
68-
<tr><td></td><td><a href="http://www.ietf.org/dyn/wg/charter/{{ wg|escape }}-charter.html">{{ wg|escape }}</a></td><td>{{ wg.group_acronym.name|escape }}</td></tr>
39+
<tr valign="top"><td width="10%;"><a href="/wg/{{wg}}/">{{ wg }}</a></td><td width="50%">{{ wg.group_acronym.name }}</td>
40+
<td width="39%">{% for chair in wg.chairs %}<a href="mailto:{{chair.person.email}}">{{chair.person}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td></tr>
6941
{% endif %}
7042
{% if forloop.last %}
7143
</table>
44+
</div>
7245
{% endif %}
7346
{% endifequal %}
7447
{% endfor %}
7548
{% endfor %}
7649

77-
7850
{% endblock %}

‎ietf/templates/wginfo/wg_base.html‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{% extends "idrfc/base.html" %}
2+
{% comment %}
3+
Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4+
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions
8+
are met:
9+
10+
* Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
* Redistributions in binary form must reproduce the above
14+
copyright notice, this list of conditions and the following
15+
disclaimer in the documentation and/or other materials provided
16+
with the distribution.
17+
18+
* Neither the name of the Nokia Corporation and/or its
19+
subsidiary(-ies) nor the names of its contributors may be used
20+
to endorse or promote products derived from this software
21+
without specific prior written permission.
22+
23+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
24+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
25+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
26+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
28+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
29+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
33+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34+
{% endcomment %}
35+
{% load ietf_filters %}
36+
{% block title %}{{wg.group_acronym.name}} ({{wg.group_acronym.acronym}}) - {% block wg_titledetail %}{% endblock %}{% endblock %}
37+
38+
{% block morecss %}
39+
.ietf-navset {
40+
background:#214197 url(/images/yui/sprite.png) repeat-x left -1400px;
41+
color:white;
42+
border:1px solid black;
43+
padding:4px;
44+
}
45+
.ietf-navset .selected { font-weight:bold; padding: 0 3px; }
46+
.ietf-navset a, .ietf-navset a:visited { color: white; padding:0 3px; }
47+
{% endblock morecss %}
48+
49+
{% block content %}
50+
<h1>{{wg.group_acronym.name}} ({{wg.group_acronym.acronym}})</h1>
51+
52+
<div class="ietf-navset">
53+
{% ifequal selected "documents" %}<span class="selected">Documents</span>{% else %}<a href="/wg/{{wg}}/">Documents</a>{% endifequal %} |
54+
{% ifequal selected "charter" %}<span class="selected">Charter</span>{% else %}<a href="/wg/{{wg}}/charter/">Charter</a>{% endifequal %} |
55+
<a href="{{ wg.email_archive }}">List Archive</a> |
56+
<a href="http://tools.ietf.org/wg/{{wg}}/">Tools WG Page</a>
57+
</div>
58+
59+
{% block wg_content %}
60+
{% endblock wg_content %}
61+
62+
{% endblock content %}

‎ietf/templates/wginfo/wg_charter.html‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
{% extends "wginfo/wg_base.html" %}
2+
{% comment %}
3+
Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4+
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions
8+
are met:
9+
10+
* Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
* Redistributions in binary form must reproduce the above
14+
copyright notice, this list of conditions and the following
15+
disclaimer in the documentation and/or other materials provided
16+
with the distribution.
17+
18+
* Neither the name of the Nokia Corporation and/or its
19+
subsidiary(-ies) nor the names of its contributors may be used
20+
to endorse or promote products derived from this software
21+
without specific prior written permission.
22+
23+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
24+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
25+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
26+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
28+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
29+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
33+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34+
{% endcomment %}
35+
{% load ietf_filters %}
36+
37+
{% block wg_titledetail %}Charter{% endblock %}
38+
39+
{% block wg_content %}
40+
41+
<div style="background:#edf5ff;border:1px solid #cccccc;float:right;padding: 4px;margin-top:16px;">
42+
43+
<table>
44+
<tr>
45+
<td colspan="2">
46+
<b>Personnel</b>
47+
</td>
48+
</tr>
49+
50+
<tr valign="top">
51+
<td style="width:14ex;">Chair{{ wg.chairs.count|pluralize:",s" }}:</td>
52+
<td>
53+
{% for chair in wg.chairs %}
54+
<a href="mailto:{{ chair.person.email.1 }}">{{ chair.person|escape }} &lt;{{ chair.person.email.1 }}&gt;</a><br/>
55+
{% endfor %}
56+
</td></tr>
57+
<tr><td>Area Director:</td>
58+
<td>
59+
{% ifequal wg.area_director.person.email.1 "noreply@ietf.org" %}?{%else%}
60+
<a href="mailto:{{ wg.area_director.person.email.1 }}">{{ wg.area_director.person }} &lt;{{wg.area_director.person.email.1 }}&gt;</a>{% endifequal %}
61+
</td>
62+
</tr>
63+
{% if wg.wgtechadvisor_set.count %}
64+
<tr>
65+
<td>Tech Advisor{{ wg.wgtechadvisor_set.count|pluralize:",s" }}:</td>
66+
<td>
67+
{% for techadvisor in wg.wgtechadvisor_set.all %}
68+
<a href="mailto:{{ techadvisor.person.email.1 }}">{{ techadvisor.person }} &lt;{{ techadvisor.person.email.1 }}&gt;</a><br/>
69+
{% endfor %}
70+
</td></tr>
71+
{% endif %}
72+
{% if wg.wgeditor_set.count %}
73+
<td>Editor{{ wg.wgeditor_set.count|pluralize:",s" }}:</td>
74+
<td>
75+
{% for editor in wg.wgeditor_set.all %}
76+
<a href="mailto:{{ editor.person.email.1 }}">{{ editor.person }} &lt;{{ editor.person.email.1 }}&gt;</a><br/>
77+
{% endfor %}
78+
</td></tr>
79+
{% endif %}
80+
{% if wg.secretaries %}
81+
<tr><td>Secretar{{ wg.secretaries.count|pluralize:"y,ies" }}:</td>
82+
<td>
83+
{% for secretary in wg.secretaries %}
84+
<a href="mailto:{{ secretary.person.email.1 }}">{{ secretary.person }} &lt;{{ secretary.person.email.1 }}&gt;</a><br/>
85+
{% endfor %}
86+
</td></tr>
87+
{% endif %}
88+
89+
<tr>
90+
<td colspan="2">
91+
<br/><b>Mailing List</b>
92+
</td>
93+
</tr>
94+
95+
<tr><td>Address:</td><td><a href="mailto:{{ wg.email_address }}">{{ wg.email_address }}</a></td></tr>
96+
<tr><td>To Subscribe:</td><td<a href="{{ wg.email_subscribe }}">{{ wg.email_subscribe }}</a></td></tr>
97+
<tr><td>Archive:</td><td><a href="{{ wg.email_archive }}">{{ wg.email_archive }}</a></td></tr>
98+
99+
<tr>
100+
<td colspan="2">
101+
<br/><b>Jabber Chat</b>
102+
</td>
103+
</tr>
104+
105+
<tr><td>Room Address:</td><td><a href="xmpp:{{wg}}@jabber.ietf.org">xmpp:{{wg}}@jabber.ietf.org</a></td></tr>
106+
<tr><td>Logs:</td><td><a href="http://jabber.ietf.org/logs/{{wg}}/">http://jabber.ietf.org/logs/{{wg}}/</td></tr>
107+
108+
</table>
109+
</div>
110+
111+
<h2>Description of Working Group</h2>
112+
<p>{{ wg.charter_text|escape|format_charter|safe }}</p>
113+
114+
<h2>Goals and Milestones</h2>
115+
<table>
116+
{% for milestone in wg.milestones %}
117+
<tr>
118+
<td width="80px">
119+
{% ifequal milestone.done 'Done' %} Done
120+
{% else %}
121+
{%ifequal milestone.expected_due_date.month 1 %}Jan{% endifequal %}
122+
{%ifequal milestone.expected_due_date.month 2 %}Feb{% endifequal %}
123+
{%ifequal milestone.expected_due_date.month 3 %}Mar{% endifequal %}
124+
{%ifequal milestone.expected_due_date.month 4 %}Apr{% endifequal %}
125+
{%ifequal milestone.expected_due_date.month 5 %}May{% endifequal %}
126+
{%ifequal milestone.expected_due_date.month 6 %}Jun{% endifequal %}
127+
{%ifequal milestone.expected_due_date.month 7 %}Jul{% endifequal %}
128+
{%ifequal milestone.expected_due_date.month 8 %}Aug{% endifequal %}
129+
{%ifequal milestone.expected_due_date.month 9 %}Sep{% endifequal %}
130+
{%ifequal milestone.expected_due_date.month 10 %}Oct{% endifequal %}
131+
{%ifequal milestone.expected_due_date.month 11 %}Nov{% endifequal %}
132+
{%ifequal milestone.expected_due_date.month 12 %}Dec{% endifequal %}
133+
{{ milestone.expected_due_date.year }}
134+
{% endifequal %}
135+
</td>
136+
<td>{{ milestone.description|escape }}
137+
</td></tr>
138+
{% endfor %}
139+
</table>
140+
{% endblock wg_content %}
141+

‎ietf/templates/wginfo/wg_documents.html‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{% extends "wginfo/wg_base.html" %}
2+
{% comment %}
3+
Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4+
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions
8+
are met:
9+
10+
* Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
* Redistributions in binary form must reproduce the above
14+
copyright notice, this list of conditions and the following
15+
disclaimer in the documentation and/or other materials provided
16+
with the distribution.
17+
18+
* Neither the name of the Nokia Corporation and/or its
19+
subsidiary(-ies) nor the names of its contributors may be used
20+
to endorse or promote products derived from this software
21+
without specific prior written permission.
22+
23+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
24+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
25+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
26+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
28+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
29+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
30+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
33+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34+
{% endcomment %}
35+
{% block wg_titledetail %}Documents{% endblock %}
36+
37+
{% block wg_content %}
38+
39+
{% regroup docs by view_sort_group as grouped_docs %}
40+
41+
<table class="ietf-table ietf-doctable" style="margin-top:16px;">
42+
<tr><th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ad">Area Director</th></tr>
43+
{% for doc_group in grouped_docs %}
44+
<tr class="header"><td colspan="6">{{doc_group.grouper}}s</td></tr>
45+
46+
{% for doc in doc_group.list %}
47+
{% include "idrfc/search_result_row.html" %}
48+
{% endfor %}
49+
50+
{% endfor %}
51+
</table>
52+
53+
{% endblock wg_content %}
54+

‎ietf/wginfo/testurl.list‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
200 /wg/
2+
404 /wg/nosuchgroup/
3+
200 /wg/tls/
4+
200 /wg/tls/charter/
5+
200 /wg/mobike/ # concluded
6+
200 /wg/mobike/charter/
7+
200 /wg/catnip/ # concluded very long time ago
8+
200 /wg/catnip/charter/ # concluded very long time ago
29
200 /wg/summary.txt
310
200 /wg/1wg-summary.txt
411
200 /wg/summary-by-area.txt

‎ietf/wginfo/urls.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@
1313
(r'^(?P<wg>.*)-charter.txt', views.wg_charter_txt),
1414
(r'^1wg-charters.txt', views.wg_charters),
1515
(r'^1wg-charters-by-acronym.txt', views.wg_charters_by_acronym),
16+
(r'^(?P<acronym>[^/]+)/$', views.wg_documents),
17+
(r'^(?P<acronym>[^/]+)/charter/$', views.wg_charter2),
1618
)

0 commit comments

Comments
 (0)