fnp
/
fnp-django-template.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Django 1.8
[fnp-django-template.git]
/
src
/
src
/
project_name
/
urls.py
diff --git
a/src/src/project_name/urls.py
b/src/src/project_name/urls.py
index
3303eb4
..
22d3c5b
100644
(file)
--- a/
src/src/project_name/urls.py
+++ b/
src/src/project_name/urls.py
@@
-1,27
+1,28
@@
-from django.conf.urls import
patterns,
include, url
+from django.conf.urls import include, url
from django.conf import settings
from django.contrib import admin
from django.conf import settings
from django.contrib import admin
+import django_cas_ng.views
-urlpatterns =
patterns('',
+urlpatterns =
[
# Examples:
# Examples:
- # url(r'^$',
'{{ project_name }}.views.home'
, name='home'),
+ # url(r'^$',
{{ project_name }}.views.home
, name='home'),
# url(r'^{{ project_name }}/', include('foo.urls')),
# url(r'^{{ project_name }}/', include('foo.urls')),
-
# Admin stuff.
# Admin stuff.
- url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', include(admin.site.urls)),
# CAS stuff.
url(r'^admin/', include(admin.site.urls)),
# CAS stuff.
- url(r'^accounts/login/$',
'django_cas_ng.views.login'
),
- url(r'^accounts/logout/$',
'django_cas_ng.views.logout'
),
-)
+ url(r'^accounts/login/$',
django_cas_ng.views.login
),
+ url(r'^accounts/logout/$',
django_cas_ng.views.logout
),
+]
# Media in DEBUG mode
if settings.DEBUG:
# Media in DEBUG mode
if settings.DEBUG:
- urlpatterns += patterns('',
- url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+ from django.views.static import serve
+ urlpatterns += [
+ url(r'^media/(?P<path>.*)$', serve, {
'document_root': settings.MEDIA_ROOT,
'document_root': settings.MEDIA_ROOT,
+ 'show_indexes': True,
}),
}),
- )
+ ]