equal
deleted
inserted
replaced
|
1 from django.conf import settings |
1 from django.conf.urls.defaults import patterns, include, url |
2 from django.conf.urls.defaults import patterns, include, url |
|
3 from django.conf.urls.static import static |
2 from django.contrib import admin |
4 from django.contrib import admin |
|
5 from django.contrib.staticfiles.urls import staticfiles_urlpatterns |
3 from ldt.auth.views import login as pf_login |
6 from ldt.auth.views import login as pf_login |
4 from ldt.text import VERSION_STR |
7 from ldt.text import VERSION_STR |
5 |
8 |
6 #from django.conf import settings |
9 #from django.conf import settings |
7 |
10 |
41 (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}), |
44 (r'^/?$', 'django.views.generic.simple.redirect_to', {'url': 'ldt'}), |
42 #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), |
45 #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), |
43 |
46 |
44 (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), |
47 (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), |
45 ) |
48 ) |
|
49 |
|
50 urlpatterns += staticfiles_urlpatterns() |
|
51 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) |