Skip to content

Commit 6d03969

Browse files
fennerfenner
committed
URL shuffling in iesg, idtracker and my
 - Legacy-Id: 666
1 parent 0e9c892 commit 6d03969

19 files changed

Lines changed: 80 additions & 72 deletions

‎ietf/idtracker/testurls.list‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
200 /idtracker/states/ https://datatracker.ietf.org/public/states_table.cgi
2-
200 /idtracker/states/12/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_state_desc&id=12
3-
200 /idtracker/states/substate/1/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_state_desc&id=1&sub_state=1
4-
200 /idtracker/ballot_key/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_key
5-
200 /idtracker/evaluation_process/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_evaluation_desc
6-
200 /idtracker/send_email/?cat=bugs https://datatracker.ietf.org/public/pidtracker.cgi?command=send_email&cat=bugs
1+
200 /idtracker/help/state/ https://datatracker.ietf.org/public/states_table.cgi
2+
200 /idtracker/help/state/12/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_state_desc&id=12
3+
200 /idtracker/help/substate/1/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_state_desc&id=1&sub_state=1
4+
200 /idtracker/help/ballot/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_key
5+
200 /idtracker/help/evaluation/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_evaluation_desc
6+
200 /idtracker/feedback/?cat=bugs https://datatracker.ietf.org/public/pidtracker.cgi?command=send_email&cat=bugs
77
200 /idtracker/status/
8-
skipdiff,200 /idtracker/last_call/ https://datatracker.ietf.org/public/lastcall.cgi
8+
skipdiff,200 /idtracker/status/last-call/ https://datatracker.ietf.org/public/lastcall.cgi
99
200 /idtracker/rfc3847/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=3847&rfc_flag=1
1010
200 /idtracker/12689/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0
1111
skipredirect,200 /idtracker/draft-ietf-isis-link-attr/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&dTag=12689&rfc_flag=0
1212
skipredirect,200 /idtracker/draft-ietf-isis-link-attr/comment/65232/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_comment&id=65232
1313
200 /idtracker/comment/65232/ https://datatracker.ietf.org/public/pidtracker.cgi?command=view_comment&id=65232
1414
skipredirect,200 /idtracker/ballot/1760/ https://datatracker.ietf.org/public/pidtracker.cgi?command=print_ballot&ballot_id=1760&filename=draft-ietf-isis-link-attr
1515
200 /idtracker/ https://datatracker.ietf.org/public/pidtracker.cgi
16-
200 /feeds/comments/draft-ietf-isis-link-attr/
16+
200 /feed/comments/draft-ietf-isis-link-attr/
1717
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

‎ietf/idtracker/urls.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
}
1818

1919
urlpatterns = patterns('django.views.generic.simple',
20-
(r'^states/$', 'direct_to_template', { 'template': 'idtracker/states.html', 'extra_context': { 'states': IDState.objects.all(), 'substates': IDSubState.objects.all() } }),
21-
(r'^ballot_key/$', 'direct_to_template', { 'template': 'idtracker/view_key.html' }),
22-
(r'^evaluation_process/$', 'direct_to_template', { 'template': 'idtracker/view_evaluation_desc.html' }),
20+
(r'^help/state/$', 'direct_to_template', { 'template': 'idtracker/states.html', 'extra_context': { 'states': IDState.objects.all(), 'substates': IDSubState.objects.all() } }),
21+
(r'^help/ballot/$', 'direct_to_template', { 'template': 'idtracker/view_key.html' }),
22+
(r'^help/evaluation/$', 'direct_to_template', { 'template': 'idtracker/view_evaluation_desc.html' }),
2323
)
2424
urlpatterns += patterns('',
25-
(r'^send_email/$', views.send_email),
25+
(r'^feedback/$', views.send_email),
2626
(r'^status/$', views.status),
27-
(r'^last_call/$', views.last_call),
27+
(r'^status/last-call/$', views.last_call),
2828
)
2929
urlpatterns += patterns('django.views.generic.list_detail',
3030
(r'^rfc(?P<object_id>\d+)/$', 'object_detail', rfc_dict),
@@ -35,8 +35,8 @@
3535
(r'^comment/(?P<object_id>\d+)/$', views.view_comment, comment_dict),
3636
(r'^ballot/(?P<object_id>\d+)/$', views.view_ballot, ballot_dict),
3737
(r'^(?P<slug>[^/]+)/comment/(?P<object_id>\d+)/$', views.comment, comment_dict),
38-
(r'^states/(?P<state>\d+)/$', views.state_desc),
39-
(r'^states/substate/(?P<state>\d+)/$', views.state_desc, { 'is_substate': 1 }),
38+
(r'^help/state/(?P<state>\d+)/$', views.state_desc),
39+
(r'^help/substate/(?P<state>\d+)/$', views.state_desc, { 'is_substate': 1 }),
4040
#(r'^(?P<id>\d+)/edit/$', views.edit_idinternal),
4141
(r'^$', views.search),
4242
)

‎ietf/iesg/testurl.list‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
200 /iesg/telechat/
2-
200 /iesg/telechat/2007/
3-
200 /iesg/telechat/2007/apr/
4-
200 /iesg/telechat/detail/354/ https://datatracker.ietf.org/public/view_telechat_minute.cgi?command=view_minute&id=354
5-
200,sort /iesg/ann/independent/ https://datatracker.ietf.org/public/rfc_editor_announcement.cgi
6-
200,sort,ignore:1 /iesg/ann/ietf-doc/recent/ https://datatracker.ietf.org/public/recent_announcement.cgi
7-
200,sort /iesg/ann/ietf-doc/previous/ https://datatracker.ietf.org/public/previous_announcement.cgi
8-
200 /iesg/ann/detail/2422/ https://datatracker.ietf.org/public/recent_announcement.cgi?command=show_detail&ballot_id=2422
9-
200 /iesg/ann/detail/1563/ https://datatracker.ietf.org/public/previous_announcement.cgi?command=show_detail&ballot_id=1563
10-
404 /iesg/ann/detail/567/
11-
200 /feeds/iesg_minutes/
2+
200 /iesg/telechat/y/2007/
3+
200 /iesg/telechat/y/2007/apr/
4+
200 /iesg/telechat/354/ https://datatracker.ietf.org/public/view_telechat_minute.cgi?command=view_minute&id=354
5+
200,sort /iesg/ann/ind/ https://datatracker.ietf.org/public/rfc_editor_announcement.cgi
6+
200,sort,ignore:1 /iesg/ann/new/ https://datatracker.ietf.org/public/recent_announcement.cgi
7+
200,sort /iesg/ann/prev/ https://datatracker.ietf.org/public/previous_announcement.cgi
8+
200 /iesg/ann/2422/ https://datatracker.ietf.org/public/recent_announcement.cgi?command=show_detail&ballot_id=2422
9+
200 /iesg/ann/1563/ https://datatracker.ietf.org/public/previous_announcement.cgi?command=show_detail&ballot_id=1563
10+
404 /iesg/ann/567/
11+
200 /feed/iesg_minutes/

‎ietf/iesg/urls.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919

2020
urlpatterns = patterns('django.views.generic.date_based',
2121
(r'^telechat/$', 'archive_index', telechat_archive),
22-
(r'^telechat/(?P<year>\d{4})/$', 'archive_year', telechat_archive),
23-
(r'^telechat/(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'archive_month', telechat_archive),
22+
(r'^telechat/y/(?P<year>\d{4})/$', 'archive_year', telechat_archive),
23+
(r'^telechat/y/(?P<year>\d{4})/(?P<month>[a-z]{3})/$', 'archive_month', telechat_archive),
2424
)
2525

2626
urlpatterns += patterns('django.views.generic.list_detail',
27-
(r'^telechat/detail/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset }),
28-
(r'^ann/detail/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset_ann, 'template_name':"iesg/ballotinfo_detail.html" }),
27+
(r'^telechat/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset }),
28+
(r'^ann/(?P<object_id>\d+)/$', 'object_detail', { 'queryset': queryset_ann, 'template_name':"iesg/ballotinfo_detail.html" }),
2929
)
3030

3131
urlpatterns += patterns('',
32-
(r'^ann/independent/$',views.inddocs),
33-
(r'^ann/ietf-doc/(?P<cat>[^/]+)/$',views.wgdocs),
32+
(r'^ann/ind/$',views.inddocs),
33+
(r'^ann/(?P<cat>[^/]+)/$',views.wgdocs),
3434
)
3535

‎ietf/iesg/views.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ def wgdocs(request,cat):
2222
is_recent = 0
2323
queryset_list=[]
2424
queryset_list_doc=[]
25-
if cat == 'recent':
25+
if cat == 'new':
2626
is_recent = 1
2727
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")
2828
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")
29-
elif cat == 'previous':
29+
elif cat == 'prev':
3030
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")
3131
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")
3232
else:

‎ietf/my/testurl.list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
302 /my/
2-
302 /my/ziggy/
1+
#302 /my/
2+
#302 /my/ziggy/

‎ietf/redirects/fixtures/initial_data.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</object>
5151
<object pk="9" model="redirects.redirect">
5252
<field type="CharField" name="cgi">public/states_table.cgi</field>
53-
<field type="CharField" name="url">idtracker/states</field>
53+
<field type="CharField" name="url">idtracker/help/state</field>
5454
<field type="CharField" name="rest"></field>
5555
<field type="CharField" name="remove"></field>
5656
</object>
@@ -68,26 +68,26 @@
6868
</object>
6969
<object pk="12" model="redirects.redirect">
7070
<field type="CharField" name="cgi">public/lastcall.cgi</field>
71-
<field type="CharField" name="url">idtracker/last_call</field>
71+
<field type="CharField" name="url">idtracker/status/last-call</field>
7272
<field type="CharField" name="rest"></field>
7373
<field type="CharField" name="remove"></field>
7474
</object>
7575
<object pk="13" model="redirects.redirect">
7676
<field type="CharField" name="cgi">public/rfc_editor_announcement.cgi</field>
77-
<field type="CharField" name="url">iesg/ann/independent</field>
77+
<field type="CharField" name="url">iesg/ann/ind</field>
7878
<field type="CharField" name="rest"></field>
7979
<field type="CharField" name="remove"></field>
8080
</object>
8181
<object pk="14" model="redirects.redirect">
8282
<field type="CharField" name="cgi">public/recent_announcement.cgi</field>
8383
<field type="CharField" name="url">iesg/ann</field>
84-
<field type="CharField" name="rest">ietf-doc/recent</field>
84+
<field type="CharField" name="rest">new</field>
8585
<field type="CharField" name="remove"></field>
8686
</object>
8787
<object pk="15" model="redirects.redirect">
8888
<field type="CharField" name="cgi">public/previous_announcement.cgi</field>
8989
<field type="CharField" name="url">iesg/ann</field>
90-
<field type="CharField" name="rest">ietf-doc/previous</field>
90+
<field type="CharField" name="rest">prev</field>
9191
<field type="CharField" name="remove"></field>
9292
</object>
9393
<object pk="16" model="redirects.redirect">
@@ -236,25 +236,25 @@
236236
</object>
237237
<object pk="6" model="redirects.command">
238238
<field type="CharField" name="command">view_state_desc</field>
239-
<field type="CharField" name="url">states</field>
239+
<field type="CharField" name="url">help/state</field>
240240
<field to="redirects.redirect" name="script" rel="ManyToOneRel">10</field>
241241
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">4</field>
242242
</object>
243243
<object pk="9" model="redirects.command">
244244
<field type="CharField" name="command">view_evaluation_desc</field>
245-
<field type="CharField" name="url">evaluation_process</field>
245+
<field type="CharField" name="url">help/evaluation</field>
246246
<field to="redirects.redirect" name="script" rel="ManyToOneRel">10</field>
247247
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel"><None></None></field>
248248
</object>
249249
<object pk="8" model="redirects.command">
250250
<field type="CharField" name="command">view_key</field>
251-
<field type="CharField" name="url">ballot_key</field>
251+
<field type="CharField" name="url">help/ballot</field>
252252
<field to="redirects.redirect" name="script" rel="ManyToOneRel">10</field>
253253
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel"><None></None></field>
254254
</object>
255255
<object pk="10" model="redirects.command">
256256
<field type="CharField" name="command">send_email</field>
257-
<field type="CharField" name="url">send_email</field>
257+
<field type="CharField" name="url">feedback</field>
258258
<field to="redirects.redirect" name="script" rel="ManyToOneRel">10</field>
259259
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel"><None></None></field>
260260
</object>
@@ -266,7 +266,7 @@
266266
</object>
267267
<object pk="12" model="redirects.command">
268268
<field type="CharField" name="command">view_minute</field>
269-
<field type="CharField" name="url">detail</field>
269+
<field type="CharField" name="url"></field>
270270
<field to="redirects.redirect" name="script" rel="ManyToOneRel">16</field>
271271
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">4</field>
272272
</object>
@@ -284,7 +284,7 @@
284284
</object>
285285
<object pk="15" model="redirects.command">
286286
<field type="CharField" name="command">show_detail</field>
287-
<field type="CharField" name="url">detail</field>
287+
<field type="CharField" name="url"></field>
288288
<field to="redirects.redirect" name="script" rel="ManyToOneRel">14</field>
289289
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">6</field>
290290
</object>
@@ -296,7 +296,7 @@
296296
</object>
297297
<object pk="17" model="redirects.command">
298298
<field type="CharField" name="command">^sub_state^view_state_desc</field>
299-
<field type="CharField" name="url">states/substate</field>
299+
<field type="CharField" name="url">help/substate</field>
300300
<field to="redirects.redirect" name="script" rel="ManyToOneRel">10</field>
301301
<field to="redirects.suffix" name="suffix" rel="ManyToOneRel">4</field>
302302
</object>

‎ietf/templates/idtracker/idinternal_detail.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
<div class="largefont3">
8181
{% if object.ballot.ballot_issued %}
8282
<a href="{% url ietf.idtracker.views.view_ballot object.ballot_id %}">IESG evaluation record</a>
83-
[<a href="/idtracker/evaluation_process/">What
83+
[<a href="/idtracker/help/evaluation/">What
8484
they mean</a>]
85-
[<a href="/idtracker/ballot_key/">How they are
85+
[<a href="/idtracker/help/ballot/">How they are
8686
recorded</a>]
8787
{% else %}
8888
No IESG evaluation record
@@ -142,11 +142,11 @@
142142

143143
<td>
144144
<div class="largefont3">
145-
<a href="/idtracker/states/{{ object.cur_state_id }}/">
145+
<a href="/idtracker/help/state/{{ object.cur_state_id }}/">
146146
{{ object.cur_state }}</a>
147147
{% if object.cur_sub_state %}
148148
::
149-
<a href="/idtracker/states/substate/{{ object.cur_sub_state_id }}/">
149+
<a href="/idtracker/help/substate/{{ object.cur_sub_state_id }}/">
150150
{{ object.cur_sub_state }}
151151
</a>
152152
{% endif %}
@@ -158,7 +158,7 @@
158158
{% endifequal %}
159159
{% endif %}
160160
</div>
161-
<a href="/idtracker/states/">
161+
<a href="/idtracker/help/state/">
162162
[Show States Table]</a>
163163
</td>
164164
</tr>

‎ietf/templates/idtracker/idtracker_search.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ <h1>IETF I-D TRACKER</h1>
6969

7070
<HR>
7171
Document States: <a href="/images/state_diagram.gif">State Diagram</a> and
72-
<a href="/idtracker/states/">State Explanations</a>
72+
<a href="/idtracker/help/state/">State Explanations</a>
7373

7474
</center>
7575

‎ietf/templates/idtracker/search_result_table.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% for group in grouped %}
2-
<h3>In State: <a href="/idtracker/states/{{ group.list.0.cur_state_id }}/">{{ group.list.0.cur_state }}</a>{% if group.list.0.cur_sub_state %} :: <a href="/idtracker/states/substate/{{ group.list.0.cur_sub_state_id }}/">{{ group.list.0.cur_sub_state }}</a>{% endif %}</h3>
2+
<h3>In State: <a href="/idtracker/help/state/{{ group.list.0.cur_state_id }}/">{{ group.list.0.cur_state }}</a>{% if group.list.0.cur_sub_state %} :: <a href="/idtracker/help/substate/{{ group.list.0.cur_sub_state_id }}/">{{ group.list.0.cur_sub_state }}</a>{% endif %}</h3>
33
<table bgcolor="#DFDFDF" cellspacing="0" cellpadding="0" border="0" width="800">
44
<tr bgcolor="#A3A3A3"><th>&nbsp;</th><th width="250">Name (Intended Status)</th><th>Ver</th><th>Responsible AD</th><th>Status Date</th><th>Modified (EST)</th></tr>
55
{# Same sort algorithm as I-D tracker #}

0 commit comments

Comments
 (0)