X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2f9c60b76f3ab4e69d794a6bb14388a81ff29eb7..d899260600ea4936bf7ed9c9534d8437d0ad7523:/redakcja/urls.py?ds=inline

diff --git a/redakcja/urls.py b/redakcja/urls.py
index 1d76ee80..0fe2aac7 100644
--- a/redakcja/urls.py
+++ b/redakcja/urls.py
@@ -1,37 +1,43 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls.defaults import *
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.conf import settings
+from django.conf.urls.static import static
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.views.i18n import javascript_catalog
+import forms_builder.forms.urls
 
+import redakcja.views
 
 admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = (
     # Auth
-    url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
-    url(r'^accounts/logout/$', 'catalogue.views.logout_then_redirect', name='logout'),
+    url('^accounts/', include('django.contrib.auth.urls')),
 
     # Admin panel
-    (r'^admin/filebrowser/', include('filebrowser.urls')),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
-    (r'^comments/', include('django.contrib.comments.urls')),
-
-    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),
+    url(r'^$', redakcja.views.main),
+    url(r'^register$', redakcja.views.register, name='register'),
     url(r'^documents/', include('catalogue.urls')),
-    url(r'^apiclient/', include('apiclient.urls')),
     url(r'^editor/', include('wiki.urls')),
+    url(r'^organizations/', include('organizations.urls')),
+    url(r'^forms/', include(forms_builder.forms.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.ADMIN_MEDIA_PREFIX[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'^i18n/', include('django.conf.urls.i18n')),
+    url(r'^jsi18n/$', javascript_catalog, {'packages': ['wiki']}, name='javascript_catalog'),
+)
 
-    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}),
+if settings.DEBUG:
+    urlpatterns += tuple(staticfiles_urlpatterns())
+    urlpatterns += tuple(static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT))
 
-)
+if getattr(settings, 'SERVE_FILES_WITH_DEBUG_FALSE', False):
+    from django.views.static import serve
+    urlpatterns += (
+        (r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:], serve, {'document_root': settings.STATIC_ROOT}),
+        (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], serve, {'document_root': settings.MEDIA_ROOT}),
+    )