Skip to content

Commit 3f6358b

Browse files
pasieronenpasieronen
committed
Removed unused /ann/nomcom/chairs/ page; fixed broken links for NomCom members and pre-2004 announcements
 - Legacy-Id: 1636
1 parent b2bc0c7 commit 3f6358b

5 files changed

Lines changed: 28 additions & 111 deletions

File tree

‎ietf/announcements/testurl.list‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
200 /ann/nomcom/
22
200 /ann/nomcom/1230/
3-
# couple that have non-ASCII characters
4-
200 /ann/nomcom/1607/
5-
200 /ann/nomcom/2001/
3+
200 /ann/nomcom/1607/ # non-ASCII content
4+
200 /ann/nomcom/2001/ # non-ASCII content

‎ietf/announcements/urls.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@
1010
urlpatterns = patterns('',
1111
# (r'^nomcom/$', 'django.views.generic.simple.redirect_to', {'url': 'http://www.ietf.org/nomcom/index.html'} ),
1212
(r'^nomcom/$', 'ietf.announcements.views.nomcom'),
13-
(r'^nomcom/chairs/', 'ietf.announcements.views.nomcom_chairs'),
1413
(r'^nomcom/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', nomcom_dict)
1514
)

‎ietf/announcements/views.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,3 @@ def nomcom(request):
3333
{ 'curr_chair' : curr_chair,
3434
'regimes' : regimes })
3535

36-
def nomcom_chairs(request):
37-
all_chairs = (ChairsHistory.objects.all().
38-
filter(chair_type='3',start_year__gt = 2003).
39-
order_by('-start_year'))
40-
41-
return render_to_response("announcements/chairs.html",
42-
{ 'chairs' : all_chairs })

‎ietf/templates/announcements/chairs.html‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎ietf/templates/announcements/nomcom.html‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h4>Committee Chair: <a href="mailto:{{ regime.chair.person.email.1 }}">{{ regim
2020
{% for ann in regime.announcements %}
2121
<tr>
2222
<td>{{ ann.announced_date|date:"Y-M-d" }}</td>
23-
<td style="max-width:50%"><a href="https://datatracker.ietf.org/ann/nomcom/{{ ann.announcement_id }}">{{ ann.subject }}</a></td>
23+
<td style="max-width:50%"><a href="/ann/nomcom/{{ ann.announcement_id }}/">{{ ann.subject }}</a></td>
2424
<td>{{ ann.announced_to }}</td>
2525
<tr>
2626
{% endfor %}
@@ -31,51 +31,49 @@ <h4>Committee Chair: <a href="mailto:{{ regime.chair.person.email.1 }}">{{ regim
3131

3232
<h3>Messages from 2003-2004 NomCom</h3>
3333
Committee Chair: <A HREF="mailto:richdr\@microsoft.com">Rich Draves</A>
34-
<br><br><li><a href="msg08-25-2003.txt">IETF Nominations Committee Chair Announcement</a> August 25, 2003
35-
<LI><a href="msg09.22.txt">NomCom call for volunteers</a> September 22, 2003<LI><A HREF="select-announce_03.txt">Selection of the Nominations Committee</A>
36-
<LI><A HREF="msg10.06.txt">NomCom Volunteer List</a> October 06, 2004
37-
<LI><A HREF="msg1010.txt">NomCom Selection</a> October 10, 2003
38-
<LI><A HREF="msg10.17.txt">Call for Nominees</a> October 17, 2003
39-
<LI><A HREF="msg10.24.txt">NomCom members</a> October 24, 2003<LI><A HREF="msg11.07.txt">NomCom at IETF</a> November 07, 2003
40-
<LI><A HREF="msg11.14.txt">NomCom News</a> November 14, 2003
41-
<LI><A HREF="msg11.26.txt">Reminder - nominations to replace Randy Bush</a> Nove
34+
<br><br><li><a href="http://www.ietf.org/old/2009/nomcom/msg08-25-2003.txt">IETF Nominations Committee Chair Announcement</a> August 25, 2003
35+
<LI><a href="http://www.ietf.org/old/2009/nomcom/msg09.22.txt">NomCom call for volunteers</a> September 22, 2003<LI><A HREF="select-announce_03.txt">Selection of the Nominations Committee</A>
36+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg10.06.txt">NomCom Volunteer List</a> October 06, 2004
37+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg1010.txt">NomCom Selection</a> October 10, 2003
38+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg10.17.txt">Call for Nominees</a> October 17, 2003
39+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg10.24.txt">NomCom members</a> October 24, 2003<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg11.07.txt">NomCom at IETF</a> November 07, 2003
40+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg11.14.txt">NomCom News</a> November 14, 2003
41+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg11.26.txt">Reminder - nominations to replace Randy Bush</a> Nove
4242
mber 26, 2003
43-
<LI><A HREF="msg12.01.txt">Randy Bush replacement schedule</a> December 01, 2003
43+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg12.01.txt">Randy Bush replacement schedule</a> December 01, 2003
4444

45-
<LI><A HREF="msg01.14.txt">Randy Bush replacement</a> January 14, 2004
46-
<LI><A HREF="msg02.13.txt">NomCom results</a> February 13, 2004
47-
<LI><A HREF="msg09.28.txt">Call for Security AD nominations</a> September 28, 2004
48-
<LI><A HREF="msg11.07.04.txt">Steve Bellovin replacement</a> November 07, 2004
45+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg01.14.txt">Randy Bush replacement</a> January 14, 2004
46+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg02.13.txt">NomCom results</a> February 13, 2004
47+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg09.28.txt">Call for Security AD nominations</a> September 28, 2004
48+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg11.07.04.txt">Steve Bellovin replacement</a> November 07, 2004
4949

5050
<h3>Messages from 2002-2003 NomCom</h3>
5151

5252
Committee Chair: <A HREF="mailto:PRoberts\@MEGISTO.com">Phil Roberts</A>
5353
<br><br>
54-
<LI><A HREF="msg19765.html">First Call for Volunteers</A> July 30, 2002
55-
<LI><A HREF="select-announce.txt">Selection of the Nominations Committee</A><LI><A HREF="msg0918.txt">Announcement of the Nominations Committee</A> September 18, 2002
56-
<LI><A HREF="msg10.21.txt">Announcement of IESG and IAB Nominations Requests</A>
54+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg19765.html">First Call for Volunteers</A> July 30, 2002
55+
<LI><A HREF="select-announce.txt">Selection of the Nominations Committee</A><LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg0918.txt">Announcement of the Nominations Committee</A> September 18, 2002
56+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg10.21.txt">Announcement of IESG and IAB Nominations Requests</A>
5757
October 21, 2002
5858

59-
<LI><A HREF="msg11.05.txt">Announcement of IESG and IAB Nominations Requests</A>
59+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg11.05.txt">Announcement of IESG and IAB Nominations Requests</A>
6060
November 5, 2002
6161

62-
<LI><A HREF="msg11.12.txt">Announcement of IESG and IAB Nominations Requests</A>
62+
<LI><A HREF="http://www.ietf.org/old/2009/nomcom/msg11.12.txt">Announcement of IESG and IAB Nominations Requests</A>
6363
November 12, 2002
64-
<LI><a href="msg02.27.txt">IETF Nomcom Announcement</a> February 27, 2003
64+
<LI><a href="http://www.ietf.org/old/2009/nomcom/msg02.27.txt">IETF Nomcom Announcement</a> February 27, 2003
6565
, 2003
66-
<LI><a href="msg06.11.txt">Announcement of IESG and IAB Nominations Request</a> June 11, 2003
67-
<LI><a href="msg07.15.txt">Nomcom result announcement</a> July 15, 2003
66+
<LI><a href="http://www.ietf.org/old/2009/nomcom/msg06.11.txt">Announcement of IESG and IAB Nominations Request</a> June 11, 2003
67+
<LI><a href="http://www.ietf.org/old/2009/nomcom/msg07.15.txt">Nomcom result announcement</a> July 15, 2003
6868

6969
<h3>Historical Information</h3>
7070

71-
<li><a href="chairs">IAB/IESG Nominating Committee Chairs (by year)</a>
71+
<li><a href="http://www.ietf.org/nomcom/committee.html">IAB/IESG Nominating Committee Members (by year)</a>
7272

73-
<li><a href="http://www.ietf.org/NomCom.html">IAB/IESG Nominating Committee Members (by year)</a>
7473
<h3>References</h3>
7574

76-
77-
<LI><A HREF="/rfc/rfc2026.txt">The Internet Standards Process (RFC 2026)</A>
78-
<LI><A HREF="/rfc/rfc3777.txt">IAB and IESG Selection, Confirmation, and Recall Process: Operation of the Nominating and Recall Committees (RFC 3777) (Also BCP10)</A>
79-
<LI><A HREF="/rfc/rfc3797.txt">Publicly Verifiable Nominations Committee (NomCom) Random Selection (RFC 3797)</A>
75+
<LI><A HREF="http://www.ietf.org/rfc/rfc2026.txt">The Internet Standards Process (RFC 2026)</A>
76+
<LI><A HREF="http://www.ietf.org/rfc/rfc3777.txt">IAB and IESG Selection, Confirmation, and Recall Process: Operation of the Nominating and Recall Committees (RFC 3777) (Also BCP10)</A>
77+
<LI><A HREF="http://www.ietf.org/rfc/rfc3797.txt">Publicly Verifiable Nominations Committee (NomCom) Random Selection (RFC 3797)</A>
8078

8179
{% endblock %}

0 commit comments

Comments
 (0)