diff options
| author | luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f <luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f> | 2010-01-30 19:19:30 +0000 |
|---|---|---|
| committer | luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f <luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f> | 2010-01-30 19:19:30 +0000 |
| commit | 0882d73ca1ba4c84ce24c946548c80d9e4d1c04e (patch) | |
| tree | 605e2284e175e80477fd7b6a6e9e2a2fcae94236 /base_urls.py | |
| parent | 7300519c054838511ba2584394620d0841b88e5f (diff) | |
added topics to posts
Diffstat (limited to 'base_urls.py')
| -rw-r--r-- | base_urls.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base_urls.py b/base_urls.py index 2fab651..1fdc87b 100644 --- a/base_urls.py +++ b/base_urls.py @@ -38,6 +38,7 @@ urlpatterns += patterns('', ) urlpatterns += patterns('', + (r'^colophon/', redirect_to, {'url': '/about/'}), (r'^admin/doc/', redirect_to, {'url': '/grappelli/help/1/'}), (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/filebrowser/', include('filebrowser.urls')), @@ -53,6 +54,9 @@ urlpatterns += patterns('', #(r'^photo-of-the-day/$', 'luxagraf.photos.views.potd_list'), (r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}), (r'^writing/', include('blog.urls')), + (r'^tops/', include('blog.urls')), + (r'^topics/(?P<slug>[-\w]+)/$', redirect_to, {'url': '/topics/%(slug)s/1/'}), + (r'^topics/(?P<slug>[-\w]+)/(?P<page>\d+)/', 'blog.views.topic_list'), #Entry detail i.e. /year/month/day/my-title/ (r'(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$', 'blog.views.entry_detail'), # locations @@ -63,6 +67,4 @@ urlpatterns += patterns('', (r'^map/', include('locations.urls')), #homepage (r'^$', 'blog.views.home'), #'blog.views.home'), - #static pages - #(r'(?P<page>[-\w]+)/$', 'static.views.page_view'), ) |