Move charter state help to /doc/help/state/charter/.

- Legacy-Id: 4379

ietf/idrfc/urls.py

@@ -32,6 +32,7 @@
 
 from django.conf.urls.defaults import patterns, url, include
 from ietf.idrfc import views_doc, views_search, views_edit, views_ballot, views
+from ietf.doc.models import State
 
 urlpatterns = patterns('',
     (r'^/?$', views_search.search_main),
@@ -68,3 +69,9 @@ urlpatterns = patterns('',
 
     (r'^(?P<name>[A-Za-z0-9.-]+)/charter/', include('ietf.wgcharter.urls')),
 )
+
+urlpatterns += patterns('django.views.generic.simple',
+    url(r'^help/state/charter/$', 'direct_to_template', { 'template': 'wgcharter/states.html', 'extra_context': { 'states': State.objects.filter(type="charter") } }, name='help_charter_states'),
+)
+
+

ietf/templates/idrfc/document_charter.html

@@ -34,7 +34,7 @@
       <td>{{ group.state.name }}</td>
     </tr>
     <tr>
-      <td><a href="/wgcharter/help/state/">Charter State</a>:</td>
+      <td><a href="/doc/help/state/charter/">Charter State</a>:</td>
       <td>
         <div>
         <a title="{{ doc.get_state.desc }}"{% if not snapshot and user|has_role:"Area Director,Secretariat" %} href="{% url charter_change_state name=doc.name %}"{% endif %}>{{ doc.get_state.name }}</a>

ietf/wgcharter/urls.py

@@ -1,12 +1,8 @@
 # Copyright The IETF Trust 2011, All Rights Reserved
 
 from django.conf.urls.defaults import patterns, url
-from ietf.doc.models import State
 
-urlpatterns = patterns('django.views.generic.simple',
-    url(r'^help/state/$', 'direct_to_template', { 'template': 'wgcharter/states.html', 'extra_context': { 'states': State.objects.filter(type="charter") } }, name='help_charter_states'),
-)
-urlpatterns += patterns('',
+urlpatterns = patterns('',
     url(r'^state/$', "ietf.wgcharter.views.change_state", name='charter_change_state'),
     url(r'^(?P<option>initcharter|recharter|abandon)/$', "ietf.wgcharter.views.change_state", name='charter_startstop_process'),
     url(r'^telechat/$', "ietf.wgcharter.views.telechat_date", name='charter_telechat_date'),