diff --git a/ietf/announcements/testurl.list b/ietf/announcements/testurl.list index 3069d1664..06523d969 100644 --- a/ietf/announcements/testurl.list +++ b/ietf/announcements/testurl.list @@ -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 diff --git a/ietf/idindex/testurl.list b/ietf/idindex/testurl.list index f8f41da51..0ee38d096 100644 --- a/ietf/idindex/testurl.list +++ b/ietf/idindex/testurl.list @@ -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 diff --git a/ietf/idindex/urls.py b/ietf/idindex/urls.py index 3ed277822..376c1f6ba 100644 --- a/ietf/idindex/urls.py +++ b/ietf/idindex/urls.py @@ -13,14 +13,17 @@ info_dict = { } urlpatterns = patterns('', - (r'^wgdocs/(?P\d+)/$', views.wgdocs), - (r'^wgdocs/(?P[^/]+)/$', views.wgdocs), - (r'^wglist/(?P[^/]+)/$', views.wglist), - (r'^inddocs/(?P[^/]+)/$', views.inddocs), - (r'^otherdocs/(?P[^/]+)/$', views.otherdocs), - (r'^showdocs/(?P[^/]+)/((?P[^/]+)/)?$', views.showdocs), - (r'^(?P\d+)/view_related_docs/$', views.view_related_docs), - (r'^(?P[^/]+)/view_related_docs/$', views.view_related_docs), + (r'^wg/(?P\d+)/$', views.wgdocs), + (r'^wg/(?P[^/]+)/$', views.wgdocs), + (r'^ind/(?P[^/]+)/$', views.inddocs), + (r'^other/(?P[^/]+)/$', views.otherdocs), + # (?P(?:all|rfc|current|dead)) really confuses reverse() + (r'^(?Pall)/$', views.showdocs), + (r'^(?Prfc)/$', views.showdocs), + (r'^(?Pcurrent)/$', views.showdocs), + (r'^(?Pdead)/$', views.showdocs), + (r'^(?P\d+)/related/$', views.view_related_docs), + (r'^(?P[^/]+)/related/$', views.view_related_docs), (r'^(?P\d+)/$', 'django.views.generic.list_detail.object_detail', info_dict), (r'^(?P[^/]+)/$', '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' }), diff --git a/ietf/idindex/views.py b/ietf/idindex/views.py index 273ad5109..9d1d824e7 100644 --- a/ietf/idindex/views.py +++ b/ietf/idindex/views.py @@ -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'): diff --git a/ietf/liaisons/testurl.list b/ietf/liaisons/testurl.list index c4c183f6f..b31d57093 100644 --- a/ietf/liaisons/testurl.list +++ b/ietf/liaisons/testurl.list @@ -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/ diff --git a/ietf/mailinglists/testurl.list b/ietf/mailinglists/testurl.list index 5e5ebcc93..ff7e87fff 100644 --- a/ietf/mailinglists/testurl.list +++ b/ietf/mailinglists/testurl.list @@ -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 diff --git a/ietf/mailinglists/urls.py b/ietf/mailinglists/urls.py index b41068576..89bc4af79 100644 --- a/ietf/mailinglists/urls.py +++ b/ietf/mailinglists/urls.py @@ -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[^/]+)/$', views.list_req_help), + (r'^help/(?P[^/]+)/$', views.list_req_help), (r'^approve/(?P[^/]+)/$', views.list_approve), ) diff --git a/ietf/redirects/fixtures/initial_data.xml b/ietf/redirects/fixtures/initial_data.xml index f70a268b2..15b902464 100644 --- a/ietf/redirects/fixtures/initial_data.xml +++ b/ietf/redirects/fixtures/initial_data.xml @@ -2,49 +2,49 @@ public/liaisons.cgi - liaisons + liaison public/liaison_detail.cgi - liaisons - %(detail_id)s/ + liaison + %(detail_id)s public/liaison_managers_list.cgi - liaisons/managers + liaison/managers public/liaison_guide_to_ietf.cgi - liaisons/help/to_ietf + liaison/help/to_ietf public/liaison_guide_from_ietf.cgi - liaisons/help/from_ietf + liaison/help/from_ietf public/liaison_field_help.cgi - liaisons/help/fields + liaison/help/fields public/idindex.cgi - idindex + drafts %(id)s/%(command)s id_detail public/show_nomcom_message.cgi - announcements/nomcom + ann/nomcom %(id)s @@ -140,43 +140,43 @@ public/all_id.cgi - idindex/all_id_txt.html + drafts/all_id_txt.html public/all_id_html.cgi - idindex/all_id.html + drafts/all_id.html public/area_mailing_list.cgi - mailinglists/area_lists/ + list/area public/nwg_list.cgi - mailinglists/nonwg_lists + list/nonwg public/nwg_list_submit.cgi - mailinglists/nonwg_lists/submit + list/nonwg/update public/request_list.cgi - mailinglists/request + list/request public/desc.cgi - mailinglists/request/help/ + list/help %(id)s @@ -194,7 +194,7 @@ public/request_area_confirm.cgi - mailinglists/approve + list/approve %(mailing_list_id)s @@ -218,21 +218,21 @@ show_ind_id - inddocs + ind 7 2 show_wg - wglist + wg 7 2 show_list - showdocs + 7 - 3 + 5 view_state_desc @@ -272,13 +272,13 @@ show_wg_id - wgdocs + wg 7 4 show_other - otherdocs + other 7 5 @@ -316,10 +316,6 @@ %(fl)s - - %(cat)s/%(sort)s - - %(id)s diff --git a/ietf/templates/idindex/base.html b/ietf/templates/idindex/base.html index dc23f2903..3d1517de9 100644 --- a/ietf/templates/idindex/base.html +++ b/ietf/templates/idindex/base.html @@ -8,32 +8,32 @@
TAB Delimited Format

- All I-Ds   (sorted by submission date)   (sorted by filename)
+ All I-Ds   (sorted by submission date)   (sorted by filename)
- Active I-Ds   (sorted by submission date)   (sorted by filename)
+ Active I-Ds   (sorted by submission date)   (sorted by filename)
- I-Ds Published as RFCs   (sorted by submission date)   (sorted by filename)
+ I-Ds Published as RFCs   (sorted by submission date)   (sorted by filename)
- Expired/Withdrawn/Replaced I-Ds   (sorted by submission date)   (sorted by filename)

+ Expired/Withdrawn/Replaced I-Ds   (sorted by submission date)   (sorted by filename)

- IETF Working Group Drafts + IETF Working Group Drafts {% for letter in alphabet %} -{{ letter.upper }} +{{ letter.upper }} {% endfor %} -other
- Individual Drafts by Author Identifier +other
+ Individual Drafts by Author Identifier {% for letter in alphabet %} -{{ letter.upper }} +{{ letter.upper }} {% endfor %} -other
+other
- Other Drafts + Other Drafts {% for org in orgs %} -{{ org.name.upper }} +{{ org.name.upper }} {% endfor %}

- I-D Search + I-D Search {% endblock %} {% block iddbcontent %} diff --git a/ietf/templates/idindex/doclist.html b/ietf/templates/idindex/doclist.html index 048b592d2..b72d8ce59 100644 --- a/ietf/templates/idindex/doclist.html +++ b/ietf/templates/idindex/doclist.html @@ -16,7 +16,7 @@ {% for draft in object_list %} {# use url here! #} -{{ draft.filename }}-{{ draft.revision_display }} +{{ draft.filename }}-{{ draft.revision_display }} {{ draft.revision_date }} {{ draft.status }} {% if norfc %} diff --git a/ietf/templates/idindex/internetdraft_detail.html b/ietf/templates/idindex/internetdraft_detail.html index 85cc1bf78..d35b02eb5 100644 --- a/ietf/templates/idindex/internetdraft_detail.html +++ b/ietf/templates/idindex/internetdraft_detail.html @@ -9,7 +9,7 @@ {% ifequal object.status.status "Active" %}
  • View Document
    • {% endifequal %} -
  • View Related Documents (e.g., documents that replaced or were replaced by the subject I-D, and their derivatives and precursors.)
    • +
  • View Related Documents (e.g., documents that replaced or were replaced by the subject I-D, and their derivatives and precursors.)
    • {% ifequal object.group.acronym "none" %} {% else %}
  • IETF Working Group: {{ object.group.name }}
    • @@ -17,10 +17,10 @@
  • I-D Title: {{ object.title }}
  • I-D Status: {{ object.status }} {% ifequal object.status.status "Replaced" %} -(by {{ object.replaced_by.filename }}) +(by {{ object.replaced_by.filename }}) {% endifequal %} {% if object.replaces %} -(replaced {{ object.replaces.filename }}) +(replaced {{ object.replaces.filename }}) {% endif %}
  • I-D Intended Status at Publication: {{ object.intended_status }}
    • diff --git a/ietf/templates/liaisons/field_help.html b/ietf/templates/liaisons/field_help.html index 04a88ed80..d0195aa07 100755 --- a/ietf/templates/liaisons/field_help.html +++ b/ietf/templates/liaisons/field_help.html @@ -11,10 +11,10 @@ where appropriate. Additional materials that may be useful in completing this form can be found in the following documents:

    For definitive information on generating liaison statements, please see RFC 4053 (BCP 103) "Procedures for Handling Liaison Statements to and from the IETF."

    diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html index e1d38673e..2870a8580 100755 --- a/ietf/templates/liaisons/guide_from_ietf.html +++ b/ietf/templates/liaisons/guide_from_ietf.html @@ -19,28 +19,28 @@ For definitive information on generating liaison statements, please see:

    "Cc:" Field (1, 2, 3)
    • The IAB
      • -
      • The IETF Liaison Manager for the SDO (4)

        +
        • The IETF Liaison Manager for the SDO (4)

        • The IAB Chair (if not the submitter)<iab-chair@iab.org>

        • The IAB <iab@iab.org>
          • The IESG
            • -
            • The IETF Liaison Manager for the SDO (4)

              +
              • The IETF Liaison Manager for the SDO (4)

              • The IETF Chair (if not the submitter)<chair@ietf.org>

              • The IESG <iesg@ietf.org>
                • The IETF
                  • -
                  • The IETF Liaison Manager for the SDO (4)

                    +
                    • The IETF Liaison Manager for the SDO (4)

                    • The IETF Chair (if not the submitter)<chair@ietf.org>

                    • The IESG <iesg@ietf.org>
                      • An IETF Area
                        • -
                        • The IETF Liaison Manager for the SDO (4)

                          +
                          • The IETF Liaison Manager for the SDO (4)

                          • The IETF Area Director(s) (if not the submitter)

                          • The IETF Chair <chair@ietf.org>

                          • The IETF Area Directorate Mailing List (where applicable) (5)
                            • An IETF Working Group
                              • -
                              • The IETF Liaison Manager for the SDO (4)

                                +
                                • The IETF Liaison Manager for the SDO (4)

                                • The IETF Working Group Chair(s) (if not the submitter)

                                • The IETF Area Director(s)

                                • The IETF Liaison Manager for the SDO

                                  +
                                  • The IETF Liaison Manager for the SDO

                                  • The IAB <iab@iab.org>
                                    • The IESG
                                      • The IETF Chair <chair@ietf.org>
                                        • -
                                        • The IETF Liaison Manager for the SDO

                                          +
                                          • The IETF Liaison Manager for the SDO

                                          • The IESG <iesg@ietf.org>
                                            • The IETF
                                              • The IETF Chair <chair@ietf.org>
                                                • -
                                                • The IETF Liaison Manager for the SDO

                                                  +
                                                  • The IETF Liaison Manager for the SDO

                                                  • The IESG <iesg@ietf.org>
                                                    • An IETF Area
                                                      • The IETF Area Director(s)
                                                        • -
                                                        • The IETF Liaison Manager for the SDO

                                                          +
                                                          • The IETF Liaison Manager for the SDO

                                                          • The IETF Chair <chair@ietf.org>

                                                          • The IETF Area Directorate Mailing List(where applicable)(3)
                                                            • An IETF Working Group
                                                              • The Working Group Chair(s)
                                                                • -
                                                                • The IETF Liaison Manager for the SDO

                                                                  +
                                                                  • The IETF Liaison Manager for the SDO

                                                                  • The IETF Area Director(s)

                                                                  • The IETF Working Group Discussion List
                                                                    • diff --git a/ietf/templates/mailinglists/nwg_wizard.html b/ietf/templates/mailinglists/nwg_wizard.html index 2b81b8c1a..58664d958 100644 --- a/ietf/templates/mailinglists/nwg_wizard.html +++ b/ietf/templates/mailinglists/nwg_wizard.html @@ -1,7 +1,7 @@ {% extends "mailinglists/nwg_wizard_base.html" %} {% block nwgcontent %} -View Current list
                                                                    +View Current list

                                                                    Step {{ step|add:"1" }}

                                                                    diff --git a/ietf/templates/mailinglists/nwg_wizard_done.html b/ietf/templates/mailinglists/nwg_wizard_done.html index 346f5056e..7af4a8298 100644 --- a/ietf/templates/mailinglists/nwg_wizard_done.html +++ b/ietf/templates/mailinglists/nwg_wizard_done.html @@ -1,7 +1,7 @@ {% extends "mailinglists/nwg_wizard_base.html" %} {% block nwgcontent %} -View Current list
                                                                    +View Current list

                                                                    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:

                                                                    diff --git a/ietf/templates/mailinglists/nwg_wizard_done_email.txt b/ietf/templates/mailinglists/nwg_wizard_done_email.txt index cfb9ad353..74cb0aca2 100644 --- a/ietf/templates/mailinglists/nwg_wizard_done_email.txt +++ b/ietf/templates/mailinglists/nwg_wizard_done_email.txt @@ -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," diff --git a/ietf/templates/mailinglists/nwg_wizard_step0.html b/ietf/templates/mailinglists/nwg_wizard_step0.html index 1f5ecc73c..e6c2eb6b2 100644 --- a/ietf/templates/mailinglists/nwg_wizard_step0.html +++ b/ietf/templates/mailinglists/nwg_wizard_step0.html @@ -32,8 +32,8 @@ function activate_nwg_widgets() { {% endblock %} {% block nwgcontent %} -

                                                                    Please use this Web tool to add a new entry to the IETF Non-WG Mailing Lists Web page, to update the information on an existing entry, or to delete an existing entry.

                                                                    -View Current list
                                                                    +

                                                                    Please use this Web tool to add a new entry to the IETF Non-WG Mailing Lists Web page, to update the information on an existing entry, or to delete an existing entry.

                                                                    +View Current list

                                                                    Step 1

                                                                    diff --git a/ietf/urls.py b/ietf/urls.py index b16c4fff6..f06a8e1a2 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -15,15 +15,15 @@ feeds = { } urlpatterns = patterns('', - (r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', + (r'^feed/(?P.*)/$', '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'^(?Ppublic|cgi-bin)/', include('ietf.redirects.urls')), (r'^ipr/', include('ietf.ipr.urls')), (r'^meeting/', include('ietf.meeting.urls')), diff --git a/test/diff/_announcements_nomcom_1230_ b/test/diff/_ann_nomcom_1230_ similarity index 88% rename from test/diff/_announcements_nomcom_1230_ rename to test/diff/_ann_nomcom_1230_ index 0cb98ee71..dd4c3616a 100644 --- a/test/diff/_announcements_nomcom_1230_ +++ b/test/diff/_ann_nomcom_1230_ @@ -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 diff --git a/test/diff/_idindex_ b/test/diff/_drafts_ similarity index 81% rename from test/diff/_idindex_ rename to test/diff/_drafts_ index 53040afc4..d6445166a 100644 --- a/test/diff/_idindex_ +++ b/test/diff/_drafts_ @@ -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 \ No newline at end of file ++Author: Last name First name diff --git a/test/diff/_idindex_showdocs_rfc_name_ b/test/diff/_drafts_rfc__search=name similarity index 88% rename from test/diff/_idindex_showdocs_rfc_name_ rename to test/diff/_drafts_rfc__search=name index 1729035d9..cf2e0fc3b 100644 --- a/test/diff/_idindex_showdocs_rfc_name_ +++ b/test/diff/_drafts_rfc__search=name @@ -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 \ No newline at end of file +-draft-ietf-hubmib-etherif-MIB-06 1998-08-06 RFC 2358 I-D Exists diff --git a/test/diff/_idindex__ b/test/diff/_idindex__ deleted file mode 100644 index 75c364eff..000000000 --- a/test/diff/_idindex__ +++ /dev/null @@ -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 \ No newline at end of file diff --git a/test/diff/_liaisons_321_ b/test/diff/_liaison_321_ similarity index 65% rename from test/diff/_liaisons_321_ rename to test/diff/_liaison_321_ index df9ab8587..66ef65948 100644 --- a/test/diff/_liaisons_321_ +++ b/test/diff/_liaison_321_ @@ -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) \ No newline at end of file ++IETF CCAMP WG (adrian@olddog.co.uk, dbrungard@att.com) diff --git a/test/diff/_mailinglists_approve_20A0p492qbq04067_ b/test/diff/_list_approve_20A0p492qbq04067_ similarity index 87% rename from test/diff/_mailinglists_approve_20A0p492qbq04067_ rename to test/diff/_list_approve_20A0p492qbq04067_ index 888f0eeb0..aa41369da 100644 --- a/test/diff/_mailinglists_approve_20A0p492qbq04067_ +++ b/test/diff/_list_approve_20A0p492qbq04067_ @@ -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 diff --git a/test/diff/_mailinglists_area_lists_ b/test/diff/_list_area_ similarity index 71% rename from test/diff/_mailinglists_area_lists_ rename to test/diff/_list_area_ index e7e08db22..feddbc91a 100644 --- a/test/diff/_mailinglists_area_lists_ +++ b/test/diff/_list_area_ @@ -1,4 +1,4 @@ --- https://datatracker.ietf.org/public/area_mailing_list.cgi -+++ /mailinglists/area_lists/ ++++ /list/area/ @@ -1,0 +1,1 @@ -+ \ No newline at end of file ++ diff --git a/test/diff/_mailinglists_nonwg_lists_ b/test/diff/_list_nonwg_ similarity index 98% rename from test/diff/_mailinglists_nonwg_lists_ rename to test/diff/_list_nonwg_ index 7791a952d..d6fb10ed6 100644 --- a/test/diff/_mailinglists_nonwg_lists_ +++ b/test/diff/_list_nonwg_ @@ -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 diff --git a/test/diff/_mailinglists_request_ b/test/diff/_list_request_ similarity index 74% rename from test/diff/_mailinglists_request_ rename to test/diff/_list_request_ index ea9d95a74..61d238538 100644 --- a/test/diff/_mailinglists_request_ +++ b/test/diff/_list_request_ @@ -1,4 +1,4 @@ --- https://datatracker.ietf.org/public/request_list.cgi -+++ /mailinglists/request/ ++++ /list/request/ @@ -1,0 +1,1 @@ +Step 1: