Extracted fragment extraction in bookfragments to extract_fragments function. Put...

[wolnelektury.git] / urls.py

diff --git a/urls.py b/urls.py
index dfa68fc..104899f 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -4,23 +4,23 @@ import os
 from django.conf.urls.defaults import *
 from django.contrib import admin
 
 from django.conf.urls.defaults import *
 from django.contrib import admin
 

-

 admin.autodiscover()
 
 
 urlpatterns = patterns('',
 admin.autodiscover()
 
 
 urlpatterns = patterns('',

-    (r'^katalog/', include('catalogue.urls')),
+    url(r'^katalog/', include('catalogue.urls')),

     
     # Panel administracyjny
     
     # Panel administracyjny

-    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^admin/(.*)$', admin.site.root),
+    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    url(r'^admin/(.*)$', admin.site.root),

     
     # Użytkownicy
     
     # Użytkownicy

-    url(r'^uzytkownicy/zaloguj/$', 'django.contrib.auth.views.login', {'template_name': 'auth/login.html'}, name='login'),
-    url(r'^uzytkownicy/wyloguj/$', 'django.contrib.auth.views.logout_then_login', name='logout'),
+    url(r'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'),
+    url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'),
+    url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),

     
     # Pliki statyczne
     
     # Pliki statyczne

-    (r'^media/(?P<path>.*)$', 'django.views.static.serve', 
+    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', 

         {'document_root': os.path.join(os.path.dirname(__file__), 'media'), 'show_indexes': True}),
         {'document_root': os.path.join(os.path.dirname(__file__), 'media'), 'show_indexes': True}),

-    (r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),
+    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),

 )
 )