Add makefile.

[audio.git] / src / audiobooks / urls.py

diff --git a/src/audiobooks/urls.py b/src/audiobooks/urls.py
index f3113c8..eb198b0 100644 (file)
--- a/src/audiobooks/urls.py
+++ b/src/audiobooks/urls.py
@@ -1,21 +1,18 @@
 from django.conf import settings
 from django.conf import settings

-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url

 from django.views.generic import RedirectView
 from django.views.generic import RedirectView

+import django_cas.views

 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 admin.autodiscover()
 
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 admin.autodiscover()
 

-urlpatterns = patterns('',
-    url(r'^$', RedirectView.as_view(url='archive/')),
+urlpatterns = [
+    url(r'^$', RedirectView.as_view(url='archive/', permanent=False)),

     url(r'^archive/', include('archive.urls')),
     url(r'^archive/', include('archive.urls')),

+    url(r'^publish/', include('apiclient.urls')),

 
     url(r'^admin/', include(admin.site.urls)),
 
     url(r'^admin/', include(admin.site.urls)),

-    url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
-    url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
-)
-
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes':True}),
-)
+    url(r'^accounts/login/$', django_cas.views.login, name='login'),
+    url(r'^accounts/logout/$', django_cas.views.logout, name='logout'),
+]