update translation

[redakcja.git] / redakcja / urls.py

diff --git a/redakcja/urls.py b/redakcja/urls.py
index 504c828..da12c29 100644 (file)
--- a/redakcja/urls.py
+++ b/redakcja/urls.py
@@ -5,29 +5,34 @@ 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.conf import settings
 from django.conf.urls.static import static
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns

-from django.views.generic import RedirectView
+import forms_builder.forms.urls

 
 
 admin.autodiscover()
 
 
 
 admin.autodiscover()
 

-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',

     # Auth
     # Auth

-    url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
-    url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
-    url(r'^admin/login/$', 'django_cas.views.login', name='login'),
-    url(r'^admin/logout/$', 'django_cas.views.logout', name='logout'),
+    # url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
+    # url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
+    # url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
+    # url(r'^accounts/logout/$', 'django.contrib.auth.views.login', name='logout'),
+    # url(r'^admin/login/$', 'django_cas.views.login', name='login'),
+    # url(r'^admin/logout/$', 'django_cas.views.logout', name='logout'),
+    url('^accounts/', include('django.contrib.auth.urls')),

 
     # Admin panel
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
 
 
     # Admin panel
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),
 

-    (r'^comments/', include('django.contrib.comments.urls')),
-
-    url(r'^$', RedirectView.as_view(url= '/documents/')),
+    url(r'^$', 'redakcja.views.main'),
+    url(r'^register$', 'redakcja.views.register', name='register'),

     url(r'^documents/', include('catalogue.urls')),
     url(r'^documents/', include('catalogue.urls')),

-    url(r'^apiclient/', include('apiclient.urls')),

     url(r'^editor/', include('wiki.urls')),
     url(r'^editor/', include('wiki.urls')),

-    url(r'^cover/', include('cover.urls')),
+    url(r'^organizations/', include('organizations.urls')),
+    url(r'^forms/', include(forms_builder.forms.urls)),
+
+    url(r'^i18n/', include('django.conf.urls.i18n')),

     (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', dict(packages=['wiki'])),
 
 )
     (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', dict(packages=['wiki'])),
 
 )


@@ -35,3 +40,12 @@ urlpatterns = patterns('',
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

+
+if getattr(settings, 'SERVE_FILES_WITH_DEBUG_FALSE', False):
+    urlpatterns += patterns(
+        '',
+        (r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:],
+         'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
+        (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
+         'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
+    )