Merge tag 'release_2014-11-08.2' into archweb-generic

Todolist pagination and sitemap, news sitemap

1 files changed, 9 insertions, 1 deletions

diff --git a/urls.py b/urls.py
index 518e88e7..36e3fef1 100644
--- a/urls.py
+++ b/urls.py
@@ -16,8 +16,11 @@ our_sitemaps = {
     'package-groups': sitemaps.PackageGroupsSitemap,
     'split-packages': sitemaps.SplitPackagesSitemap,
     'releases':       sitemaps.ReleasesSitemap,
+    'todolists':      sitemaps.TodolistSitemap,
 }
 
+news_sitemaps = { 'news': sitemaps.RecentNewsSitemap }
+
 urlpatterns = []
 
 # Public pages
@@ -81,7 +84,12 @@ urlpatterns += patterns('',
         {'sitemaps': our_sitemaps, 'sitemap_url_name': 'sitemaps'}),
     (r'^sitemap-(?P<section>.+)\.xml$',
         cache_page(1831)(sitemap_views.sitemap),
-        {'sitemaps': our_sitemaps}, 'sitemaps'),
+        {'sitemaps': our_sitemaps, 'template_name': 'sitemaps/sitemap.xml.jinja'},
+        'sitemaps'),
+    (r'^news-sitemap\.xml$',
+        cache_page(1831)(sitemap_views.sitemap),
+        {'sitemaps': news_sitemaps, 'template_name': 'sitemaps/news_sitemap.xml.jinja'},
+        'news-sitemap'),
 )
 
 # Authentication / Admin