X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/717c14c014e3c988bcb392599a47ffa92630da78..f24caa48eedfb9d4f7218892bc7070316ac553f2:/platforma/urls.py diff --git a/platforma/urls.py b/platforma/urls.py old mode 100644 new mode 100755 index 498b5b2e..ccb9fcf7 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -11,7 +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'^file/upload', 'explorer.views.file_upload', name='file_upload'), url(r'^management/pull-requests$', 'explorer.views.pull_requests'), @@ -26,6 +26,9 @@ 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')), @@ -45,11 +48,15 @@ else: ) # Static files -if settings.DEBUG and not hasattr(settings, 'DONT_SERVE_STATIC'): +if settings.DEBUG: urlpatterns += patterns('', - url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', - {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), - url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', - {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + url(r'^renderer$', 'explorer.views.renderer_test'), ) -# \ No newline at end of file + + if not hasattr(settings, 'DONT_SERVE_STATIC'): + urlpatterns += patterns('', + url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), + url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', + {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + ) \ No newline at end of file