Changed the nomcom announcement pages to sit in the /ann/ tree.

- Legacy-Id: 1412

ietf/__init__.py

@@ -1,9 +1,9 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-__version__ = "2.21"
+__version__ = "2.22-dev"
 
 __date__    = "$Date$"
 
-__rev__     = "$Rev$"
+__rev__     = "$Rev$ (dev) Latest release: Rev. 1410 "
 
 __id__      = "$Id$"

ietf/announcements/urls.py

@@ -9,7 +9,7 @@ nomcom_dict = {
 
 urlpatterns = patterns('',
 #    (r'^nomcom/$', 'django.views.generic.simple.redirect_to', {'url': 'http://www.ietf.org/nomcom/index.html'} ),
-    (r'^$', 'ietf.announcements.views.all'),
-    (r'^chairs/', 'ietf.announcements.views.chairs'),
-    (r'^(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', nomcom_dict)
+    (r'^nomcom/$', 'ietf.announcements.views.nomcom'),
+    (r'^nomcom/chairs/', 'ietf.announcements.views.nomcom_chairs'),
+    (r'^nomcom/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', nomcom_dict)
 )

ietf/announcements/views.py

@@ -11,7 +11,7 @@ from ietf.idtracker.models import PersonOrOrgInfo
 from ietf.idtracker.models import Role
 from ietf.announcements.models import Announcement
 
-def all(request):
+def nomcom(request):
     curr_chair       = (ChairsHistory.objects.
                         get(chair_type=Role.NOMCOM_CHAIR, present_chair='1'))
 
@@ -33,7 +33,7 @@ def all(request):
                               { 'curr_chair' : curr_chair,
                                 'regimes' : regimes })
 
-def chairs(request):
+def nomcom_chairs(request):
     all_chairs       = (ChairsHistory.objects.all().
                         filter(chair_type='3',start_year__gt = 2003).
                         order_by('-start_year'))

ietf/settings.py

@@ -11,7 +11,7 @@ syslog.openlog("django", syslog.LOG_PID, syslog.LOG_LOCAL0)
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
-DEBUG = False
+DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 # Domain name of the IETF
@@ -153,7 +153,7 @@ INTERNAL_IPS = (
 # Valid values:
 # 'production', 'test', 'development'
 # Override this in settings_local.py if it's not true
-SERVER_MODE = 'production'
+SERVER_MODE = 'development'
 
 # The name of the method to use to invoke the test suite
 TEST_RUNNER = 'ietf.tests.run_tests'

ietf/templates/announcements/nomcom.html

@@ -68,7 +68,7 @@ Committee Chair: <A HREF="mailto:PRoberts\@MEGISTO.com">Phil Roberts</A>
 
 <h3>Historical Information</h3>
 
-<li><a href="/nomcom/chairs">IAB/IESG Nominating Committee Chairs (by year)</a>
+<li><a href="chairs">IAB/IESG Nominating Committee Chairs (by year)</a>
 
 <li><a href="http://www.ietf.org/NomCom.html">IAB/IESG Nominating Committee Members (by year)</a>
 <h3>References</h3>

ietf/urls.py

@@ -54,7 +54,6 @@ urlpatterns = patterns('',
       (r'^meeting/', include('ietf.meeting.urls')),
       (r'^accounts/', include('ietf.ietfauth.urls')),
       (r'^doc/', include('ietf.idrfc.urls')),
-      (r'^nomcom/', include('ietf.announcements.urls')),
 
       (r'^$', 'ietf.redirects.views.redirect'),