diff --git a/ietf/idtracker/testurls.list b/ietf/idtracker/testurls.list index cb9f6559e..d30724c77 100644 --- a/ietf/idtracker/testurls.list +++ b/ietf/idtracker/testurls.list @@ -1,11 +1,11 @@ -200 /idtracker/states/ https://datatracker.ietf.org/public/states_table.cgi -200 /idtracker/states/12/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_state_desc&id=12 -200 /idtracker/states/substate/1/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_state_desc&id=1&sub_state=1 -200 /idtracker/ballot_key/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_key -200 /idtracker/evaluation_process/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_evaluation_desc -200 /idtracker/send_email/?cat=bugs https://datatracker.ietf.org/public/pidtracker.cgi?command=send_email&cat=bugs +200 /idtracker/help/state/ https://datatracker.ietf.org/public/states_table.cgi +200 /idtracker/help/state/12/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_state_desc&id=12 +200 /idtracker/help/substate/1/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_state_desc&id=1&sub_state=1 +200 /idtracker/help/ballot/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_key +200 /idtracker/help/evaluation/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_evaluation_desc +200 /idtracker/feedback/?cat=bugs https://datatracker.ietf.org/public/pidtracker.cgi?command=send_email&cat=bugs 200 /idtracker/status/ -skipdiff,200 /idtracker/last_call/ https://datatracker.ietf.org/public/lastcall.cgi +skipdiff,200 /idtracker/status/last-call/ https://datatracker.ietf.org/public/lastcall.cgi 200 /idtracker/rfc3847/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=3847&rfc_flag=1 200 /idtracker/12689/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0 skipredirect,200 /idtracker/draft-ietf-isis-link-attr/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0 @@ -13,5 +13,5 @@ skipredirect,200 /idtracker/draft-ietf-isis-link-attr/comment/65232/ https://dat 200 /idtracker/comment/65232/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_comment&id=65232 skipredirect,200 /idtracker/ballot/1760/ https://datatracker.ietf.org/public/pidtracker.cgi?command=print_ballot&ballot_id=1760&filename=draft-ietf-isis-link-attr 200 /idtracker/ https://datatracker.ietf.org/public/pidtracker.cgi -200 /feeds/comments/draft-ietf-isis-link-attr/ +200 /feed/comments/draft-ietf-isis-link-attr/ 200 /idtracker/?search_group_acronym=&search_job_owner=0&search_rfcnumber=&search_status_id=&sub_state_id=6&search_cur_state=&search_button=SEARCH&search_filename=bgp-m&search_area_acronym= https://datatracker.ietf.org/public/pidtracker.cgi?command=search_list&search_job_owner=0&search_group_acronym=&search_status_id=&search_cur_state=&sub_state_id=6&search_filename=bgp-m&search_rfcnumber=&search_area_acronym=&search_button=SEARCH diff --git a/ietf/idtracker/urls.py b/ietf/idtracker/urls.py index cce6586ab..d2398c956 100644 --- a/ietf/idtracker/urls.py +++ b/ietf/idtracker/urls.py @@ -17,14 +17,14 @@ ballot_dict = { } urlpatterns = patterns('django.views.generic.simple', - (r'^states/$', 'direct_to_template', { 'template': 'idtracker/states.html', 'extra_context': { 'states': IDState.objects.all(), 'substates': IDSubState.objects.all() } }), - (r'^ballot_key/$', 'direct_to_template', { 'template': 'idtracker/view_key.html' }), - (r'^evaluation_process/$', 'direct_to_template', { 'template': 'idtracker/view_evaluation_desc.html' }), + (r'^help/state/$', 'direct_to_template', { 'template': 'idtracker/states.html', 'extra_context': { 'states': IDState.objects.all(), 'substates': IDSubState.objects.all() } }), + (r'^help/ballot/$', 'direct_to_template', { 'template': 'idtracker/view_key.html' }), + (r'^help/evaluation/$', 'direct_to_template', { 'template': 'idtracker/view_evaluation_desc.html' }), ) urlpatterns += patterns('', - (r'^send_email/$', views.send_email), + (r'^feedback/$', views.send_email), (r'^status/$', views.status), - (r'^last_call/$', views.last_call), + (r'^status/last-call/$', views.last_call), ) urlpatterns += patterns('django.views.generic.list_detail', (r'^rfc(?P\d+)/$', 'object_detail', rfc_dict), @@ -35,8 +35,8 @@ urlpatterns += patterns('', (r'^comment/(?P\d+)/$', views.view_comment, comment_dict), (r'^ballot/(?P\d+)/$', views.view_ballot, ballot_dict), (r'^(?P[^/]+)/comment/(?P\d+)/$', views.comment, comment_dict), - (r'^states/(?P\d+)/$', views.state_desc), - (r'^states/substate/(?P\d+)/$', views.state_desc, { 'is_substate': 1 }), + (r'^help/state/(?P\d+)/$', views.state_desc), + (r'^help/substate/(?P\d+)/$', views.state_desc, { 'is_substate': 1 }), #(r'^(?P\d+)/edit/$', views.edit_idinternal), (r'^$', views.search), ) diff --git a/ietf/iesg/testurl.list b/ietf/iesg/testurl.list index c9b7bb4ba..60413b52a 100644 --- a/ietf/iesg/testurl.list +++ b/ietf/iesg/testurl.list @@ -1,11 +1,11 @@ 200 /iesg/telechat/ -200 /iesg/telechat/2007/ -200 /iesg/telechat/2007/apr/ -200 /iesg/telechat/detail/354/ https://datatracker.ietf.org/public/view_telechat_minute.cgi?command=view_minute&id=354 -200,sort /iesg/ann/independent/ https://datatracker.ietf.org/public/rfc_editor_announcement.cgi -200,sort,ignore:1 /iesg/ann/ietf-doc/recent/ https://datatracker.ietf.org/public/recent_announcement.cgi -200,sort /iesg/ann/ietf-doc/previous/ https://datatracker.ietf.org/public/previous_announcement.cgi -200 /iesg/ann/detail/2422/ https://datatracker.ietf.org/public/recent_announcement.cgi?command=show_detail&ballot_id=2422 -200 /iesg/ann/detail/1563/ https://datatracker.ietf.org/public/previous_announcement.cgi?command=show_detail&ballot_id=1563 -404 /iesg/ann/detail/567/ -200 /feeds/iesg_minutes/ +200 /iesg/telechat/y/2007/ +200 /iesg/telechat/y/2007/apr/ +200 /iesg/telechat/354/ https://datatracker.ietf.org/public/view_telechat_minute.cgi?command=view_minute&id=354 +200,sort /iesg/ann/ind/ https://datatracker.ietf.org/public/rfc_editor_announcement.cgi +200,sort,ignore:1 /iesg/ann/new/ https://datatracker.ietf.org/public/recent_announcement.cgi +200,sort /iesg/ann/prev/ https://datatracker.ietf.org/public/previous_announcement.cgi +200 /iesg/ann/2422/ https://datatracker.ietf.org/public/recent_announcement.cgi?command=show_detail&ballot_id=2422 +200 /iesg/ann/1563/ https://datatracker.ietf.org/public/previous_announcement.cgi?command=show_detail&ballot_id=1563 +404 /iesg/ann/567/ +200 /feed/iesg_minutes/ diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py index 952bb8487..173fe39ff 100644 --- a/ietf/iesg/urls.py +++ b/ietf/iesg/urls.py @@ -19,17 +19,17 @@ queryset_ann = BallotInfo.objects.all() urlpatterns = patterns('django.views.generic.date_based', (r'^telechat/$', 'archive_index', telechat_archive), - (r'^telechat/(?P\d{4})/$', 'archive_year', telechat_archive), - (r'^telechat/(?P\d{4})/(?P[a-z]{3})/$', 'archive_month', telechat_archive), + (r'^telechat/y/(?P\d{4})/$', 'archive_year', telechat_archive), + (r'^telechat/y/(?P\d{4})/(?P[a-z]{3})/$', 'archive_month', telechat_archive), ) urlpatterns += patterns('django.views.generic.list_detail', - (r'^telechat/detail/(?P\d+)/$', 'object_detail', { 'queryset': queryset }), - (r'^ann/detail/(?P\d+)/$', 'object_detail', { 'queryset': queryset_ann, 'template_name':"iesg/ballotinfo_detail.html" }), + (r'^telechat/(?P\d+)/$', 'object_detail', { 'queryset': queryset }), + (r'^ann/(?P\d+)/$', 'object_detail', { 'queryset': queryset_ann, 'template_name':"iesg/ballotinfo_detail.html" }), ) urlpatterns += patterns('', - (r'^ann/independent/$',views.inddocs), - (r'^ann/ietf-doc/(?P[^/]+)/$',views.wgdocs), + (r'^ann/ind/$',views.inddocs), + (r'^ann/(?P[^/]+)/$',views.wgdocs), ) diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index 5c6b9cd54..2ed50298c 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -22,11 +22,11 @@ def wgdocs(request,cat): is_recent = 0 queryset_list=[] queryset_list_doc=[] - if cat == 'recent': + if cat == 'new': is_recent = 1 queryset = InternetDraft.objects.filter(b_approve_date__gte = date_threshold(), intended_status__in=[1,2,6,7],idinternal__via_rfc_editor=0,idinternal__primary_flag=1).order_by("-b_approve_date") queryset_doc = InternetDraft.objects.filter(b_approve_date__gte = date_threshold(), intended_status__in=[3,5],idinternal__via_rfc_editor=0, idinternal__primary_flag=1).order_by("-b_approve_date") - elif cat == 'previous': + elif cat == 'prev': queryset = InternetDraft.objects.filter(b_approve_date__lt = date_threshold(), b_approve_date__gte = '1997-12-1', intended_status__in=[1,2,6,7],idinternal__via_rfc_editor=0,idinternal__primary_flag=1).order_by("-b_approve_date") queryset_doc = InternetDraft.objects.filter(b_approve_date__lt = date_threshold(), b_approve_date__gte = '1998-10-15', intended_status__in=[3,5],idinternal__via_rfc_editor=0,idinternal__primary_flag=1).order_by("-b_approve_date") else: diff --git a/ietf/my/testurl.list b/ietf/my/testurl.list index 4ec2e504c..0e6c5c606 100644 --- a/ietf/my/testurl.list +++ b/ietf/my/testurl.list @@ -1,2 +1,2 @@ -302 /my/ -302 /my/ziggy/ +#302 /my/ +#302 /my/ziggy/ diff --git a/ietf/redirects/fixtures/initial_data.xml b/ietf/redirects/fixtures/initial_data.xml index 15b902464..b5537b4bb 100644 --- a/ietf/redirects/fixtures/initial_data.xml +++ b/ietf/redirects/fixtures/initial_data.xml @@ -50,7 +50,7 @@ public/states_table.cgi - idtracker/states + idtracker/help/state @@ -68,26 +68,26 @@ public/lastcall.cgi - idtracker/last_call + idtracker/status/last-call public/rfc_editor_announcement.cgi - iesg/ann/independent + iesg/ann/ind public/recent_announcement.cgi iesg/ann - ietf-doc/recent + new public/previous_announcement.cgi iesg/ann - ietf-doc/previous + prev @@ -236,25 +236,25 @@ view_state_desc - states + help/state 10 4 view_evaluation_desc - evaluation_process + help/evaluation 10 view_key - ballot_key + help/ballot 10 send_email - send_email + feedback 10 @@ -266,7 +266,7 @@ view_minute - detail + 16 4 @@ -284,7 +284,7 @@ show_detail - detail + 14 6 @@ -296,7 +296,7 @@ ^sub_state^view_state_desc - states/substate + help/substate 10 4 diff --git a/ietf/templates/idtracker/idinternal_detail.html b/ietf/templates/idtracker/idinternal_detail.html index ee7a39d15..8866aa56f 100644 --- a/ietf/templates/idtracker/idinternal_detail.html +++ b/ietf/templates/idtracker/idinternal_detail.html @@ -80,9 +80,9 @@
{% if object.ballot.ballot_issued %} IESG evaluation record - [What + [What they mean] - [How they are + [How they are recorded] {% else %} No IESG evaluation record @@ -142,11 +142,11 @@
- + {{ object.cur_state }} {% if object.cur_sub_state %} :: - + {{ object.cur_sub_state }} {% endif %} @@ -158,7 +158,7 @@ {% endifequal %} {% endif %}
- + [Show States Table] diff --git a/ietf/templates/idtracker/idtracker_search.html b/ietf/templates/idtracker/idtracker_search.html index 339110271..b460a159d 100644 --- a/ietf/templates/idtracker/idtracker_search.html +++ b/ietf/templates/idtracker/idtracker_search.html @@ -69,7 +69,7 @@ state: {{ form.sub_state_id }}
Document States: State Diagram and -State Explanations +State Explanations diff --git a/ietf/templates/idtracker/search_result_table.html b/ietf/templates/idtracker/search_result_table.html index ba8647bc9..23140c786 100644 --- a/ietf/templates/idtracker/search_result_table.html +++ b/ietf/templates/idtracker/search_result_table.html @@ -1,5 +1,5 @@ {% for group in grouped %} -

In State: {{ group.list.0.cur_state }}{% if group.list.0.cur_sub_state %} :: {{ group.list.0.cur_sub_state }}{% endif %}

+

In State: {{ group.list.0.cur_state }}{% if group.list.0.cur_sub_state %} :: {{ group.list.0.cur_sub_state }}{% endif %}

{# Same sort algorithm as I-D tracker #} diff --git a/ietf/templates/iesg/ballotinfo_detail.html b/ietf/templates/iesg/ballotinfo_detail.html index c91ff2845..22f65178b 100644 --- a/ietf/templates/iesg/ballotinfo_detail.html +++ b/ietf/templates/iesg/ballotinfo_detail.html @@ -14,8 +14,8 @@
  • Protocol Action Announcements
  • Document Action Announcements
  • Working Group Action Announcements
    • -
  • Recent IESG Announcements
    • -
  • Previous IESG Announcements
    • +
  • Recent IESG Announcements
    • +
  • Previous IESG Announcements
    • diff --git a/ietf/templates/iesg/ietf_doc.html b/ietf/templates/iesg/ietf_doc.html index 5c6ffa35e..9e212cdec 100644 --- a/ietf/templates/iesg/ietf_doc.html +++ b/ietf/templates/iesg/ietf_doc.html @@ -37,26 +37,26 @@ a.noline:link, a.noline:visited, a.noline:hover {border-style:none;} {% if is_recent %}

    Recent IESG Announcements

    -This page contains links to all IESG Protocol, Document, and Working Group Action announcements that have been sent within the past six months. Announcements that were sent prior to six month ago can be found in Previous Announcements.
    +This page contains links to all IESG Protocol, Document, and Working Group Action announcements that have been sent within the past six months. Announcements that were sent prior to six month ago can be found in Previous Announcements.

    1. Protocol Action Announcements
    2. Document Action Announcements
    3. Working Group Action Announcements
    -4. Previous Announcements
    +4. Previous Announcements
    {% else %}

    Previous IESG Announcements

    -This page contains links to all IESG Protocol, Document, and Working Group Action announcements that were sent prior to six months ago. Announcements that have been sent within the past six months can be found in Recent Announcements. +This page contains links to all IESG Protocol, Document, and Working Group Action announcements that were sent prior to six months ago. Announcements that have been sent within the past six months can be found in Recent Announcements.

    1. Protocol Action Announcements
    2. Document Action Announcements
    3. Working Group Action Announcements
    -4. Recent IESG Announcements
    +4. Recent IESG Announcements
    {% endif %} @@ -69,7 +69,7 @@ This page contains links to all IESG Protocol, Document, and Working Group Actio {% regroup date.list by idinternal.ballot_id as ballots %} {% for each_ballot in ballots %} {% if each_ballot.grouper %} -
  • +
  • {% for item in each_ballot.list %} {{ item.title }} ({{ item.intended_status }})
    {% endfor %} @@ -87,7 +87,7 @@ This page contains links to all IESG Protocol, Document, and Working Group Actio {% regroup date.list by idinternal.ballot_id as ballots %} {% for each_ballot in ballots %} {% if each_ballot.grouper %} -
  • +
  • {% for item in each_ballot.list %} {{ item.title }} ({{ item.intended_status }})
    {% endfor %} diff --git a/ietf/templates/iesg/independent_doc.html b/ietf/templates/iesg/independent_doc.html index 697b4222d..8a3d3bd8e 100644 --- a/ietf/templates/iesg/independent_doc.html +++ b/ietf/templates/iesg/independent_doc.html @@ -47,7 +47,7 @@ The RFC Editor receives requests to publish non-IETF Working Group documents as {% regroup date.list by idinternal.ballot_id as ballots %} {% for each_ballot in ballots %} {% if each_ballot.grouper %} -
  • +
  • {% for item in each_ballot.list %} {{ item.title }} ({{ item.intended_status }})
    {% endfor %} @@ -65,7 +65,7 @@ The RFC Editor receives requests to publish non-IETF Working Group documents as Date Sent: {{ date.grouper }}     {% endfor %} diff --git a/ietf/templates/iesg/telechatminutes_archive.html b/ietf/templates/iesg/telechatminutes_archive.html index 4c01bfe15..85b21dd84 100644 --- a/ietf/templates/iesg/telechatminutes_archive.html +++ b/ietf/templates/iesg/telechatminutes_archive.html @@ -13,7 +13,7 @@ {% endifnotequal %} {% endfor %} @@ -21,7 +21,7 @@

    Archives by Year

    diff --git a/ietf/templates/iesg/telechatminutes_archive_month.html b/ietf/templates/iesg/telechatminutes_archive_month.html index 3997442bb..122f05b3e 100644 --- a/ietf/templates/iesg/telechatminutes_archive_month.html +++ b/ietf/templates/iesg/telechatminutes_archive_month.html @@ -13,7 +13,7 @@ {% if object_list %} {% else %} diff --git a/ietf/templates/iesg/telechatminutes_detail.html b/ietf/templates/iesg/telechatminutes_detail.html index af5bee643..5936a2d62 100644 --- a/ietf/templates/iesg/telechatminutes_detail.html +++ b/ietf/templates/iesg/telechatminutes_detail.html @@ -11,7 +11,7 @@
    {{ object.telechat_minute|escape|linebreaks|urlize }} -
    +
    diff --git a/test/diff/_idtracker_help_state_ b/test/diff/_idtracker_help_state_ new file mode 100644 index 000000000..6a470aa2d --- /dev/null +++ b/test/diff/_idtracker_help_state_ @@ -0,0 +1,8 @@ +--- https://datatracker.ietf.org/public/states_table.cgi ++++ /idtracker/help/state/ +@@ -14,1 +14,1 @@ +-request makes it into the I-D tracker.)  A document in this state has ++request makes it into the I-D tracker.) A document in this state has +@@ -17,1 +17,1 @@ +-requested ++requested. diff --git a/test/diff/_iesg_ann_detail_1563_ b/test/diff/_iesg_ann_1563_ similarity index 93% rename from test/diff/_iesg_ann_detail_1563_ rename to test/diff/_iesg_ann_1563_ index ab9c9b4f8..8a36a7bab 100644 --- a/test/diff/_iesg_ann_detail_1563_ +++ b/test/diff/_iesg_ann_1563_ @@ -1,5 +1,5 @@ --- https://datatracker.ietf.org/public/previous_announcement.cgi?command=show_detail&ballot_id=1563 -+++ /iesg/ann/detail/1563/ ++++ /iesg/ann/1563/ @@ -1,0 +1,7 @@ +IESG Announcement +This page contains an IESG Protocol, Document, or Working Group Action @@ -27,4 +27,4 @@ +simple chair @@ -18,1 +19,1 @@ -as a Proposed Standard -+ as a Proposed Standard \ No newline at end of file ++ as a Proposed Standard diff --git a/test/diff/_iesg_ann_detail_2422_ b/test/diff/_iesg_ann_2422_ similarity index 93% rename from test/diff/_iesg_ann_detail_2422_ rename to test/diff/_iesg_ann_2422_ index 5d162a01a..9bedfdd2c 100644 --- a/test/diff/_iesg_ann_detail_2422_ +++ b/test/diff/_iesg_ann_2422_ @@ -1,5 +1,5 @@ --- https://datatracker.ietf.org/public/recent_announcement.cgi?command=show_detail&ballot_id=2422 -+++ /iesg/ann/detail/2422/ ++++ /iesg/ann/2422/ @@ -1,0 +1,6 @@ +IESG Announcement +This page contains an IESG Protocol, Document, or Working Group Action @@ -29,4 +29,4 @@ +mpls chair @@ -18,1 +19,1 @@ -as a Proposed Standard -+ as a Proposed Standard \ No newline at end of file ++ as a Proposed Standard
    •  Name (Intended Status)VerResponsible ADStatus DateModified (EST)