equal
deleted
inserted
replaced
10 #from django.conf import settings |
10 #from django.conf import settings |
11 |
11 |
12 # Uncomment the next two lines to enable the admin: |
12 # Uncomment the next two lines to enable the admin: |
13 admin.autodiscover() |
13 admin.autodiscover() |
14 |
14 |
15 js_info_dict = { |
15 js_info_dict = { |
16 'packages': ('django.contrib.admin',), |
16 'packages': ('django.contrib.admin',), |
17 } |
17 } |
18 |
18 |
19 urlpatterns = patterns('', |
19 urlpatterns = patterns('', |
20 # Example: |
20 # Example: |
45 (r'^/?$', RedirectView.as_view(url='ldt')), |
45 (r'^/?$', RedirectView.as_view(url='ldt')), |
46 #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), |
46 #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}), |
47 |
47 |
48 (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), |
48 (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), |
49 (r'^hashcut/', include('hashcut.urls')), |
49 (r'^hashcut/', include('hashcut.urls')), |
|
50 (r'^composer/', include('metadatacomposer.urls')), |
50 ) |
51 ) |
51 |
52 |
52 urlpatterns += staticfiles_urlpatterns() |
53 urlpatterns += staticfiles_urlpatterns() |
53 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) |
54 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) |