diff options
| author | luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f <luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f> | 2009-11-23 15:56:35 +0000 |
|---|---|---|
| committer | luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f <luxagraf@c63593aa-01b0-44d9-8516-4b9c7e931d7f> | 2009-11-23 15:56:35 +0000 |
| commit | 526fbe767130b4dedd75841969808fe750afa22e (patch) | |
| tree | dae304cd7c26f58de184366998692f4007d18db5 /base_urls.py | |
| parent | 4ac2e8c9c7126e21c708fd04bc14cf8143e1c17f (diff) | |
redesign tentatively complete
Diffstat (limited to 'base_urls.py')
| -rw-r--r-- | base_urls.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/base_urls.py b/base_urls.py index 5a487d2..2fab651 100644 --- a/base_urls.py +++ b/base_urls.py @@ -22,21 +22,27 @@ feeds = { 'fblinks' : LatestLinks, } +if settings.DEVELOPMENT: + urlpatterns = patterns('', + (r'^media/admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT+'/admin'}), + (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), + ) +else: + urlpatterns = patterns('') # old page redirects -urlpatterns = patterns('', +urlpatterns += patterns('', (r'^2003/nov/02/take-me-your-leader-ii/$', direct_to_template, {'template': 'static/oldcontent.html'}), (r'^2003/aug/07/take-me-your-leader/$', direct_to_template, {'template': 'static/oldcontent.html'}), (r'^2004/jan/07/david-foster-wallace-infinity/$', direct_to_template, {'template': 'static/oldcontent.html'}), ) -if settings.DEVELOPMENT: - urlpatterns = patterns('', - (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/Users/lux/Sites/luxagraf/media'}), - (r'^images/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/Users/lux/Sites/luxagraf/images'}), - ) - urlpatterns += patterns('', + (r'^admin/doc/', redirect_to, {'url': '/grappelli/help/1/'}), + (r'^admin/doc/', include('django.contrib.admindocs.urls')), + (r'^admin/filebrowser/', include('filebrowser.urls')), + (r'^admin/(.*)', admin.site.root), + (r'^grappelli/', include('grappelli.urls')), (r'^uploads/', include('upload.urls')), (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), (r'^admin/doc/', include('django.contrib.admindocs.urls')), |