Mercurial > personas_backend
changeset 97:b69d96149997
Um... This is my first merge... But I don't know what the difference is between this and changeset 6acab0e0bca5 on hg.toolness.com.
| author | Atul Varma <varmaa@toolness.com> |
|---|---|
| date | Fri, 28 Mar 2008 12:08:12 -0700 |
| parents | 89c6f5ddaded (current diff) 6acab0e0bca5 (diff) |
| children | 305fb3a1e0ca |
| files | |
| diffstat | 2 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/PersonasBackend/settings.py Thu Mar 27 21:32:48 2008 -0700 +++ b/PersonasBackend/settings.py Fri Mar 28 12:08:12 2008 -0700 @@ -95,3 +95,5 @@ "django.core.context_processors.media", "PersonasBackend.personas.sections.context", ) + +BASE_DIR = "personas/"
--- a/PersonasBackend/urls.py Thu Mar 27 21:32:48 2008 -0700 +++ b/PersonasBackend/urls.py Fri Mar 28 12:08:12 2008 -0700 @@ -5,11 +5,22 @@ import django.contrib.admin urlpatterns = patterns('', - (r'^admin/media/(?P<path>.*)$', 'django.views.static.serve', + # Admin media + (r'^%sadmin/media/(?P<path>.*)$' % settings.BASE_DIR, + 'django.views.static.serve', {'document_root': os.path.join( django.contrib.admin.__path__[0], "media" )}), - (r'^admin/', include('django.contrib.admin.urls')), - (r'^media/(?P<path>.*)$', 'django.views.static.serve', + + # Admin + (r'^%sadmin/' % settings.BASE_DIR, + include('django.contrib.admin.urls')), + + # Personas media + (r'^%smedia/(?P<path>.*)$' % settings.BASE_DIR, + 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), - (r'^', include('PersonasBackend.personas.urls')), + + # Personas + (r'^%s' % settings.BASE_DIR, + include('PersonasBackend.personas.urls')), )