X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/061f517181630ee982c33aee63965b18965fd5aa..79f2f7afc17deebed7d74c644faa155961d5cdd6:/platforma/urls.py?ds=sidebyside diff --git a/platforma/urls.py b/platforma/urls.py index 1f7372a3..495c7357 100755 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -11,9 +11,7 @@ PATH_END = PATH_SEC + "/$" urlpatterns = patterns('', # Explorer: url(r'^$', 'explorer.views.file_list', name='file_list'), - url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), - - url(r'^renderer$', 'explorer.views.renderer_test'), + url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), url(r'^management/pull-requests$', 'explorer.views.pull_requests'), @@ -28,10 +26,19 @@ urlpatterns = patterns('', url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/(.*)', admin.site.root), - + # Theme database + url(r'themes/', include('bookthemes.urls')), # Our über-restful api - url(r'^api/', include('api.urls')), + # url(r'^api/', include('api.urls')), + + # Static files (should be served by Apache) + url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), + url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', + {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + + url(r'^(?P<name>(.*))$', 'wiki.views.document_detail'), ) @@ -47,13 +54,3 @@ else: url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}, name='login'), url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'), ) - -# Static files -if settings.DEBUG and not hasattr(settings, 'DONT_SERVE_STATIC'): - urlpatterns += patterns('', - url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', - {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), - url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', - {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), - ) -# \ No newline at end of file