|
43 | 43 | del sitemaps['drafts'] # not needed, overlaps sitemaps['idtracker'] |
44 | 44 |
|
45 | 45 | urlpatterns = patterns('', |
46 | | - (r'^feed/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', |
47 | | - { 'feed_dict': feeds}), |
48 | | - (r'^sitemap.xml$', 'django.contrib.sitemaps.views.index', |
49 | | - { 'sitemaps': sitemaps}), |
50 | | - (r'^sitemap-(?P<section>.+).xml$', 'django.contrib.sitemaps.views.sitemap', |
51 | | - {'sitemaps': sitemaps}), |
| 46 | + (r'^$', 'ietf.idrfc.views.main'), |
| 47 | + (r'^accounts/', include('ietf.ietfauth.urls')), |
| 48 | + (r'^admin/', include(admin.site.urls)), |
| 49 | + (r'^admin/doc/', include('django.contrib.admindocs.urls')), |
52 | 50 | (r'^ann/', include('ietf.announcements.urls')), |
53 | | - (r'^idtracker/', include('ietf.idtracker.urls')), |
| 51 | + (r'^community/', include('ietf.community.urls')), |
| 52 | + (r'^cookies/', include('ietf.cookies.urls')), |
| 53 | + (r'^doc/', include('ietf.idrfc.urls')), |
54 | 54 | (r'^drafts/', include('ietf.idindex.urls')), |
| 55 | + (r'^feed/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', { 'feed_dict': feeds}), |
| 56 | + (r'^idtracker/', include('ietf.idtracker.urls')), |
55 | 57 | (r'^iesg/', include('ietf.iesg.urls')), |
| 58 | + (r'^ipr/', include('ietf.ipr.urls')), |
56 | 59 | (r'^liaison/', include('ietf.liaisons.urls')), |
57 | 60 | (r'^list/', include('ietf.mailinglists.urls')), |
58 | | - (r'^(?P<path>public)/', include('ietf.redirects.urls')), |
59 | | - (r'^ipr/', include('ietf.ipr.urls')), |
60 | 61 | (r'^meeting/', include('ietf.meeting.urls')), |
61 | | - (r'^accounts/', include('ietf.ietfauth.urls')), |
62 | | - (r'^doc/', include('ietf.idrfc.urls')), |
63 | | - (r'^wg/', include('ietf.wginfo.urls')), |
64 | | - (r'^cookies/', include('ietf.cookies.urls')), |
65 | 62 | (r'^person/', include('ietf.person.urls')), |
66 | | - (r'^submit/', include('ietf.submit.urls')), |
| 63 | + (r'^release/$', 'ietf.release.views.release'), |
| 64 | + (r'^release/(?P<version>.+)/$', 'ietf.release.views.release'), |
| 65 | + (r'^sitemap-(?P<section>.+).xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}), |
| 66 | + (r'^sitemap.xml$', 'django.contrib.sitemaps.views.index', { 'sitemaps': sitemaps}), |
67 | 67 | (r'^streams/', include('ietf.ietfworkflows.urls')), |
68 | | - (r'^community/', include('ietf.community.urls')), |
69 | | - |
70 | | - (r'^$', 'ietf.idrfc.views.main'), |
71 | | - (r'^admin/doc/', include('django.contrib.admindocs.urls')), |
72 | | - ('^admin/', include(admin.site.urls)), |
| 68 | + (r'^submit/', include('ietf.submit.urls')), |
| 69 | + (r'^(?P<path>public)/', include('ietf.redirects.urls')), |
| 70 | + (r'^wg/', include('ietf.wginfo.urls')), |
73 | 71 |
|
74 | 72 | # Google webmaster tools verification url |
75 | 73 | (r'^googlea30ad1dacffb5e5b.html', 'django.views.generic.simple.direct_to_template', { 'template': 'googlea30ad1dacffb5e5b.html' }), |
|
0 commit comments