# HG changeset patch # User Steve Losh # Date 1234575627 18000 # Node ID 315df6ca542d0640c10a9584453152cafea0dacf # Parent 3c20caba5321f8dd744264387b0155404848a78c Pulled out the URLs into app-specific files. It's so much cleaner! diff -r 3c20caba5321 -r 315df6ca542d blog/urls.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/blog/urls.py Fri Feb 13 20:40:27 2009 -0500 @@ -0,0 +1,9 @@ +from django.conf.urls.defaults import * + +urlpatterns = patterns('stevelosh.blog.views', + url(r'^$', 'list', name='blog-list-newest'), + url(r'^page/(\d+)/$', 'list', name='blog-list-page'), + url(r'^comment/$', 'comment', name='blog-post-comment'), + url(r'^entry/(\d+)/(\d+)/(\d+)/(.*)/$', 'entry', name='blog-entry'), + url(r'^(\d+)/(\d+)/(\d+)/(.*).html/$', 'old_entry', name='blog-old-entry'), +) \ No newline at end of file diff -r 3c20caba5321 -r 315df6ca542d projects/urls.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/projects/urls.py Fri Feb 13 20:40:27 2009 -0500 @@ -0,0 +1,7 @@ +from django.conf.urls.defaults import * + +urlpatterns = patterns('stevelosh.projects.views', + url(r'^$', 'list', name='project-list'), + url(r'^comment/$', 'comment', name='project-post-comment'), + url(r'^(.*)/$', 'project', name='project-view'), +) \ No newline at end of file diff -r 3c20caba5321 -r 315df6ca542d rss/urls.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rss/urls.py Fri Feb 13 20:40:27 2009 -0500 @@ -0,0 +1,12 @@ +from django.conf.urls.defaults import * +from stevelosh.rss.feeds import * + +feeds = { 'blog': LatestEntries, + 'comments': LatestComments, + 'projects': LatestProjects, + 'thoughts': LatestThoughts, + 'all': LatestEverything, } + +urlpatterns = patterns('stevelosh.rss.views', + url(r'^(?P.+)/$', 'feeds', {'feed_dict': feeds}), +) \ No newline at end of file diff -r 3c20caba5321 -r 315df6ca542d thoughts/urls.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thoughts/urls.py Fri Feb 13 20:40:27 2009 -0500 @@ -0,0 +1,6 @@ +from django.conf.urls.defaults import * + +urlpatterns = patterns('stevelosh.thoughts.views', + url(r'^$', 'list', name='thoughts-list-newest'), + url(r'^page/(\d+)/$', 'list', name='thoughts-list-page'), +) \ No newline at end of file diff -r 3c20caba5321 -r 315df6ca542d urls.py --- a/urls.py Thu Feb 12 14:14:13 2009 -0500 +++ b/urls.py Fri Feb 13 20:40:27 2009 -0500 @@ -2,37 +2,19 @@ from django.contrib import admin from django.conf import settings import mobileadmin -from stevelosh.rss.feeds import * - admin.autodiscover() mobileadmin.autoregister() -feeds = { 'blog': LatestEntries, - 'comments': LatestComments, - 'projects': LatestProjects, - 'thoughts': LatestThoughts, - 'all': LatestEverything, } - urlpatterns = patterns('', (r'^admin/(.*)', admin.site.root), (r'^m/(.*)', mobileadmin.sites.site.root), - url(r'^blog/$', 'stevelosh.blog.views.list', name='blog-list-newest'), - url(r'^blog/page/(\d+)/$', 'stevelosh.blog.views.list', name='blog-list-page'), - url(r'^blog/comment/$', 'stevelosh.blog.views.comment', name='blog-post-comment'), - url(r'^blog/entry/(\d+)/(\d+)/(\d+)/(.*)/$', - 'stevelosh.blog.views.entry', name='blog-entry'), - url(r'^blog/(\d+)/(\d+)/(\d+)/(.*).html/$', - 'stevelosh.blog.views.old_entry', name='blog-old-entry'), - url(r'^projects/$', 'stevelosh.projects.views.list', name='project-list'), - url(r'^projects/comment/$', 'stevelosh.projects.views.comment', name='project-post-comment'), - url(r'^projects/(.*)/$', 'stevelosh.projects.views.project', name='project-view'), - url(r'^thoughts/$', 'stevelosh.thoughts.views.list', name='thoughts-list-newest'), - url(r'^thoughts/page/(\d+)/$', 'stevelosh.thoughts.views.list', name='thoughts-list-page'), - url(r'^rss/(?P.+)/$', 'stevelosh.rss.views.feeds', {'feed_dict': feeds}), + url(r'^blog/', include('stevelosh.blog.urls')), + url(r'^projects/', include('stevelosh.projects.urls')), + url(r'^thoughts/', include('stevelosh.thoughts.urls')), + url(r'^rss/', include('stevelosh.rss.urls')), ) - if settings.DEBUG: urlpatterns += patterns('', (r'^site-media/(?P.*)$', 'django.views.static.serve',