Add status-change to state_help framework, remove last traces of former framework

 - Legacy-Id: 6057

Author: OleLaursen

ietf/doc/urls.py

@@ -98,10 +98,3 @@
     (r'^(?P<name>[A-Za-z0-9._+-]+)/conflict-review/', include('ietf.doc.urls_conflict_review')),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/status-change/', include('ietf.doc.urls_status_change')),
 )
-
-urlpatterns += patterns('django.views.generic.simple',
-    url(r'^help/state/charter/$', 'direct_to_template', { 'template': 'doc/states.html', 'extra_context': { 'states': State.objects.filter(used=True, type="charter"),'title':"Charter" } }, name='help_charter_states'),
-    url(r'^help/state/conflict-review/$', 'direct_to_template', { 'template': 'doc/states.html', 'extra_context': { 'states': State.objects.filter(used=True, type="conflrev").order_by("order"),'title':"Conflict Review" } }, name='help_conflict_review_states'),
-    url(r'^help/state/status-change/$', 'direct_to_template', { 'template': 'doc/states.html', 'extra_context': { 'states': State.objects.filter(type="statchg").order_by("order"),'title':"RFC Status Change" } }, name='help_status_change_states'),
-)
-

ietf/doc/views_conflict_review.py

@@ -87,7 +87,7 @@ def change_state(request, name, option=None):
                               dict(form=form,
                                    doc=review,
                                    login=login,
-                                   help_url=reverse('help_conflict_review_states'),
+                                   help_url=reverse('state_help', kwargs=dict(type="conflict-review")),
                                    ),
                               context_instance=RequestContext(request))
 

ietf/doc/views_help.py

@@ -10,7 +10,8 @@ def state_help(request, type):
         "draft-rfceditor": ("draft-rfceditor", "RFC Editor States For Internet-Drafts"),
         "draft-iana-action": ("draft-iana-action", "IANA Action States For Internet-Drafts"),
         "charter": ("charter", "Charter States"),
-        "conflict-review": ("conflrev", "Conflict Review States")
+        "conflict-review": ("conflrev", "Conflict Review States"),
+        "status-change": ("statchg", "RFC Status Change States"),
         }.get(type, (None, None))
     state_type = get_object_or_404(StateType, slug=slug)
 

ietf/doc/views_status_change.py

@@ -93,7 +93,7 @@ def change_state(request, name, option=None):
                               dict(form=form,
                                    doc=status_change,
                                    login=login,
-                                   help_url=reverse('help_status_change_states')
+                                   help_url=reverse('state_help', kwargs=dict(type="status-change")),
                                    ),
                               context_instance=RequestContext(request))
 

ietf/templates/doc/document_status_change.html

@@ -36,7 +36,7 @@
     </tr>
     {% endfor %}
     <tr>
-      <td><a href="/doc/help/state/status-change/">Review State</a>:</td>
+      <td><a href="{% url state_help type="status-change" %}">Review State</a>:</td>
       <td>
         <div>
         <a title="{{ doc.get_state.desc }}"{% if not snapshot and user|has_role:"Area Director,Secretariat" %} class="editlink" href="{% url status_change_change_state name=doc.name %}"{% endif %}>{{ doc.get_state.name }}</a>

ietf/templates/doc/status_change/start.html

@@ -28,7 +28,7 @@
 {% block content %}
 <h1>Begin RFC status change review</h1>
 
-<p class="helptext">For help on the initial state choice, see the <a href="{% url help_status_change_states %}">state table</a>.</p>
+<p class="helptext">For help on the initial state choice, see the <a href="{% url state_help type="status-change"  %}">state table</a>.</p>
 
 <form class="start-rfc-status-change-review" action="" method="post">
   <table>