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

Moves:

Browse source 
* announcements -> ann
 * liaisons -> liaison
 * idindex -> drafts
 * mailinglists -> list

I checked the tests and used a link checker locally, so hopefully
the fallout will be minimal.
 - Legacy-Id: 657
This commit is contained in:
Bill Fenner 2007-06-26 18:29:55 +00:00
parent 7ba839ad01
commit 8d6b0bae97
28 changed files with 136 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/announcements/testurl.list
View file

@ -1 +1 @@
200 /announcements/nomcom/1230/ https://datatracker.ietf.org/public/show_nomcom_message.cgi?id=1230
200 /ann/nomcom/1230/ https://datatracker.ietf.org/public/show_nomcom_message.cgi?id=1230

28
ietf/idindex/testurl.list
View file

@ -1,14 +1,14 @@
200 /idindex/wgdocs/1041/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
skipredirect,200 /idindex/wgdocs/idr/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
200 /idindex/wglist/I/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg&fl=I
200 /idindex/inddocs/F/ https://datatracker.ietf.org/public/idindex.cgi?command=show_ind_id&fl=F
200 /idindex/otherdocs/tools/ https://datatracker.ietf.org/public/idindex.cgi?command=show_other&cat=tools
200 /idindex/showdocs/rfc/name/ https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name
skip,200 /idindex/9574/view_related_docs/ https://datatracker.ietf.org/public/idindex.cgi?command=view_related_docs&id=9574
200 /idindex/draft-ietf-dnsext-dnssec-protocol/view_related_docs/
200 /idindex/9574/ https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
skipredirect,200 /idindex/draft-ietf-dnsext-dnssec-protocol/ https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
200 /idindex/all_id_txt.html
200 /idindex/all_id.html
skipdiff,200 /idindex/ https://datatracker.ietf.org/public/idindex.cgi?command=search_id
200 /idindex/ https://datatracker.ietf.org/public/idindex.cgi
200 /drafts/wg/1041/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
skipredirect,200 /drafts/wg/idr/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg_id&id=1041
200 /drafts/wg/I/ https://datatracker.ietf.org/public/idindex.cgi?command=show_wg&fl=I
200 /drafts/ind/F/ https://datatracker.ietf.org/public/idindex.cgi?command=show_ind_id&fl=F
200 /drafts/other/tools/ https://datatracker.ietf.org/public/idindex.cgi?command=show_other&cat=tools
200 /drafts/rfc/?sort=name https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name
skipdiff,200 /drafts/9574/related/ https://datatracker.ietf.org/public/idindex.cgi?command=view_related_docs&id=9574
200 /drafts/draft-ietf-dnsext-dnssec-protocol/related/
200 /drafts/9574/ https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
skipredirect,200 /drafts/draft-ietf-dnsext-dnssec-protocol/ https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&id=9574
200 /drafts/all_id_txt.html
200 /drafts/all_id.html
skipdiff,200 /drafts/ https://datatracker.ietf.org/public/idindex.cgi?command=search_id
200 /drafts/ https://datatracker.ietf.org/public/idindex.cgi

19
ietf/idindex/urls.py
View file

@ -13,14 +13,17 @@ info_dict = {
}
urlpatterns = patterns('',
(r'^wgdocs/(?P<id>\d+)/$', views.wgdocs),
(r'^wgdocs/(?P<slug>[^/]+)/$', views.wgdocs),
(r'^wglist/(?P<wg>[^/]+)/$', views.wglist),
(r'^inddocs/(?P<filter>[^/]+)/$', views.inddocs),
(r'^otherdocs/(?P<cat>[^/]+)/$', views.otherdocs),
(r'^showdocs/(?P<cat>[^/]+)/((?P<sortby>[^/]+)/)?$', views.showdocs),
(r'^(?P<id>\d+)/view_related_docs/$', views.view_related_docs),
(r'^(?P<slug>[^/]+)/view_related_docs/$', views.view_related_docs),
(r'^wg/(?P<id>\d+)/$', views.wgdocs),
(r'^wg/(?P<slug>[^/]+)/$', views.wgdocs),
(r'^ind/(?P<filter>[^/]+)/$', views.inddocs),
(r'^other/(?P<cat>[^/]+)/$', views.otherdocs),
# (?P<cat>(?:all|rfc|current|dead)) really confuses reverse()
(r'^(?P<cat>all)/$', views.showdocs),
(r'^(?P<cat>rfc)/$', views.showdocs),
(r'^(?P<cat>current)/$', views.showdocs),
(r'^(?P<cat>dead)/$', views.showdocs),
(r'^(?P<id>\d+)/related/$', views.view_related_docs),
(r'^(?P<slug>[^/]+)/related/$', views.view_related_docs),
(r'^(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', info_dict),
(r'^(?P<slug>[^/]+)/$', 'django.views.generic.list_detail.object_detail', dict(info_dict, slug_field='filename')),
(r'^all_id_txt.html$', views.all_id, { 'template_name': 'idindex/all_id_txt.html' }),

30
ietf/idindex/views.py
View file

@ -11,23 +11,24 @@ from ietf.utils import orl, flattenl
base_extra = { 'alphabet': alphabet, 'orgs': orgs }
def wglist(request, wg=None):
if wg == 'other':
queryset = IETFWG.objects.filter(
orl([Q(group_acronym__acronym__istartswith="%d" % i) for i in range(0,10)])
)
else:
queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
queryset = queryset.filter(group_type__type='WG').select_related().order_by('status_id', 'acronym.acronym')
return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=base_extra)
def wgdocs(request, **kwargs):
if kwargs.has_key('id'):
queryset = InternetDraft.objects.filter(group=kwargs['id'])
group = Acronym.objects.get(acronym_id=kwargs['id'])
else:
queryset = InternetDraft.objects.filter(group__acronym=kwargs['slug'])
group = Acronym.objects.get(acronym=kwargs['slug'])
wg = kwargs['slug']
try:
group = Acronym.objects.get(acronym=wg)
except Acronym.DoesNotExist: # try a search
if wg == 'other':
queryset = IETFWG.objects.filter(
orl([Q(group_acronym__acronym__istartswith="%d" % i) for i in range(0,10)])
)
else:
queryset = IETFWG.objects.filter(group_acronym__acronym__istartswith=wg)
queryset = queryset.filter(group_type__type='WG').select_related().order_by('status_id', 'acronym.acronym')
return object_list(request, queryset=queryset, template_name='idindex/wglist.html', allow_empty=True, extra_context=base_extra)
queryset = InternetDraft.objects.filter(group__acronym=wg)
queryset = queryset.order_by('status_id', 'filename')
extra = base_extra
extra['group'] = group
@ -62,7 +63,7 @@ def otherdocs(request, cat=None):
extra['category'] = cat
return object_list(request, queryset=queryset, template_name='idindex/otherdocs.html', allow_empty=True, extra_context=extra)
def showdocs(request, cat=None, sortby=None):
def showdocs(request, cat=None):
catmap = {
'all': { 'extra': { 'header': 'All' } },
'current': { 'extra': { 'header': 'Current', 'norfc': 1 },
@ -81,7 +82,8 @@ def showdocs(request, cat=None, sortby=None):
'': { 'header': "WHA?",
'fields': ['filename'] },
}
if sortby is None:
sortby = request.GET.get('sort', 'name')
if not(sortmap.has_key(sortby)):
sortby = 'name'
queryset = InternetDraft.objects.all()
if catmap[cat].has_key('query'):

14
ietf/liaisons/testurl.list
View file

@ -1,7 +1,7 @@
200 /liaisons/ https://datatracker.ietf.org/public/liaisons.cgi
200 /liaisons/321/ https://datatracker.ietf.org/public/liaison_detail.cgi?detail_id=321
200 /liaisons/managers/ https://datatracker.ietf.org/public/liaison_managers_list.cgi
200 /liaisons/help/to_ietf/ https://datatracker.ietf.org/public/liaison_guide_to_ietf.cgi
200 /liaisons/help/from_ietf/ https://datatracker.ietf.org/public/liaison_guide_from_ietf.cgi
200 /liaisons/help/fields/ https://datatracker.ietf.org/public/liaison_field_help.cgi
200 /liaisons/help/
200 /liaison/ https://datatracker.ietf.org/public/liaisons.cgi
200 /liaison/321/ https://datatracker.ietf.org/public/liaison_detail.cgi?detail_id=321
200 /liaison/managers/ https://datatracker.ietf.org/public/liaison_managers_list.cgi
200 /liaison/help/to_ietf/ https://datatracker.ietf.org/public/liaison_guide_to_ietf.cgi
200 /liaison/help/from_ietf/ https://datatracker.ietf.org/public/liaison_guide_from_ietf.cgi
200 /liaison/help/fields/ https://datatracker.ietf.org/public/liaison_field_help.cgi
200 /liaison/help/

14
ietf/mailinglists/testurl.list
View file

@ -1,8 +1,8 @@
200 /mailinglists/area_lists/ https://datatracker.ietf.org/public/area_mailing_list.cgi
200 /mailinglists/nonwg_lists/ https://datatracker.ietf.org/public/nwg_list.cgi
200 /mailinglists/nonwg_lists/submit/ https://datatracker.ietf.org/public/nwg_list_submit.cgi
200 /mailinglists/request/ https://datatracker.ietf.org/public/request_list.cgi
skipredirect,200 /mailinglists/request/help/short_desc/ https://datatracker.ietf.org/public/desc.cgi?id=1
skipredirect,200 /mailinglists/request/help/long_desc/ https://datatracker.ietf.org/public/desc.cgi?id=2
200 /list/area/ https://datatracker.ietf.org/public/area_mailing_list.cgi
200 /list/nonwg/ https://datatracker.ietf.org/public/nwg_list.cgi
200 /list/nonwg/update/ https://datatracker.ietf.org/public/nwg_list_submit.cgi
200 /list/request/ https://datatracker.ietf.org/public/request_list.cgi
skipredirect,200 /list/help/short_desc/ https://datatracker.ietf.org/public/desc.cgi?id=1
skipredirect,200 /list/help/long_desc/ https://datatracker.ietf.org/public/desc.cgi?id=2
# This is an ancient testing entry
200 /mailinglists/approve/20A0p492qbq04067/ https://datatracker.ietf.org/public/request_area_confirm.cgi?mailing_list_id=20A0p492qbq04067
200 /list/approve/20A0p492qbq04067/ https://datatracker.ietf.org/public/request_area_confirm.cgi?mailing_list_id=20A0p492qbq04067

8
ietf/mailinglists/urls.py
View file

@ -5,12 +5,12 @@ from ietf.mailinglists.models import NonWgMailingList
#from ietf.mailinglists.forms import NonWgStep1
urlpatterns = patterns('django.views.generic.list_detail',
(r'^area_lists/$', 'object_list', { 'queryset': Area.objects.filter(status=1).select_related().order_by('acronym.acronym'), 'template_name': 'mailinglists/areas_list.html' }),
(r'^nonwg_lists/$', 'object_list', { 'queryset': NonWgMailingList.objects.filter(status__gt=0) }),
(r'^area/$', 'object_list', { 'queryset': Area.objects.filter(status=1).select_related().order_by('acronym.acronym'), 'template_name': 'mailinglists/areas_list.html' }),
(r'^nonwg/$', 'object_list', { 'queryset': NonWgMailingList.objects.filter(status__gt=0) }),
)
urlpatterns += patterns('',
(r'^nonwg_lists/submit/$', views.non_wg_wizard),
(r'^nonwg/update/$', views.non_wg_wizard),
(r'^request/$', views.list_req_wizard),
(r'^request/help/(?P<field>[^/]+)/$', views.list_req_help),
(r'^help/(?P<field>[^/]+)/$', views.list_req_help),
(r'^approve/(?P<object_id>[^/]+)/$', views.list_approve),
)

50
ietf/redirects/fixtures/initial_data.xml
View file

@ -2,49 +2,49 @@
<django-objects version="1.0">
<object pk="1" model="redirects.redirect">
<field type="CharField" name="cgi">public/liaisons.cgi</field>
<field type="CharField" name="url">liaisons</field>
<field type="CharField" name="url">liaison</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="2" model="redirects.redirect">
<field type="CharField" name="cgi">public/liaison_detail.cgi</field>
<field type="CharField" name="url">liaisons</field>
<field type="CharField" name="rest">%(detail_id)s/</field>
<field type="CharField" name="url">liaison</field>
<field type="CharField" name="rest">%(detail_id)s</field>
<field type="CharField" name="remove"></field>
</object>
<object pk="3" model="redirects.redirect">
<field type="CharField" name="cgi">public/liaison_managers_list.cgi</field>
<field type="CharField" name="url">liaisons/managers</field>
<field type="CharField" name="url">liaison/managers</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="4" model="redirects.redirect">
<field type="CharField" name="cgi">public/liaison_guide_to_ietf.cgi</field>
<field type="CharField" name="url">liaisons/help/to_ietf</field>
<field type="CharField" name="url">liaison/help/to_ietf</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="5" model="redirects.redirect">
<field type="CharField" name="cgi">public/liaison_guide_from_ietf.cgi</field>
<field type="CharField" name="url">liaisons/help/from_ietf</field>
<field type="CharField" name="url">liaison/help/from_ietf</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="6" model="redirects.redirect">
<field type="CharField" name="cgi">public/liaison_field_help.cgi</field>
<field type="CharField" name="url">liaisons/help/fields</field>
<field type="CharField" name="url">liaison/help/fields</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="7" model="redirects.redirect">
<field type="CharField" name="cgi">public/idindex.cgi</field>
<field type="CharField" name="url">idindex</field>
<field type="CharField" name="url">drafts</field>
<field type="CharField" name="rest">%(id)s/%(command)s</field>
<field type="CharField" name="remove">id_detail</field>
</object>
<object pk="8" model="redirects.redirect">
<field type="CharField" name="cgi">public/show_nomcom_message.cgi</field>
<field type="CharField" name="url">announcements/nomcom</field>
<field type="CharField" name="url">ann/nomcom</field>
<field type="CharField" name="rest">%(id)s</field>
<field type="CharField" name="remove"></field>
</object>
@ -140,43 +140,43 @@
</object>
<object pk="24" model="redirects.redirect">
<field type="CharField" name="cgi">public/all_id.cgi</field>
<field type="CharField" name="url">idindex/all_id_txt.html</field>
<field type="CharField" name="url">drafts/all_id_txt.html</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="25" model="redirects.redirect">
<field type="CharField" name="cgi">public/all_id_html.cgi</field>
<field type="CharField" name="url">idindex/all_id.html</field>
<field type="CharField" name="url">drafts/all_id.html</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="26" model="redirects.redirect">
<field type="CharField" name="cgi">public/area_mailing_list.cgi</field>
<field type="CharField" name="url">mailinglists/area_lists/</field>
<field type="CharField" name="url">list/area</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="27" model="redirects.redirect">
<field type="CharField" name="cgi">public/nwg_list.cgi</field>
<field type="CharField" name="url">mailinglists/nonwg_lists</field>
<field type="CharField" name="url">list/nonwg</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="28" model="redirects.redirect">
<field type="CharField" name="cgi">public/nwg_list_submit.cgi</field>
<field type="CharField" name="url">mailinglists/nonwg_lists/submit</field>
<field type="CharField" name="url">list/nonwg/update</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="29" model="redirects.redirect">
<field type="CharField" name="cgi">public/request_list.cgi</field>
<field type="CharField" name="url">mailinglists/request</field>
<field type="CharField" name="url">list/request</field>
<field type="CharField" name="rest"></field>
<field type="CharField" name="remove"></field>
</object>
<object pk="30" model="redirects.redirect">
<field type="CharField" name="cgi">public/desc.cgi</field>
<field type="CharField" name="url">mailinglists/request/help/</field>
<field type="CharField" name="url">list/help</field>
<field type="CharField" name="rest">%(id)s</field>
<field type="CharField" name="remove"></field>
</object>
@ -194,7 +194,7 @@
</object>
<object pk="33" model="redirects.redirect">
<field type="CharField" name="cgi">public/request_area_confirm.cgi</field>
<field type="CharField" name="url">mailinglists/approve</field>
<field type="CharField" name="url">list/approve</field>
<field type="CharField" name="rest">%(mailing_list_id)s</field>
<field type="CharField" name="remove"></field>
</object>
@ -218,21 +218,21 @@
</object>
<object pk="4" model="redirects.command">
<field type="CharField" name="command">show_ind_id</field>
<field type="CharField" name="url">inddocs</field>
<field type="CharField" name="url">ind</field>
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">2</field>
</object>
<object pk="3" model="redirects.command">
<field type="CharField" name="command">show_wg</field>
<field type="CharField" name="url">wglist</field>
<field type="CharField" name="url">wg</field>
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">2</field>
</object>
<object pk="5" model="redirects.command">
<field type="CharField" name="command">show_list</field>
<field type="CharField" name="url">showdocs</field>
<field type="CharField" name="url"></field>
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">3</field>
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">5</field>
</object>
<object pk="6" model="redirects.command">
<field type="CharField" name="command">view_state_desc</field>
@ -272,13 +272,13 @@
</object>
<object pk="13" model="redirects.command">
<field type="CharField" name="command">show_wg_id</field>
<field type="CharField" name="url">wgdocs</field>
<field type="CharField" name="url">wg</field>
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">4</field>
</object>
<object pk="14" model="redirects.command">
<field type="CharField" name="command">show_other</field>
<field type="CharField" name="url">otherdocs</field>
<field type="CharField" name="url">other</field>
<field to="redirects.redirect" name="script" rel="ManyToOneRel">7</field>
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">5</field>
</object>
@ -316,10 +316,6 @@
<field type="CharField" name="rest">%(fl)s</field>
<field type="CharField" name="remove"></field>
</object>
<object pk="3" model="redirects.suffix">
<field type="CharField" name="rest">%(cat)s/%(sort)s</field>
<field type="CharField" name="remove"></field>
</object>
<object pk="4" model="redirects.suffix">
<field type="CharField" name="rest">%(id)s</field>
<field type="CharField" name="remove"></field>

26
ietf/templates/idindex/base.html
View file

@ -8,32 +8,32 @@
<br>
<a href="ftp://ftp.ietf.org/internet-drafts/all_id.txt">TAB Delimited Format</a><br><br>
<img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"> All I-Ds &nbsp; <a href="/idindex/showdocs/all/date/">(sorted by submission date)</a> &nbsp; <a href="/idindex/showdocs/all/name/">(sorted by filename)</a><br>
<img src="/images/blue.gif" hspace="3" border="0"> All I-Ds &nbsp; <a href="{% url ietf.idindex.views.showdocs "all" %}?sort=date">(sorted by submission date)</a> &nbsp; <a href="{% url ietf.idindex.views.showdocs "all" %}?sort=name">(sorted by filename)</a><br>
<img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"> Active I-Ds &nbsp; <a href="/idindex/showdocs/current/date/">(sorted by submission date)</a> &nbsp; <a href="/idindex/showdocs/current/name/">(sorted by filename)</a><br>
<img src="/images/blue.gif" hspace="3" border="0"> Active I-Ds &nbsp; <a href="{% url ietf.idindex.views.showdocs "current" %}?sort=date">(sorted by submission date)</a> &nbsp; <a href="{% url ietf.idindex.views.showdocs "current" %}?sort=name">(sorted by filename)</a><br>
<img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"> I-Ds Published as RFCs &nbsp; <a href="/idindex/showdocs/rfc/date/">(sorted by submission date)</a> &nbsp; <a href="/idindex/showdocs/rfc/name/">(sorted by filename)</a><br>
<img src="/images/blue.gif" hspace="3" border="0"> I-Ds Published as RFCs &nbsp; <a href="{% url ietf.idindex.views.showdocs "rfc" %}?sort=date">(sorted by submission date)</a> &nbsp; <a href="{% url ietf.idindex.views.showdocs "rfc" %}?sort=name">(sorted by filename)</a><br>
<img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"> Expired/Withdrawn/Replaced I-Ds &nbsp; <a href="/idindex/showdocs/dead/date/">(sorted by submission date)</a> &nbsp; <a href="/idindex/showdocs/dead/name/">(sorted by filename)</a><br><br>
<img src="/images/blue.gif" hspace="3" border="0"> Expired/Withdrawn/Replaced I-Ds &nbsp; <a href="{% url ietf.idindex.views.showdocs "dead" %}?sort=date">(sorted by submission date)</a> &nbsp; <a href="{% url ietf.idindex.views.showdocs "dead" %}?sort=name">(sorted by filename)</a><br><br>
<img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"> IETF Working Group Drafts
<img src="/images/blue.gif" hspace="3" border="0"> IETF Working Group Drafts
{% for letter in alphabet %}
<a href="/idindex/wglist/{{ letter }}/">{{ letter.upper }}</a>
<a href="{% url ietf.idindex.views.wgdocs letter %}">{{ letter.upper }}</a>
{% endfor %}
<a href="/idindex/wglist/other/">other</a><br>
<img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"> Individual Drafts by Author Identifier
<a href="{% url ietf.idindex.views.wgdocs "other" %}">other</a><br>
<img src="/images/blue.gif" hspace="3" border="0"> Individual Drafts by Author Identifier
{% for letter in alphabet %}
<a href="/idindex/inddocs/{{ letter }}/">{{ letter.upper }}</a>
<a href="{% url ietf.idindex.views.inddocs letter %}">{{ letter.upper }}</a>
{% endfor %}
<a href="/idindex/inddocs/other/">other</a><br>
<a href="{% url ietf.idindex.views.inddocs "other" %}">other</a><br>
<img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"> Other Drafts
<img src="/images/blue.gif" hspace="3" border="0"> Other Drafts
{% for org in orgs %}
<a href="/idindex/otherdocs/{{ org.key }}/">{{ org.name.upper }}</a>
<a href="{% url ietf.idindex.views.otherdocs org.key %}">{{ org.name.upper }}</a>
{% endfor %}
<br><br>
<img src="http://www.ietf.org/images/blue.gif" hspace="3" border="0"> <a href="/idindex/">I-D Search</a>
<img src="/images/blue.gif" hspace="3" border="0"> <a href="{% url ietf.idindex.views.search %}">I-D Search</a>
{% endblock %}
{% block iddbcontent %}

2
ietf/templates/idindex/doclist.html
View file

@ -16,7 +16,7 @@
{% for draft in object_list %}
<tr bgcolor="{% cycle #efefff,#dfdfff %}">
{# use url here! #}
<td><a href="/idindex/{{ draft.filename }}/">{{ draft.filename }}-{{ draft.revision_display }}</a></td>
<td><a href="/drafts/{{ draft.filename }}/">{{ draft.filename }}-{{ draft.revision_display }}</a></td>
<td>{{ draft.revision_date }}</td>
<td>{{ draft.status }}</td>
{% if norfc %}

6
ietf/templates/idindex/internetdraft_detail.html
View file

@ -9,7 +9,7 @@
{% ifequal object.status.status "Active" %}
<li> <b><a href="http://www.ietf.org/internet-drafts/{{ object.filename }}-{{ object.revision }}.txt">View Document</a></b></li>
{% endifequal %}
<li> <b><a href="view_related_docs/">View Related Documents</a></b> (e.g., documents that replaced or were replaced by the subject I-D, and their derivatives and precursors.)</li>
<li> <b><a href="related/">View Related Documents</a></b> (e.g., documents that replaced or were replaced by the subject I-D, and their derivatives and precursors.)</li>
{% ifequal object.group.acronym "none" %}
{% else %}
<li> <b>IETF Working Group: <a href="http://www.ietf.org/html.charters/{{ object.group.acronym }}-charter.html">{{ object.group.name }}</a></li>
@ -17,10 +17,10 @@
<li> <b>I-D Title:</b> {{ object.title }}</li>
<li> <b>I-D Status:</b> {{ object.status }}
{% ifequal object.status.status "Replaced" %}
(by <a href="/idindex/{{object.replaced_by.filename}}/">{{ object.replaced_by.filename }}</a>)
(by <a href="/drafts/{{object.replaced_by.filename}}/">{{ object.replaced_by.filename }}</a>)
{% endifequal %}
{% if object.replaces %}
(replaced <a href="/idindex/{{object.replaces.filename}}/">{{ object.replaces.filename }}</a>)
(replaced <a href="/drafts/{{object.replaces.filename}}/">{{ object.replaces.filename }}</a>)
{% endif %}
</li>
<li> <b>I-D Intended Status at Publication:</b> {{ object.intended_status }}</li>

6
ietf/templates/liaisons/field_help.html
View file

@ -11,10 +11,10 @@ where appropriate. Additional materials that may be useful in
completing this form can be found in the following documents:
<br><br>
<ul>
<li><a href="/liaisons/help/to_ietf/">Liaison Statements to the IETF: Guidelines for Completing the "To:" and "Cc:" Fields </a>
<li><a href="/liaisons/help/from_ietf/">Liaison Statements from the IETF: Guidelines for Completing the "Cc:" Field</a>
<li><a href="/liaison/help/to_ietf/">Liaison Statements to the IETF: Guidelines for Completing the "To:" and "Cc:" Fields </a>
<li><a href="/liaison/help/from_ietf/">Liaison Statements from the IETF: Guidelines for Completing the "Cc:" Field</a>
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">Active IETF Working Groups</a>
<li><a href="/liaisons/managers/">IETF Liaison Managers</a>
<li><a href="/liaison/managers/">IETF Liaison Managers</a>
</ul>
For definitive information on generating liaison statements, please see RFC 4053 (BCP 103)
<a href="http://www.ietf.org/rfc/rfc4053.txt?number=4053">"Procedures for Handling Liaison Statements to and from the IETF."</a><br><br>

10
ietf/templates/liaisons/guide_from_ietf.html
View file

@ -19,28 +19,28 @@ For definitive information on generating liaison statements, please see:<br><br>
<td><b>"Cc:" Field</b> <sup><small>(1, 2, 3)</small></sup></td></tr>
<tr>
<td><ul><li>The IAB </li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<li>The IAB Chair (if not the submitter)&lt;iab-chair@iab.org&gt;<br><br>
<li>The IAB &lt;iab@iab.org&gt;</li></td></tr>
<tr>
<td><ul><li>The IESG </li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<li>The IETF Chair (if not the submitter)&lt;chair@ietf.org&gt;<br><br>
<li>The IESG &lt;iesg@ietf.org&gt;</li></td></tr>
<tr>
<td><ul><li>The IETF </li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<li>The IETF Chair (if not the submitter)&lt;chair@ietf.org&gt;<br><br>
<li>The IESG &lt;iesg@ietf.org&gt;</li></td></tr>
<tr>
<td><ul><li>An IETF Area </li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Area Director(s)</a> (if not the submitter)<br><br>
<li>The IETF Chair &lt;chair@ietf.org&gt;<br><br>
<li>The IETF Area Directorate Mailing List (where applicable) <sup><small>(5)</small></sup></li></td></tr>
<tr>
<td><ul><li>An IETF Working Group </li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a> <sup><small>(4)</small></sup><br><br>
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Working Group Chair(s)</a> (if not the submitter)<br><br>
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Area Director(s)</a><br><br>
<li><a href="

10
ietf/templates/liaisons/guide_to_ietf.html
View file

@ -22,28 +22,28 @@ For definitive information on generating liaison statements, please see RFC 4053
<tr>
<td><ul><li>The IAB </li></td>
<td><ul><li>The IAB Chair &lt;iab-chair@iab.org&gt;</li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<li>The IAB &lt;iab@iab.org&gt;</li></td></tr>
<tr>
<td><ul><li>The IESG </li></td>
<td><ul><li>The IETF Chair &lt;chair@ietf.org&gt;</li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<li>The IESG &lt;iesg@ietf.org&gt;</li></td></tr>
<tr>
<td><ul><li>The IETF </li></td>
<td><ul><li>The IETF Chair &lt;chair@ietf.org&gt;</li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<li>The IESG &lt;iesg@ietf.org&gt;</li></td></tr>
<tr>
<td><ul><li>An IETF Area </li></td>
<td><ul><li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Area Director(s)</a></li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<li>The IETF Chair &lt;chair@ietf.org&gt;<br><br>
<li>The IETF Area Directorate Mailing List(where applicable)<sup><small>(3)</small></sup></li></td></tr>
<tr>
<td><ul><li>An IETF Working Group </li></td>
<td><ul><li><a href="http://www.ietf.org/html.charters/wg-dir.html">The Working Group Chair(s)</a></li></td>
<td><ul><li><a href="/liaisons/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<td><ul><li><a href="/liaison/managers/">The IETF Liaison Manager for the SDO</a><br><br>
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Area Director(s)</a><br><br>
<li><a href="http://www.ietf.org/html.charters/wg-dir.html">The IETF Working Group Discussion List</a></li></td></tr>
<tr>

2
ietf/templates/mailinglists/nwg_wizard.html
View file

@ -1,7 +1,7 @@
{% extends "mailinglists/nwg_wizard_base.html" %}
{% block nwgcontent %}
<a href="/mailinglists/nonwg_lists/"><b>View Current list</b></a><br>
<a href="/list/nonwg/"><b>View Current list</b></a><br>
</p><p>
<h2>Step {{ step|add:"1" }}</h2>
<form action="." method="POST">

2
ietf/templates/mailinglists/nwg_wizard_done.html
View file

@ -1,7 +1,7 @@
{% extends "mailinglists/nwg_wizard_base.html" %}
{% block nwgcontent %}
<a href="/mailinglists/nonwg_lists/"><b>View Current list</b></a><br>
<a href="/list/nonwg/"><b>View Current list</b></a><br>
</p>
<p>
Your request to {% ifequal add_edit "edit" %}edit{% else %}{% ifequal add_edit "add" %}add{% else %}delete{% endifequal %}{% endifequal %} the entry for the Non-WG Mailing List that is described below has been sent to the following Area Director for approval:</p>

2
ietf/templates/mailinglists/nwg_wizard_done_email.txt
View file

@ -1,5 +1,5 @@
The Secretariat has received a request to {% ifequal add_edit "edit" %}edit an existing entry on{% else %}{% ifequal add_edit "add" %}add a new entry to{% else %}delete an existing entry from{% endifequal %}{% endifequal %}
the "IETF Non-WG Mailing Lists" Web Page, https://datatracker.ietf.org/mailinglists/nonwg_lists/
the "IETF Non-WG Mailing Lists" Web Page, https://datatracker.ietf.org/list/nonwg/
The details of the request are provided below.
Please approve or deny this request via the "IETF Non-WG Mailing List Approval Page,"

4
ietf/templates/mailinglists/nwg_wizard_step0.html
View file

@ -32,8 +32,8 @@ function activate_nwg_widgets() {
{% endblock %}
{% block nwgcontent %}
<h4>Please use this Web tool to add a new entry to the <a href="/mailinglists/nonwg_lists/">IETF Non-WG Mailing Lists</a> Web page, to update the information on an existing entry, or to delete an existing entry.</h4>
<a href="/mailinglists/nonwg_lists/"><b>View Current list</b></a><br>
<h4>Please use this Web tool to add a new entry to the <a href="/list/nonwg/">IETF Non-WG Mailing Lists</a> Web page, to update the information on an existing entry, or to delete an existing entry.</h4>
<a href="/list/nonwg/"><b>View Current list</b></a><br>
</p><p>
<h2>Step 1</h2>

12
ietf/urls.py
View file

@ -15,15 +15,15 @@ feeds = {
}
urlpatterns = patterns('',
(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed',
(r'^feed/(?P<url>.*)/$', 'django.contrib.syndication.views.feed',
{ 'feed_dict': feeds}),
(r'^announcements/', include('ietf.announcements.urls')),
(r'^ann/', include('ietf.announcements.urls')),
(r'^idtracker/', include('ietf.idtracker.urls')),
(r'^my/', include('ietf.my.urls')),
(r'^idindex/', include('ietf.idindex.urls')),
#(r'^my/', include('ietf.my.urls')),
(r'^drafts/', include('ietf.idindex.urls')),
(r'^iesg/', include('ietf.iesg.urls')),
(r'^liaisons/', include('ietf.liaisons.urls')),
(r'^mailinglists/', include('ietf.mailinglists.urls')),
(r'^liaison/', include('ietf.liaisons.urls')),
(r'^list/', include('ietf.mailinglists.urls')),
(r'^(?P<path>public|cgi-bin)/', include('ietf.redirects.urls')),
(r'^ipr/', include('ietf.ipr.urls')),
(r'^meeting/', include('ietf.meeting.urls')),

2
test/diff/_announcements_nomcom_1230_ → test/diff/_ann_nomcom_1230_
View file

@ -1,5 +1,5 @@
--- https://datatracker.ietf.org/public/show_nomcom_message.cgi?id=1230
+++ /announcements/nomcom/1230/
+++ /ann/nomcom/1230/
@@ -3,2 +3,2 @@
-IETF Announcement Date: June 3, 2007 Subject: IETF Nomcom Appointment
-- 2007-2008

4
test/diff/_idindex_ → test/diff/_drafts_
View file

@ -1,5 +1,5 @@
--- https://datatracker.ietf.org/public/idindex.cgi
+++ /idindex/
+++ /drafts/
@@ -16,1 +16,0 @@
-I-D Exists
@@ -545,2 +544,2 @@
@ -9,4 +9,4 @@
+Tools
@@ -555,1 +554,1 @@
-Author: Last Name First Name
+Author: Last name First name
+Author: Last name First name

4
test/diff/_idindex_showdocs_rfc_name_ → test/diff/_drafts_rfc__search=name
View file

@ -1,6 +1,6 @@
--- https://datatracker.ietf.org/public/idindex.cgi?command=show_list&cat=rfc&sort=name
+++ /idindex/showdocs/rfc/name/
+++ /drafts/rfc/?sort=name
@@ -1123,0 +1123,1 @@
+draft-ietf-hubmib-etherif-MIB-06 1998-08-06 RFC 2358 I-D Exists
@@ -1124,1 +1125,0 @@
-draft-ietf-hubmib-etherif-MIB-06 1998-08-06 RFC 2358 I-D Exists
-draft-ietf-hubmib-etherif-MIB-06 1998-08-06 RFC 2358 I-D Exists

12
test/diff/_idindex__
View file

@ -1,12 +0,0 @@
--- https://datatracker.ietf.org/public/idindex.cgi?command=search_id
+++ /idindex/?
@@ -16,1 +16,0 @@
-I-D Exists
@@ -545,2 +544,2 @@
-RFC EDITOR
-TOOLS
+RFC Editor
+Tools
@@ -555,1 +554,1 @@
-Author: Last Name First Name
+Author: Last name First name

4
test/diff/_liaisons_321_ → test/diff/_liaison_321_
View file

@ -1,5 +1,5 @@
--- https://datatracker.ietf.org/public/liaison_detail.cgi?detail_id=321
+++ /liaisons/321/
+++ /liaison/321/
@@ -8,1 +8,1 @@
-IETF CCAMP WG (adrian@olddog.co.uk,dbrungard@att.com)
+IETF CCAMP WG (adrian@olddog.co.uk, dbrungard@att.com)
+IETF CCAMP WG (adrian@olddog.co.uk, dbrungard@att.com)

2
test/diff/_mailinglists_approve_20A0p492qbq04067_ → test/diff/_list_approve_20A0p492qbq04067_
View file

@ -1,5 +1,5 @@
--- https://datatracker.ietf.org/public/request_area_confirm.cgi?mailing_list_id=20A0p492qbq04067
+++ /mailinglists/approve/20A0p492qbq04067/
+++ /list/approve/20A0p492qbq04067/
@@ -1,1 +1,1 @@
-Request to move a WG email list to ietf.org
+Request to move the WG email list for ietf-acap+ to ietf.org

4
test/diff/_mailinglists_area_lists_ → test/diff/_list_area_
View file

@ -1,4 +1,4 @@
--- https://datatracker.ietf.org/public/area_mailing_list.cgi
+++ /mailinglists/area_lists/
+++ /list/area/
@@ -1,0 +1,1 @@
+
+

2
test/diff/_mailinglists_nonwg_lists_ → test/diff/_list_nonwg_
View file

@ -1,5 +1,5 @@
--- https://datatracker.ietf.org/public/nwg_list.cgi
+++ /mailinglists/nonwg_lists/
+++ /list/nonwg/
@@ -23,2 +23,2 @@
-with a WebDAV-based protocol, and to progress it ... app
-http://lists.osafoundation.org/mailman/listinfo/ietf-caldav

2
test/diff/_mailinglists_request_ → test/diff/_list_request_
View file

@ -1,4 +1,4 @@
--- https://datatracker.ietf.org/public/request_list.cgi
+++ /mailinglists/request/
+++ /list/request/
@@ -1,0 +1,1 @@
+Step 1: