Renamed ModelTagManager on Book and Fragment models to tagged and added new default...

[wolnelektury.git] / catalogue / urls.py

diff --git a/catalogue/urls.py b/catalogue/urls.py
index fb20dd1..f477906 100644 (file)
--- a/catalogue/urls.py
+++ b/catalogue/urls.py
@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
-import os
-
 from django.conf.urls.defaults import *
-from django.views.generic.simple import redirect_to
 
 
 urlpatterns = patterns('catalogue.views',
     url(r'^$', 'main_page', name='main_page'),
-    url(r'^lektury/', 'book_list'),
-    url(r'^lektura/(?P<slug>[a-zA-Z0-9-]+)/zestawy/', 'book_sets'),
-    url(r'^zestawy/nowy/$', 'new_set'),
-    url(r'^lektura/(?P<slug>[a-zA-Z0-9-]+)/$', 'book_detail'),
+    url(r'^polki/$', 'user_shelves', name='user_shelves'),
+    url(r'^polki/(?P<slug>[a-zA-Z0-9-]+)/usun/$', 'delete_shelf', name='delete_shelf'),
+    url(r'^lektury/', 'book_list', name='book_list'),
+    url(r'^lektura/(?P<slug>[a-zA-Z0-9-]+)/polki/', 'book_sets', name='book_shelves'),
+    url(r'^fragment/(?P<id>[0-9]+)/polki/', 'fragment_sets', name='fragment_shelves'),
+    url(r'^polki/nowa/$', 'new_set', name='new_set'),
+    url(r'^lektura/(?P<slug>[a-zA-Z0-9-]+)/$', 'book_detail', name='book_detail'),
     url(r'^tags/$', 'tags_starting_with', name='hint'),
-    url(r'^(?P<tags>[a-zA-Z-/]+)/$', 'tagged_book_list', name='tagged_book_list'),
+    url(r'^szukaj/$', 'search', name='search'),
+    url(r'^(?P<tags>[a-zA-Z0-9-/]+)/$', 'tagged_object_list', name='tagged_object_list'),
 )